Delete netris IPv6 subnet (#59)

Author: Pearl1594

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/agent/api/DeleteNetrisVnetCommand.java

@@ -20,6 +20,7 @@ public class DeleteNetrisVnetCommand extends NetrisCommand {
     private String vpcName;
     private Long vpcId;
     private final String vNetCidr;
+    private String vNetV6Cidr;
 
     public DeleteNetrisVnetCommand(long zoneId, long accountId, long domainId, String name, long id, String vpcName, Long vpcId, String vNetCidr, boolean isVpc) {
         super(zoneId, accountId, domainId, name, id, isVpc);
@@ -39,4 +40,12 @@ public Long getVpcId() {
     public String getVNetCidr() {
         return vNetCidr;
     }
+
+    public String getvNetV6Cidr() {
+        return vNetV6Cidr;
+    }
+
+    public void setvNetV6Cidr(String vNetV6Cidr) {
+        this.vNetV6Cidr = vNetV6Cidr;
+    }
 }

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

@@ -1066,6 +1066,7 @@ public boolean deleteVnet(DeleteNetrisVnetCommand cmd) {
         Long networkId = cmd.getId();
         boolean isVpc = cmd.isVpc();
         String vnetCidr = cmd.getVNetCidr();
+        String vnetV6Cidr = cmd.getvNetV6Cidr();
         try {
             String netrisVpcName = getNetrisVpcName(cmd, vpcId, vpcName);
             VPCListing associatedVpc = getNetrisVpcResource(netrisVpcName);
@@ -1082,7 +1083,7 @@ public boolean deleteVnet(DeleteNetrisVnetCommand cmd) {
             }
 
             String netrisVnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.VNET, vNetName) ;
-            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetCidr) ;
+            String netrisSubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetCidr);
             FilterByVpc vpcFilter = new FilterByVpc();
             vpcFilter.add(associatedVpc.getId());
             FilterBySites siteFilter = new FilterBySites();
@@ -1091,6 +1092,10 @@ public boolean deleteVnet(DeleteNetrisVnetCommand cmd) {
 
             logger.debug("Successfully deleted vNet {}", vNetName);
             deleteSubnetInternal(vpcFilter, netrisVnetName, netrisSubnetName);
+            if (Objects.nonNull(vnetV6Cidr)) {
+                String netrisV6SubnetName = NetrisResourceObjectUtils.retrieveNetrisResourceObjectName(cmd, NetrisResourceObjectUtils.NetrisObjectType.IPAM_SUBNET, String.valueOf(cmd.getVpcId()), vnetV6Cidr);
+                deleteSubnetInternal(vpcFilter, netrisVnetName, netrisV6SubnetName);
+            }
 
         } catch (Exception e) {
             throw new CloudRuntimeException(String.format("Failed to delete Netris vNet %s", networkName), e);

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

@@ -227,6 +227,10 @@ public boolean createVnetResource(Long zoneId, long accountId, long domainId, St
     @Override
     public boolean deleteVnetResource(long zoneId, long accountId, long domainId, String vpcName, Long vpcId, String networkName, Long networkId, String cidr) {
         DeleteNetrisVnetCommand cmd = new DeleteNetrisVnetCommand(zoneId, accountId, domainId, networkName, networkId, vpcName, vpcId, cidr, Objects.nonNull(vpcName));
+        Ipv6GuestPrefixSubnetNetworkMapVO ipv6PrefixNetworkMapVO = ipv6PrefixNetworkMapDao.findByNetworkId(networkId);
+        if (Objects.nonNull(ipv6PrefixNetworkMapVO)) {
+            cmd.setvNetV6Cidr(ipv6PrefixNetworkMapVO.getSubnet());
+        }
         NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
         return answer.getResult();
     }