You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/12/03 13:03:58 UTC
git commit: updated refs/heads/4.3 to 8454885
Updated Branches:
refs/heads/4.3 80a5dd75c -> 8454885fb
Corrected parsing vlan tag in JuniperSrx resource
With out this chagne ipAssoc command for juniperSrx is failed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8454885f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8454885f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8454885f
Branch: refs/heads/4.3
Commit: 8454885fbe12cd78b225b392b40f330995576d9c
Parents: 80a5dd7
Author: Jayapal <ja...@apache.org>
Authored: Tue Dec 3 17:32:07 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Tue Dec 3 17:33:06 2013 +0530
----------------------------------------------------------------------
.../src/com/cloud/network/resource/JuniperSrxResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8454885f/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
----------------------------------------------------------------------
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 684751c..4658759 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
@@ -700,7 +700,7 @@ public class JuniperSrxResource implements ServerResource {
Long publicVlanTag = null;
if (ip.getBroadcastUri() != null && !ip.getBroadcastUri().equals("untagged")) {
try {
- publicVlanTag = Long.parseLong(ip.getBroadcastUri());
+ publicVlanTag = Long.parseLong(BroadcastDomainType.getValue(ip.getBroadcastUri()));
} catch (Exception e) {
throw new ExecutionException("Could not parse public VLAN tag: " + ip.getBroadcastUri());
}