Add Netris Tag parameter to the Network provider and fix zone creation wizard (#33)

* Add Netris Tag parameter to the Network provider

* remove unused import

* Fix public IP ranges creation on zone creation (#34)

* use single quotes

---------

Co-authored-by: Nicolas Vazquez <nicovazquez90@gmail.com>

Author: Pearl1594

api/src/main/java/com/cloud/network/netris/NetrisProvider.java

@@ -27,4 +27,5 @@ public interface NetrisProvider extends InternalIdentity, Identity {
     String getUsername();
     String getSiteName();
     String getTenantName();
+    String getNetrisTag();
 }

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -1162,6 +1162,7 @@ public class ApiConstants {
     public static final String HAS_RULES = "hasrules";
     public static final String NSX_DETAIL_KEY = "forNsx";
     public static final String NETRIS_DETAIL_KEY = "forNetris";
+    public static final String NETRIS_TAG = "netristag";
     public static final String DISK_PATH = "diskpath";
     public static final String IMPORT_SOURCE = "importsource";
     public static final String TEMP_PATH = "temppath";

engine/schema/src/main/java/com/cloud/network/element/NetrisProviderVO.java

@@ -66,6 +66,9 @@ public class NetrisProviderVO implements NetrisProvider {
     @Column(name = "tenant_name")
     private String tenantName;
 
+    @Column(name = "netris_tag")
+    private String netrisTag;
+
     @Column(name = "created")
     private Date created;
 
@@ -171,6 +174,14 @@ public void setTenantName(String tenantName) {
         this.tenantName = tenantName;
     }
 
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
+
     public Date getCreated() {
         return created;
     }
@@ -197,6 +208,7 @@ public static final class Builder {
         private String password;
         private String siteName;
         private String tenantName;
+        private String netrisTag;
 
         public Builder() {
             // Default constructor
@@ -246,6 +258,12 @@ public Builder setTenantName(String tenantName) {
             this.tenantName = tenantName;
             return this;
         }
+
+        public Builder setNetrisTag(String netrisTag) {
+            this.netrisTag = netrisTag;
+            return this;
+        }
+
         public NetrisProviderVO build() {
             NetrisProviderVO provider = new NetrisProviderVO();
             provider.setZoneId(this.zoneId);
@@ -258,6 +276,7 @@ public NetrisProviderVO build() {
             provider.setPassword(this.password);
             provider.setSiteName(this.siteName);
             provider.setTenantName(this.tenantName);
+            provider.setNetrisTag(this.netrisTag);
             provider.setCreated(new Date());
             return provider;
         }

engine/schema/src/main/resources/META-INF/db/schema-41910to42000.sql

@@ -439,6 +439,7 @@ CREATE TABLE `cloud`.`netris_providers` (
     `password` varchar(255) NOT NULL,
     `site_name` varchar(255) NOT NULL,
     `tenant_name` varchar(255) NOT NULL,
+    `netris_tag` varchar(255) NOT NULL,
     `created` datetime NOT NULL COMMENT 'created date',
     `removed` datetime COMMENT 'removed date if not null',
     PRIMARY KEY (`id`),

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

@@ -22,6 +22,7 @@ public class CreateNetrisVnetCommand extends NetrisCommand {
     private String cidr;
     private Integer vxlanId;
     private String gateway;
+    private String netrisTag;
 
     public CreateNetrisVnetCommand(Long zoneId, Long accountId, Long domainId, String vpcName, Long vpcId, String vNetName, Long networkId, String cidr, String gateway, boolean isVpc) {
         super(zoneId, accountId, domainId, vNetName, networkId, isVpc);
@@ -55,4 +56,12 @@ public void setVxlanId(Integer vxlanId) {
     public String getGateway() {
         return gateway;
     }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
 }

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/command/AddNetrisProviderCmd.java

@@ -68,6 +68,9 @@ public class AddNetrisProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.TENANT_NAME, type = CommandType.STRING, required = true, description = "Password to login into Netris")
     private String tenantName;
 
+    @Parameter(name = ApiConstants.NETRIS_TAG, type = CommandType.STRING, required = true, description = "Netris tag for vNets")
+    private String netrisTag;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -104,6 +107,10 @@ public String getTenantName() {
         return tenantName;
     }
 
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
     @Override
     public void execute() throws ServerApiException, ConcurrentOperationException {
         NetrisProvider provider = netrisProviderService.addProvider(this);

plugins/network-elements/netris/src/main/java/org/apache/cloudstack/api/response/NetrisProviderResponse.java

@@ -57,6 +57,10 @@ public class NetrisProviderResponse extends BaseResponse {
     @Param(description = "Netris Admin tenant name")
     private String tenantName;
 
+    @SerializedName(ApiConstants.NETRIS_TAG)
+    @Param(description = "Netris Tag for vNets")
+    private String netrisTag;
+
     public String getName() {
         return name;
     }
@@ -120,4 +124,12 @@ public String getTenantName() {
     public void setTenantName(String tenantName) {
         this.tenantName = tenantName;
     }
+
+    public String getNetrisTag() {
+        return netrisTag;
+    }
+
+    public void setNetrisTag(String netrisTag) {
+        this.netrisTag = netrisTag;
+    }
 }

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

@@ -86,6 +86,7 @@
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -382,7 +383,7 @@ public boolean createVnet(CreateNetrisVnetCommand cmd) {
         Long networkId = cmd.getId();
         String vnetCidr = cmd.getCidr();
         Integer vxlanId = cmd.getVxlanId();
-        String gateway = cmd.getGateway();
+        String netrisTag = cmd.getNetrisTag();
         String netmask = vnetCidr.split("/")[1];
         String netrisGateway = cmd.getGateway() + "/" + netmask;
         boolean isVpc = cmd.isVpc();
@@ -407,7 +408,7 @@ public boolean createVnet(CreateNetrisVnetCommand cmd) {
         createIpamSubnetInternal(netrisSubnetName, vnetCidr, SubnetBody.PurposeEnum.COMMON, associatedVpc);
         logger.debug("Successfully created IPAM Subnet {} for network {} on Netris", netrisSubnetName, networkName);
 
-        VnetResAddBody vnetResponse = createVnetInternal(associatedVpc, netrisVnetName, netrisGateway, vxlanId);
+        VnetResAddBody vnetResponse = createVnetInternal(associatedVpc, netrisVnetName, netrisGateway, vxlanId, netrisTag);
         if (vnetResponse == null || !vnetResponse.isIsSuccess()) {
             String reason = vnetResponse == null ? "Empty response" : "Operation failed on Netris";
             logger.debug("The Netris vNet creation {} failed: {}", vNetName, reason);
@@ -899,7 +900,7 @@ private InlineResponse2004Data createIpamSubnetInternal(String subnetName, Strin
         }
     }
 
-    VnetResAddBody createVnetInternal(VPCListing associatedVpc, String netrisVnetName, String netrisGateway, Integer vxlanId) {
+    VnetResAddBody createVnetInternal(VPCListing associatedVpc, String netrisVnetName, String netrisGateway, Integer vxlanId, String netrisTag) {
         logger.debug("Creating Netris VPC vNet {} for CIDR {}", netrisVnetName, netrisGateway);
         try {
             VnetAddBody vnetBody = new VnetAddBody();
@@ -950,6 +951,8 @@ VnetResAddBody createVnetInternal(VPCListing associatedVpc, String netrisVnetNam
             vpc.setId(associatedVpc.getId());
             vnetBody.setVpc(vpc);
 
+            vnetBody.setTags(Collections.singletonList(netrisTag));
+
             VNetApi vnetApi = apiClient.getApiStubForMethod(VNetApi.class);
             return vnetApi.apiV2VnetPost(vnetBody);
         } catch (ApiException e) {

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

@@ -86,6 +86,7 @@ public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
         final String password = cmd.getPassword();
         final String tenantName = cmd.getTenantName();
         final String siteName = cmd.getSiteName();
+        final String netrisTag = cmd.getNetrisTag();
 
         Map<String, String> params = new HashMap<>();
         params.put("guid", UUID.randomUUID().toString());
@@ -97,6 +98,7 @@ public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
         params.put("password", password);
         params.put("siteName", siteName);
         params.put("tenantName", tenantName);
+        params.put("netrisTag", netrisTag);
 
         Map<String, Object> hostdetails = new HashMap<>(params);
         NetrisProvider netrisProvider;
@@ -117,6 +119,7 @@ public NetrisProvider addProvider(AddNetrisProviderCmd cmd) {
                             .setPassword(password)
                             .setSiteName(siteName)
                             .setTenantName(tenantName)
+                            .setNetrisTag(netrisTag)
                             .build();
 
                     netrisProviderDao.persist(netrisProviderVO);
@@ -190,6 +193,7 @@ public NetrisProviderResponse createNetrisProviderResponse(NetrisProvider provid
         response.setZoneName(zone.getName());
         response.setSiteName(provider.getSiteName());
         response.setTenantName(provider.getTenantName());
+        response.setNetrisTag(provider.getNetrisTag());
         response.setObjectName("netrisProvider");
         return response;
     }

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

@@ -203,6 +203,8 @@ public boolean createVnetResource(Long zoneId, long accountId, long domainId, St
         String vxlanId = Networks.BroadcastDomainType.getValue(network.getBroadcastUri());
         CreateNetrisVnetCommand cmd = new CreateNetrisVnetCommand(zoneId, accountId, domainId, vpcName, vpcId, networkName, networkId, cidr, network.getGateway(), !Objects.isNull(vpcId));
         cmd.setVxlanId(Integer.parseInt(vxlanId));
+        NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(zoneId);
+        cmd.setNetrisTag(netrisProvider.getNetrisTag());
         NetrisAnswer answer = sendNetrisCommand(cmd, zoneId);
         return answer.getResult();
     }