cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 2fd6fac
Date Wed, 04 Nov 2015 10:38:34 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 6f2e6a7fa -> 2fd6fac21


CLOUDSTACK-89027 Restart Network fails in EIP/ELB zone


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3c61746d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3c61746d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3c61746d

Branch: refs/heads/master
Commit: 3c61746dcec5025d10fda0f85c9157f69f58b15d
Parents: a601ae4
Author: Bharat Kumar <bharat.kumar@citrix.com>
Authored: Wed Sep 23 14:05:38 2015 +0530
Committer: Bharat Kumar <bharat.kumar@citrix.com>
Committed: Wed Sep 23 16:19:37 2015 +0530

----------------------------------------------------------------------
 .../com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c61746d/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
index d7ee2b6..75267c7 100644
--- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
+++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
@@ -1009,7 +1009,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends
AdapterBase
         }
 
         // Send a command to the external load balancer to implement or shutdown the guest
network
-        long guestVlanTag = Long.parseLong(BroadcastDomainType.getValue(guestConfig.getBroadcastUri()));
+        String guestVlanTag = BroadcastDomainType.getValue(guestConfig.getBroadcastUri());
         String selfIp = null;
         String guestVlanNetmask = NetUtils.cidr2Netmask(guestConfig.getCidr());
         Integer networkRate = _networkModel.getNetworkRate(guestConfig.getId(), null);
@@ -1042,7 +1042,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends
AdapterBase
         // It's a hack, using isOneToOneNat field for indicate if it's inline or not
         boolean inline = _networkMgr.isNetworkInlineMode(guestConfig);
         IpAddressTO ip =
-            new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, String.valueOf(guestVlanTag),
selfIp, guestVlanNetmask, null, networkRate, inline);
+            new IpAddressTO(guestConfig.getAccountId(), null, add, false, true, guestVlanTag,
selfIp, guestVlanNetmask, null, networkRate, inline);
         IpAddressTO[] ips = new IpAddressTO[1];
         ips[0] = ip;
         IpAssocCommand cmd = new IpAssocCommand(ips);


Mime
View raw message