Merge remote-tracking branch 'apache/4.17' into main

shwstppr · shwstppr · commit f76b6c686d61 · 2022-08-25T10:09:11.000+05:30
diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java
@@ -1075,7 +1075,11 @@ private boolean releaseIpAddressInternal(long ipAddressId) throws InsufficientAd
         if (networkId != null) {
             guestNetwork = getNetwork(networkId);
         }
-        if (ipVO.isSourceNat() && guestNetwork != null && guestNetwork.getState() != Network.State.Allocated) {
+        Vpc vpc = null;
+        if (ipVO.getVpcId() != null) {
+            vpc = _vpcMgr.getActiveVpc(ipVO.getVpcId());
+        }
+        if (ipVO.isSourceNat() && ((guestNetwork != null && guestNetwork.getState() != Network.State.Allocated) || vpc != null)) {
             throw new IllegalArgumentException("ip address is used for source nat purposes and can not be disassociated.");
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,11 @@ private boolean releaseIpAddressInternal(long ipAddressId) throws InsufficientAd`
`1075`	`1075`	`if (networkId != null) {`
`1076`	`1076`	`guestNetwork = getNetwork(networkId);`
`1077`	`1077`	`}`
`1078`		`- if (ipVO.isSourceNat() && guestNetwork != null && guestNetwork.getState() != Network.State.Allocated) {`
	`1078`	`+ Vpc vpc = null;`
	`1079`	`+ if (ipVO.getVpcId() != null) {`
	`1080`	`+ vpc = _vpcMgr.getActiveVpc(ipVO.getVpcId());`
	`1081`	`+ }`
	`1082`	`+ if (ipVO.isSourceNat() && ((guestNetwork != null && guestNetwork.getState() != Network.State.Allocated) \|\| vpc != null)) {`
`1079`	`1083`	`throw new IllegalArgumentException("ip address is used for source nat purposes and can not be disassociated.");`
`1080`	`1084`	`}`
`1081`	`1085`