Validate if given CIDR belongs to a bigger allocation in Netris before creating the zone-level allocation (#48)

* Validate if given CIDR belongs to a bigger allocation in Netris before creating

* rename method

Author: Pearl1594

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/service/NetrisApiClientImpl.java

@@ -18,6 +18,8 @@
 
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
+import inet.ipaddr.IPAddress;
+import inet.ipaddr.IPAddressString;
 import io.netris.ApiClient;
 import io.netris.ApiException;
 import io.netris.ApiResponse;
@@ -815,11 +817,19 @@ private BigDecimal getIpamAllocationIdByPrefixAndVpc(String superCidrPrefix, VPC
         filterByVpc.add(vpc.getId());
         IpTree ipamTree = ipamApi.apiV2IpamGet(filterBySites, filterByVpc);
         List<IpTreeAllocation> superCidrList = ipamTree.getData().stream()
-                .filter(x -> x.getPrefix().equals(superCidrPrefix))
+                .filter(x -> x.getPrefix().equals(superCidrPrefix) || isAllocationPartOfBiggerAllocation(x.getPrefix(), superCidrPrefix))
                 .collect(Collectors.toList());
         return CollectionUtils.isEmpty(superCidrList) ? null : superCidrList.get(0).getId();
     }
 
+    private boolean isAllocationPartOfBiggerAllocation(String netrisAllocation, String providedAllocation) {
+        IPAddress biggerAllocation = new IPAddressString(netrisAllocation).getAddress();
+        IPAddress smallerAllocation = new IPAddressString(providedAllocation).getAddress();
+
+        return biggerAllocation.contains(smallerAllocation);
+
+    }
+
     private IpTreeSubnet getIpamSubnetByAllocationAndPrefixAndPurposeAndVpc(BigDecimal ipamAllocationId, String exactCidr, IpTreeSubnet.PurposeEnum purpose, VPCListing vpc) throws ApiException {
         IpamApi ipamApi = apiClient.getApiStubForMethod(IpamApi.class);
         FilterByVpc filterByVpc = new FilterByVpc();