CLOUDSTACK-2952 Fixed configuring private gateway with another vpc acl id

Jayapal · Jayapal · commit 2e0abccd3b0e · 2013-06-20T16:11:20.000+05:30
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1385,9 +1385,14 @@ public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId
 
         long networkAclId = NetworkACL.DEFAULT_DENY;
         if (aclId != null) {
-            if ( _networkAclDao.findById(aclId) == null) {
+            NetworkACLVO aclVO = _networkAclDao.findById(aclId);
+            if ( aclVO == null) {
                 throw new InvalidParameterValueException("Invalid network acl id passed ");
             }
+            if (aclVO.getVpcId() != vpcId ) {
+                throw new InvalidParameterValueException("Private gateway and network acl are not in the same vpc");
+            }
+
             networkAclId = aclId;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1385,9 +1385,14 @@ public PrivateGateway createVpcPrivateGateway(long vpcId, Long physicalNetworkId`
`1385`	`1385`
`1386`	`1386`	`long networkAclId = NetworkACL.DEFAULT_DENY;`
`1387`	`1387`	`if (aclId != null) {`
`1388`		`- if ( _networkAclDao.findById(aclId) == null) {`
	`1388`	`+ NetworkACLVO aclVO = _networkAclDao.findById(aclId);`
	`1389`	`+ if ( aclVO == null) {`
`1389`	`1390`	`throw new InvalidParameterValueException("Invalid network acl id passed ");`
`1390`	`1391`	`}`
	`1392`	`+ if (aclVO.getVpcId() != vpcId ) {`
	`1393`	`+ throw new InvalidParameterValueException("Private gateway and network acl are not in the same vpc");`
	`1394`	`+ }`
	`1395`	`+`
`1391`	`1396`	`networkAclId = aclId;`
`1392`	`1397`	`}`
`1393`	`1398`