apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9996: Fix juniper vlan untagged jedgement and xml element replacment (#2174)

Browse Source 
Fix  juniper vlan untagged jedgement and xml element replacment.
This commit is contained in:
digitalgust 2017-08-24 19:22:06 +08:00 committed by Rohit Yadav
parent 4b38d36284
commit a8c09f2a19
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
View File

@ -2841,8 +2841,8 @@ public class JuniperSrxResource implements ServerResource {
action = "<permit></permit>"; action = "<permit></permit>";
} }
xml = replaceXmlValue(xml, "action", action);
} }
xml = replaceXmlValue(xml, "action", action);
} else { } else {
xml = replaceXmlValue(xml, "from-zone", fromZone); xml = replaceXmlValue(xml, "from-zone", fromZone);
xml = replaceXmlValue(xml, "to-zone", toZone); xml = replaceXmlValue(xml, "to-zone", toZone);
@ -3611,7 +3611,7 @@ public class JuniperSrxResource implements ServerResource {
private Long getVlanTag(String vlan) throws ExecutionException { private Long getVlanTag(String vlan) throws ExecutionException {
Long publicVlanTag = null; Long publicVlanTag = null;
if (!vlan.equals("untagged")) { if (!vlan.contains("untagged")) {
try { try {
// make sure this vlan is numeric // make sure this vlan is numeric
publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(vlan)); publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(vlan));