cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/master to 16bf065
Date Sat, 24 May 2014 17:44:12 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 9fa9e3aaf -> 16bf065a0


CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router


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

Branch: refs/heads/master
Commit: 16bf065a0d3b1fcc486db7a9d4aec81bb034b1ce
Parents: 9fa9e3a
Author: Daan Hoogland <daan@onecht.net>
Authored: Sat May 24 19:44:00 2014 +0200
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sat May 24 19:44:00 2014 +0200

----------------------------------------------------------------------
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/16bf065a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 9d30fc7..71f2316 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1623,6 +1623,18 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
             networkAclId = aclId;
         }
 
+        {   // experimental block, this is a hack
+            // set vpc id in network to null
+            // might be needed for all types of broadcast domains
+            // the ugly hack is that vpc gateway nets are created as guest network
+            // while they are not.
+            // A more permanent solution would be to define a type of 'gatewaynetwork'
+            // so that handling code is not mixed between the two
+            NetworkVO gatewaynet = _ntwkDao.findById(privateNtwk.getId());
+            gatewaynet.setVpcId(vpcId);
+            _ntwkDao.persist(gatewaynet);
+        }
+
         //2) create gateway entry
                     VpcGatewayVO gatewayVO =
                         new VpcGatewayVO(ipAddress, VpcGateway.Type.Private, vpcId, privateNtwk.getDataCenterId(),
privateNtwk.getId(), broadcastUri, gateway, netmask,


Mime
View raw message