From a8c09f2a1980757eb7a9da4a178dc27da08df2ed Mon Sep 17 00:00:00 2001 From: digitalgust Date: Thu, 24 Aug 2017 19:22:06 +0800 Subject: [PATCH] CLOUDSTACK-9996: Fix juniper vlan untagged jedgement and xml element replacment (#2174) Fix juniper vlan untagged jedgement and xml element replacment. --- .../src/com/cloud/network/resource/JuniperSrxResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index d60ccb67240..75c7583fe80 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -2841,8 +2841,8 @@ public class JuniperSrxResource implements ServerResource { action = ""; } - xml = replaceXmlValue(xml, "action", action); } + xml = replaceXmlValue(xml, "action", action); } else { xml = replaceXmlValue(xml, "from-zone", fromZone); xml = replaceXmlValue(xml, "to-zone", toZone); @@ -3611,7 +3611,7 @@ public class JuniperSrxResource implements ServerResource { private Long getVlanTag(String vlan) throws ExecutionException { Long publicVlanTag = null; - if (!vlan.equals("untagged")) { + if (!vlan.contains("untagged")) { try { // make sure this vlan is numeric publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(vlan));