Merge pull request #1970 from bvbharatk/CLOUDSTACK-9725

karuturi · web-flow · commit 992ce6e64f50 · 2017-05-02T11:06:54.000+05:30
CLOUDSTACK-9725 Failed to update VPC Network during N/w offering Upgr…
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -2022,7 +2022,7 @@ public Network updateGuestNetwork(final long networkId, String name, String disp
         //perform below validation if the network is vpc network
         if (network.getVpcId() != null && networkOfferingId != null) {
             Vpc vpc = _entityMgr.findById(Vpc.class, network.getVpcId());
-            _vpcMgr.validateNtwkOffForNtwkInVpc(networkId, networkOfferingId, null, null, vpc, null, _accountMgr.getAccount(network.getAccountId()), null);
+            _vpcMgr.validateNtwkOffForNtwkInVpc(networkId, networkOfferingId, null, null, vpc, null, _accountMgr.getAccount(network.getAccountId()), network.getNetworkACLId());
         }
 
         // don't allow to update network in Destroy state

Original file line number	Diff line number	Diff line change
`@@ -2022,7 +2022,7 @@ public Network updateGuestNetwork(final long networkId, String name, String disp`
`2022`	`2022`	`//perform below validation if the network is vpc network`
`2023`	`2023`	`if (network.getVpcId() != null && networkOfferingId != null) {`
`2024`	`2024`	`Vpc vpc = _entityMgr.findById(Vpc.class, network.getVpcId());`
`2025`		`- _vpcMgr.validateNtwkOffForNtwkInVpc(networkId, networkOfferingId, null, null, vpc, null, _accountMgr.getAccount(network.getAccountId()), null);`
	`2025`	`+ _vpcMgr.validateNtwkOffForNtwkInVpc(networkId, networkOfferingId, null, null, vpc, null, _accountMgr.getAccount(network.getAccountId()), network.getNetworkACLId());`
`2026`	`2026`	`}`
`2027`	`2027`
`2028`	`2028`	`// don't allow to update network in Destroy state`