Update Subnet purpose for Netris Public Traffic (#17)

Pearl1594 · web-flow · commit b497c65ff0e7 · 2024-11-12T14:58:57.000-03:00
* Update Subnet purpose for Netris Public Traffic

* search for existing subnet of common purpose type
diff --git a/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java b/plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java
@@ -444,10 +444,10 @@ public boolean setupZoneLevelPublicRange(SetupNetrisPublicRangeCommand cmd) {
                 }
                 ipamAllocationId = new BigDecimal(ipamAllocation.getId());
             }
-            IpTreeSubnet exactSubnet = getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(ipamAllocationId, exactCidr, IpTreeSubnet.PurposeEnum.NAT, systemVpc);
+            IpTreeSubnet exactSubnet = getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(ipamAllocationId, exactCidr, IpTreeSubnet.PurposeEnum.COMMON, systemVpc);
             if (exactSubnet == null) {
                 String ipamSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, exactCidr);
-                createIpamSubnetInternal(ipamSubnetName, exactCidr, SubnetBody.PurposeEnum.NAT, systemVpc);
+                createIpamSubnetInternal(ipamSubnetName, exactCidr, SubnetBody.PurposeEnum.COMMON, systemVpc);
             }
         } catch (ApiException e) {
             String msg = String.format("Error setting up the Netris Public Range %s on super CIDR %s", exactCidr, superCidr);

Original file line number	Diff line number	Diff line change
`@@ -444,10 +444,10 @@ public boolean setupZoneLevelPublicRange(SetupNetrisPublicRangeCommand cmd) {`
`444`	`444`	`}`
`445`	`445`	`ipamAllocationId = new BigDecimal(ipamAllocation.getId());`
`446`	`446`	`}`
`447`		`- IpTreeSubnet exactSubnet = getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(ipamAllocationId, exactCidr, IpTreeSubnet.PurposeEnum.NAT, systemVpc);`
	`447`	`+ IpTreeSubnet exactSubnet = getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(ipamAllocationId, exactCidr, IpTreeSubnet.PurposeEnum.COMMON, systemVpc);`
`448`	`448`	`if (exactSubnet == null) {`
`449`	`449`	`String ipamSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, exactCidr);`
`450`		`- createIpamSubnetInternal(ipamSubnetName, exactCidr, SubnetBody.PurposeEnum.NAT, systemVpc);`
	`450`	`+ createIpamSubnetInternal(ipamSubnetName, exactCidr, SubnetBody.PurposeEnum.COMMON, systemVpc);`
`451`	`451`	`}`
`452`	`452`	`} catch (ApiException e) {`
`453`	`453`	`String msg = String.format("Error setting up the Netris Public Range %s on super CIDR %s", exactCidr, superCidr);`