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

Author: Pearl1594

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

@@ -1269,6 +1269,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")

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/src/views/infra/zone/ZoneWizardLaunchZone.vue

@@ -1133,7 +1133,7 @@ export default {
         if (!this.stepData.stepMove.includes('addNetrisProvider')) {
           const providerParams = {}
           providerParams.name = this.prefillContent?.netrisName || ''
-          providerParams.url = this.prefillContent?.url || ''
+          providerParams.netrisurl = this.prefillContent?.netrisurl || ''
           providerParams.username = this.prefillContent?.username || ''
           providerParams.password = this.prefillContent?.password || ''
           providerParams.zoneid = this.stepData.zoneReturned.id

ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue

@@ -485,7 +485,7 @@ export default {
         },
         {
           title: 'label.netris.provider.url',
-          key: 'url',
+          key: 'netrisurl',
           placeHolder: 'message.installwizard.tooltip.netris.provider.url',
           required: true
         },