Routed: do not show ROUTED mode when create network/vpc offering if routed is disabled

Author: weizhouapache

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -106,6 +106,7 @@
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
 import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.cloudstack.network.RoutedIpv4Manager;
 import org.apache.cloudstack.query.QueryService;
 import org.apache.cloudstack.region.PortableIp;
 import org.apache.cloudstack.region.PortableIpDao;
@@ -6673,6 +6674,9 @@ public NetworkOfferingVO createNetworkOffering(final String name, final String d
                 throw new InvalidParameterValueException("networkMode should be set only for Isolated network offerings");
             }
             if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode)) {
+                if (!RoutedIpv4Manager.RoutedNetworkVpcEnabled.value()) {
+                    throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed networks", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key()));
+                }
                 boolean useVirtualRouterOnly = true;
                 for (Service service : serviceProviderMap.keySet()) {
                     Set<Provider> providers = serviceProviderMap.get(service);

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

@@ -500,6 +500,9 @@ public VpcOffering createVpcOffering(CreateVPCOfferingCmd cmd) {
             }
             networkMode = NetworkOffering.NetworkMode.valueOf(networkModeStr);
         }
+        if (NetworkOffering.NetworkMode.ROUTED.equals(networkMode) && !RoutedIpv4Manager.RoutedNetworkVpcEnabled.value()) {
+            throw new InvalidParameterValueException(String.format("Configuration %s needs to be enabled for Routed VPCs", RoutedIpv4Manager.RoutedNetworkVpcEnabled.key()));
+        }
         boolean specifyAsNumber = cmd.getSpecifyAsNumber();
         String routingModeString = cmd.getRoutingMode();
 

ui/src/views/offering/AddNetworkOffering.vue

@@ -615,6 +615,7 @@ export default {
       zones: [],
       zoneLoading: false,
       ipv6NetworkOfferingEnabled: false,
+      routedNetworkEnabled: false,
       loading: false,
       networkmode: '',
       networkmodes: [
@@ -704,6 +705,7 @@ export default {
       this.fetchSupportedServiceData()
       this.fetchServiceOfferingData()
       this.fetchIpv6NetworkOfferingConfiguration()
+      this.fetchRoutedNetworkConfiguration()
     },
     isAdmin () {
       return isAdmin()
@@ -732,6 +734,17 @@ export default {
         this.ipv6NetworkOfferingEnabled = value === 'true'
       })
     },
+    fetchRoutedNetworkConfiguration () {
+      this.routedNetworkEnabled = false
+      var params = { name: 'routed.network.vpc.enabled' }
+      api('listConfigurations', params).then(json => {
+        var value = json?.listconfigurationsresponse?.configuration?.[0].value || null
+        this.routedNetworkEnabled = value === 'true'
+      })
+      if (!this.routedNetworkEnabled) {
+        this.networkmodes.pop()
+      }
+    },
     fetchZoneData () {
       const params = {}
       params.showicon = true

ui/src/views/offering/AddVpcOffering.vue

@@ -283,6 +283,7 @@ export default {
       sourceNatServiceChecked: false,
       selectedServiceProviderMap: {},
       ipv6NetworkOfferingEnabled: false,
+      routedNetworkEnabled: false,
       routingMode: 'static',
       networkmode: '',
       networkmodes: [
@@ -351,6 +352,7 @@ export default {
       this.fetchZoneData()
       this.fetchSupportedServiceData()
       this.fetchIpv6NetworkOfferingConfiguration()
+      this.fetchRoutedNetworkConfiguration()
     },
     isAdmin () {
       return isAdmin()
@@ -363,6 +365,17 @@ export default {
         this.ipv6NetworkOfferingEnabled = value === 'true'
       })
     },
+    fetchRoutedNetworkConfiguration () {
+      this.routedNetworkEnabled = false
+      var params = { name: 'routed.network.vpc.enabled' }
+      api('listConfigurations', params).then(json => {
+        var value = json?.listconfigurationsresponse?.configuration?.[0].value || null
+        this.routedNetworkEnabled = value === 'true'
+      })
+      if (!this.routedNetworkEnabled) {
+        this.networkmodes.pop()
+      }
+    },
     fetchDomainData () {
       const params = {}
       params.listAll = true