cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaya...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3 to dd039da
Date Wed, 18 Dec 2013 06:58:04 GMT
CLOUDSTACK-5505: Fixed issue in getting interface number in IpAssocVpcCommand

Regression from the below commit

commit 494ccd821d711a2957531d1c33274ed293e4d925
Author: ynojima <mail@ynojima.net>
Date:   Wed Nov 6 11:02:56 2013 -0700
    Bugfix: VR has double NICs connected to Public network


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

Branch: refs/heads/4.3
Commit: dd039da7e4567b4962d25128964998c23d32dc72
Parents: 8354f33
Author: Jayapal <jayapal@apache.org>
Authored: Wed Dec 18 11:42:23 2013 +0530
Committer: Jayapal <jayapal@apache.org>
Committed: Wed Dec 18 12:27:20 2013 +0530

----------------------------------------------------------------------
 .../network/router/VpcVirtualNetworkApplianceManagerImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd039da7/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 1396e42..c9cdb1f 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -811,7 +811,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
                     // should this be a vlan id or a broadcast uri???
                     String vlanTag = BroadcastDomainType.getValue(network.getBroadcastUri());
                     String netmask = NetUtils.getCidrNetmask(network.getCidr());
-                    PrivateIpAddress ip = new PrivateIpAddress(ipVO, vlanTag, network.getGateway(),
netmask, guestNic.getMacAddress());
+                    PrivateIpAddress ip = new PrivateIpAddress(ipVO, network.getBroadcastUri().toString(),
network.getGateway(), netmask, guestNic.getMacAddress());
                     
                     List<PrivateIpAddress> privateIps = new ArrayList<PrivateIpAddress>(1);
                     privateIps.add(ip);
@@ -957,7 +957,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
             // or maybe conditional; in case of vlan ... in case of lswitch
             String vlanTag = BroadcastDomainType.getValue(network.getBroadcastUri());
             String netmask = NetUtils.getCidrNetmask(network.getCidr());
-            PrivateIpAddress ip = new PrivateIpAddress(ipVO, vlanTag, network.getGateway(),
netmask, privateNic.getMacAddress());
+            PrivateIpAddress ip = new PrivateIpAddress(ipVO, network.getBroadcastUri().toString(),
network.getGateway(), netmask, privateNic.getMacAddress());
             
             List<PrivateIpAddress> privateIps = new ArrayList<PrivateIpAddress>(1);
             privateIps.add(ip);


Mime
View raw message