You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/08/24 11:22:09 UTC
[cloudstack] branch master updated: CLOUDSTACK-9996: Fix juniper
vlan untagged jedgement and xml element replacment (#2174)
This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new a8c09f2 CLOUDSTACK-9996: Fix juniper vlan untagged jedgement and xml element replacment (#2174)
a8c09f2 is described below
commit a8c09f2a1980757eb7a9da4a178dc27da08df2ed
Author: digitalgust <di...@163.com>
AuthorDate: Thu Aug 24 19:22:06 2017 +0800
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 d60ccb6..75c7583 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 = "<permit></permit>";
}
- 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));
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].