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/04 11:47:35 UTC
git commit: updated refs/heads/master to f2c7db9
Updated Branches:
refs/heads/master 9d50b0bb6 -> f2c7db994
Corrected parsing vlan tag in JuniperSrx resource
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f2c7db99
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f2c7db99
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f2c7db99
Branch: refs/heads/master
Commit: f2c7db99471537942b9d3b1c5966ff35c4a52c6e
Parents: 9d50b0b
Author: Jayapal <ja...@apache.org>
Authored: Wed Dec 4 16:14:48 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Wed Dec 4 16:17:05 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/f2c7db99/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 ac3e9ab..338e095 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
@@ -691,7 +691,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());
}