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/4.5 to e474454
Date Mon, 26 Jan 2015 15:58:35 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 766f8216a -> e474454c9


CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router
by setting vpcid to null in network


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

Branch: refs/heads/4.5
Commit: e474454c912af666eb062c821b6976dbf2e01cb6
Parents: 766f821
Author: Daan Hoogland <daan@onecht.net>
Authored: Mon Jan 26 16:54:53 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Mon Jan 26 16:57:46 2015 +0100

----------------------------------------------------------------------
 engine/schema/src/com/cloud/network/dao/NetworkVO.java | 2 +-
 server/src/com/cloud/network/vpc/VpcManagerImpl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e474454c/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 6d4add7..b033210 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -606,7 +606,7 @@ public class NetworkVO implements Network {
         this.strechedL2Network = strechedL2Network;
     }
 
-    public void setVpcId(long vpcId) {
+    public void setVpcId(Long vpcId) {
         this.vpcId = vpcId;
     }
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e474454c/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 c49da15..796b590 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1654,7 +1654,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager,
VpcProvis
             // 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);
+            gatewaynet.setVpcId(null);
             _ntwkDao.persist(gatewaynet);
         }
 


Mime
View raw message