From ab88f2e040b2f67e972124e670db6c3cfbb35b56 Mon Sep 17 00:00:00 2001 From: wenwenxiong Date: Wed, 2 Dec 2015 14:24:21 +0800 Subject: [PATCH 1/2] fix "action" in xml will not be replace fix "action" in xml will not replace with condition type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS_DEFAULT) --- .../src/com/cloud/network/resource/JuniperSrxResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d60ccb67240c..a0bf2601ac2e 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,9 @@ private boolean manageSecurityPolicy(SecurityPolicyType type, SrxCommand command action = ""; } - xml = replaceXmlValue(xml, "action", action); + //xml = replaceXmlValue(xml, "action", action); } + xml = replaceXmlValue(xml, "action", action); } else { xml = replaceXmlValue(xml, "from-zone", fromZone); xml = replaceXmlValue(xml, "to-zone", toZone); From 4cb5cb58af474c6f0be09536c7dc1b6253ed1e52 Mon Sep 17 00:00:00 2001 From: wenwenxiong Date: Wed, 2 Dec 2015 14:32:27 +0800 Subject: [PATCH 2/2] Revert "fix "action" in xml will not be replace" --- .../src/com/cloud/network/resource/JuniperSrxResource.java | 3 +-- 1 file changed, 1 insertion(+), 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 a0bf2601ac2e..d60ccb67240c 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,9 +2841,8 @@ private boolean manageSecurityPolicy(SecurityPolicyType type, SrxCommand command action = ""; } - //xml = replaceXmlValue(xml, "action", action); + xml = replaceXmlValue(xml, "action", action); } - xml = replaceXmlValue(xml, "action", action); } else { xml = replaceXmlValue(xml, "from-zone", fromZone); xml = replaceXmlValue(xml, "to-zone", toZone);