Netris: Fix Netris provider parameter name and response (#11377)

* Fix Netris url param name and allow cidr size for routed mode vpcs

* rename response parameter name

Author: Pearl1594

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

@@ -1272,6 +1272,7 @@ public class ApiConstants {
     public static final String NETRIS_DETAIL_KEY = "forNetris";
     public static final String NETRIS_TAG = "netristag";
     public static final String NETRIS_VXLAN_ID = "netrisvxlanid";
+    public static final String NETRIS_URL = "netrisurl";
     public static final String DISK_PATH = "diskpath";
     public static final String IMPORT_SOURCE = "importsource";
     public static final String TEMP_PATH = "temppath";

api/src/main/java/org/apache/cloudstack/network/RoutedIpv4Manager.java

@@ -158,7 +158,7 @@ public interface RoutedIpv4Manager extends PluggableService, Configurable {
 
     boolean isRoutedVpc(Vpc vpc);
 
-    boolean isVpcVirtualRouterGateway(VpcOffering vpcOffering);
+    boolean isValidGateway(VpcOffering vpcOffering);
 
     BgpPeer createBgpPeer(CreateBgpPeerCmd createBgpPeerCmd);
 

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

@@ -53,7 +53,7 @@ public class AddNetrisProviderCmd extends BaseCmd {
     @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Netris provider name")
     private String name;
 
-    @Parameter(name = ApiConstants.URL, type = CommandType.STRING, required = true, description = "Netris provider URL")
+    @Parameter(name = ApiConstants.NETRIS_URL, type = CommandType.STRING, required = true, description = "Netris provider URL")
     private String url;
 
     @Parameter(name = ApiConstants.USERNAME, type = CommandType.STRING, required = true, description = "Username to login into Netris")

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

@@ -41,13 +41,9 @@ public class NetrisProviderResponse extends BaseResponse {
     @Param(description = "Zone name to which the Netris Provider is associated with")
     private String zoneName;
 
-    @SerializedName(ApiConstants.HOST_NAME)
-    @Param(description = "Netris Provider hostname or IP address")
-    private String hostname;
-
-    @SerializedName(ApiConstants.PORT)
-    @Param(description = "Netris Provider port")
-    private String port;
+    @SerializedName(ApiConstants.NETRIS_URL)
+    @Param(description = "Netris Provider URL")
+    private String netrisUrl;
 
     @SerializedName(ApiConstants.SITE_NAME)
     @Param(description = "Netris Provider site")
@@ -93,20 +89,12 @@ public void setZoneName(String zoneName) {
         this.zoneName = zoneName;
     }
 
-    public String getHostname() {
-        return hostname;
-    }
-
-    public void setHostname(String hostname) {
-        this.hostname = hostname;
-    }
-
-    public String getPort() {
-        return port;
+    public String getNetrisUrl() {
+        return netrisUrl;
     }
 
-    public void setPort(String port) {
-        this.port = port;
+    public void setNetrisUrl(String netrisUrl) {
+        this.netrisUrl = netrisUrl;
     }
 
     public String getSiteName() {

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

@@ -184,7 +184,7 @@ public NetrisProviderResponse createNetrisProviderResponse(NetrisProvider provid
         NetrisProviderResponse response = new NetrisProviderResponse();
         response.setName(provider.getName());
         response.setUuid(provider.getUuid());
-        response.setHostname(provider.getUrl());
+        response.setNetrisUrl(provider.getUrl());
         response.setZoneId(zone.getUuid());
         response.setZoneName(zone.getName());
         response.setSiteName(provider.getSiteName());

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

@@ -1345,7 +1345,7 @@ private void validateVpcCidrSize(Account caller, long accountId, VpcOffering vpc
         if (ObjectUtils.allNotNull(cidr, cidrSize)) {
             throw new InvalidParameterValueException("VPC cidr and cidr size are mutually exclusive");
         }
-        if (routedIpv4Manager.isVpcVirtualRouterGateway(vpcOffering)) {
+        if (routedIpv4Manager.isValidGateway(vpcOffering)) {
             if (cidr != null) {
                 if (!_accountMgr.isRootAdmin(caller.getId())) {
                     throw new InvalidParameterValueException("Only root admin can set the gateway/netmask of VPC with ROUTED mode");

server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java

@@ -1021,9 +1021,10 @@ public boolean isDynamicRoutedVpc(VpcOffering vpcOffering) {
     }
 
     @Override
-    public boolean isVpcVirtualRouterGateway(VpcOffering vpcOffering) {
+    public boolean isValidGateway(VpcOffering vpcOffering) {
         return NetworkOffering.NetworkMode.ROUTED.equals(vpcOffering.getNetworkMode())
-                && vpcOfferingServiceMapDao.findByServiceProviderAndOfferingId(Service.Gateway.getName(), Provider.VPCVirtualRouter.getName(), vpcOffering.getId()) != null;
+                && (vpcOfferingServiceMapDao.findByServiceProviderAndOfferingId(Service.Gateway.getName(), Provider.VPCVirtualRouter.getName(), vpcOffering.getId()) != null
+                || vpcOfferingServiceMapDao.findByServiceProviderAndOfferingId(Service.Gateway.getName(), Provider.Netris.getName(), vpcOffering.getId()) != null);
     }
 
     @Override

server/src/test/java/com/cloud/network/vpc/VpcManagerImplTest.java

@@ -551,7 +551,7 @@ public void testCreateRoutedVpcWithDynamicRouting() {
         Mockito.when(vpcDao.persist(any(), anyMap())).thenReturn(vpc);
         Mockito.when(vpc.getUuid()).thenReturn("uuid");
         doReturn(true).when(routedIpv4Manager).isRoutedVpc(any());
-        doReturn(true).when(routedIpv4Manager).isVpcVirtualRouterGateway(vpcOfferingVO);
+        doReturn(true).when(routedIpv4Manager).isValidGateway(vpcOfferingVO);
         doReturn(true).when(routedIpv4Manager).isDynamicRoutedVpc(vpcOfferingVO);
         Ipv4GuestSubnetNetworkMap ipv4GuestSubnetNetworkMap = Mockito.mock(Ipv4GuestSubnetNetworkMap.class);
         doReturn(ipv4GuestSubnetNetworkMap).when(routedIpv4Manager).getOrCreateIpv4SubnetForVpc(any(), anyInt());

ui/public/locales/en.json

@@ -1611,6 +1611,7 @@
 "label.netmask": "Netmask",
 "label.netris": "Netris",
 "label.netristag": "Netris tag",
+"label.netrisurl": "Netris URL",
 "label.netris.provider": "Netris Provider",
 "label.netris.provider.name": "Netris provider name",
 "label.netris.provider.username": "Netris provider username",

ui/src/views/infra/network/ServiceProvidersTab.vue

@@ -1169,7 +1169,7 @@ export default {
                   value: (record) => { return record.zoneid }
                 }
               },
-              columns: ['name', 'hostname', 'port', 'site', 'tenantname', 'netristag']
+              columns: ['name', 'netrisurl', 'site', 'tenantname', 'netristag']
             }
           ]
         }