api/server: apply suggestions

weizhouapache · weizhouapache · commit 538330187987 · 2026-04-16T13:52:34.000+02:00
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -4483,7 +4483,11 @@ public Map<String, String> finalizeServicesAndProvidersForNetwork(final NetworkO
             if (provider == null) {
                 provider = _networkModel.getDefaultUniqueProviderForService(service).getName();
             } else {
-                provider = _networkModel.resolveProvider(provider).getName();
+                final Provider resolvedProvider = _networkModel.resolveProvider(provider);
+                if (resolvedProvider == null) {
+                    throw new InvalidParameterValueException("Invalid provider " + provider + " configured for service " + service);
+                }
+                provider = resolvedProvider.getName();
             }
 
             // check that provider is supported
@@ -4509,7 +4513,10 @@ private List<Provider> getNetworkProviders(final long networkId) {
         final List<String> providerNames = _ntwkSrvcDao.getDistinctProviders(networkId);
         final List<Provider> providers = new ArrayList<>();
         for (final String providerName : providerNames) {
-            providers.add(_networkModel.resolveProvider(providerName));
+            final Provider provider = _networkModel.resolveProvider(providerName);
+            if (provider != null) {
+                providers.add(provider);
+            }
         }
 
         return providers;
diff --git a/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java b/framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java
@@ -196,7 +196,7 @@
  * <pre>{"host":"192.168.1.10","namespace":"cs-net-42"}</pre>
  *
  * <h3>Network capabilities</h3>
- * When creating the extension, set detail {@code network.capabilities} to a
+ * When creating the extension, set detail {@code network.service.capabilities} to a
  * JSON object describing the services and their capabilities:
  * <pre>
  * {
@@ -333,7 +333,7 @@ public NetworkExtensionElement withProviderName(String providerName) {
     public Map<Service, Map<Capability, String>> getCapabilities() {
         try {
             // If this element is scoped to a provider name, prefer capabilities stored
-            // in the extension's "network.capabilities" detail.  The ExtensionHelper
+            // in the extension's "network.service.capabilities" detail.  The ExtensionHelper
             // exposes a helper that loads the Service→Capability map from the DB.
             if (providerName != null && !providerName.isBlank()) {
                 Map<Service, Map<Capability, String>> caps = extensionHelper.getNetworkCapabilitiesForProvider(null, providerName);
@@ -342,7 +342,7 @@ public Map<Service, Map<Capability, String>> getCapabilities() {
                 }
             }
         } catch (Exception e) {
-            logger.warn("Failed to load network capabilities from extension details for provider '{}': {}", providerName, e.getMessage());
+            logger.warn("Failed to load network service capabilities from extension details for provider '{}': {}", providerName, e.getMessage());
         }
 
         return DEFAULT_CAPABILITIES;
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -3305,8 +3305,10 @@ public ProviderResponse createNetworkServiceProviderResponse(PhysicalNetworkServ
         response.setServices(services);
 
         Provider serviceProvider = networkModel.resolveProvider(result.getProviderName());
-        boolean canEnableIndividualServices = ApiDBUtils.canElementEnableIndividualServices(serviceProvider);
-        response.setCanEnableIndividualServices(canEnableIndividualServices);
+        if (serviceProvider != null) {
+            boolean canEnableIndividualServices = ApiDBUtils.canElementEnableIndividualServices(serviceProvider);
+            response.setCanEnableIndividualServices(canEnableIndividualServices);
+        }
 
         response.setObjectName("networkserviceprovider");
         return response;
diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
@@ -1266,7 +1266,11 @@ public Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long ne
             if (providers == null) {
                 providers = new HashSet<Provider>();
             }
-            providers.add(resolveProvider(instance.getProvider()));
+
+            final Provider provider = resolveProvider(instance.getProvider());
+            if (provider != null) {
+                providers.add(provider);
+            }
             serviceProviderMap.put(Service.getService(service), providers);
         }
 
diff --git a/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/main/java/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -723,7 +723,9 @@ public boolean applyRules(Network network, Purpose purpose, List<? extends Firew
                 String fwProviderName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), Service.Firewall);
                 if (fwProviderName != null) {
                     NetworkElement element = _networkModel.getElementImplementingProvider(fwProviderName);
-                    handled = ((FirewallServiceProvider) element).applyFWRules(network, rules);
+                    if (element instanceof FirewallServiceProvider) {
+                        handled = ((FirewallServiceProvider) element).applyFWRules(network, rules);
+                    }
                 }
             }
             break;
@@ -743,7 +745,9 @@ public boolean applyRules(Network network, Purpose purpose, List<? extends Firew
                 String pfProviderName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), Service.PortForwarding);
                 if (pfProviderName != null) {
                     NetworkElement element = _networkModel.getElementImplementingProvider(pfProviderName);
-                    handled = ((PortForwardingServiceProvider) element).applyPFRules(network, (List<PortForwardingRule>) rules);
+                    if (element instanceof PortForwardingServiceProvider) {
+                        handled = ((PortForwardingServiceProvider) element).applyPFRules(network, (List<PortForwardingRule>) rules);
+                    }
                 }
             }
             break;
diff --git a/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java b/server/src/main/java/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
@@ -2055,7 +2055,9 @@ protected boolean applyLbRules(Network network, List<LoadBalancingRule> rules) t
             String lbProviderName = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.Lb);
             if (lbProviderName != null) {
                 NetworkElement element = _networkModel.getElementImplementingProvider(lbProviderName);
-                handled = ((LoadBalancingServiceProvider) element).applyLBRules(network, rules);
+                if (element instanceof LoadBalancingServiceProvider) {
+                    handled = ((LoadBalancingServiceProvider) element).applyLBRules(network, rules);
+                }
             }
         }
         return handled;
diff --git a/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -455,7 +455,10 @@ public boolean applyACLItemsToNetwork(final long networkId, final List<NetworkAC
             if (aclProviderName != null) {
                 foundProvider = true;
                 NetworkElement element = _networkModel.getElementImplementingProvider(aclProviderName);
-                handled = ((NetworkACLServiceProvider) element).applyNetworkACLs(network, rules);
+                if (element instanceof NetworkACLServiceProvider) {
+                    logger.debug("Applying NetworkACL for network: {} with Network ACL service provider: {}", network, aclProviderName);
+                    handled = ((NetworkACLServiceProvider) element).applyNetworkACLs(network, rules);
+                }
             }
         }
         if (handled) {
diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1855,7 +1855,11 @@ private Map<String, List<String>> finalizeServicesAndProvidersForVpc(final long
                 // Default to VPCVirtualRouter
                 provider = Provider.VPCVirtualRouter.getName();
             } else {
-                provider = _ntwkModel.resolveProvider(provider).getName();
+                final Provider resolvedProvider = _ntwkModel.resolveProvider(provider);
+                if (resolvedProvider == null) {
+                    throw new InvalidParameterValueException("Invalid provider " + provider + " configured for service " + service);
+                }
+                provider = resolvedProvider.getName();
             }
 
             if (!_ntwkModel.isProviderEnabledInZone(zoneId, provider)) {
diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
@@ -4250,6 +4250,6 @@
 "label.external.network.service": "External Network Service",
 "message.confirm.disable.external.network.provider": "Are you sure you want to disable the External Network provider?",
 "message.no.network.orchestrator.extensions": "No NetworkOrchestrator extensions found. Please create one first via createExtension API.",
-"message.extension.services.from.capabilities": "Services are derived automatically from the extension's network.capabilities detail.",
+"message.extension.services.from.capabilities": "Services are derived automatically from the extension's network.service.capabilities detail.",
 "message.select.extension": "Please select an extension."
 }
diff --git a/ui/src/views/infra/network/ServiceProvidersTab.vue b/ui/src/views/infra/network/ServiceProvidersTab.vue
@@ -1258,7 +1258,7 @@ export default {
 
       this.extensionProviderLoading = true
       try {
-        // registerExtension auto-creates the NSP (Enabled) with services from network.capabilities
+        // registerExtension auto-creates the NSP (Enabled) with services from network.service.capabilities
         await postAPI('registerExtension', {
           extensionid: extensionId,
           resourceid: this.resource.id,
diff --git a/ui/src/views/offering/AddNetworkOffering.vue b/ui/src/views/offering/AddNetworkOffering.vue
@@ -1079,15 +1079,15 @@ export default {
           ...(!this.forVpc && { Firewall: this.Netris })
         }
       } else if (this.isExternalNetworkProvider) {
-        // Extension-backed provider: services come from the extension's network.capabilities.
+        // Extension-backed provider: services come from the extension's network.service.capabilities.
         // this.provider is the extension name (= NSP name)
         const extProviderObj = {
           name: this.provider,
           description: this.provider,
           enabled: true
         }
         const svcMap = { Dhcp: this.VR, Dns: this.VR, UserData: this.VR }
-        // Infer services from the selected extension's network.capabilities detail
+        // Infer services from the selected extension's network.service.capabilities detail
         const extDef = this.availableExtensionProviders.find(e => e.name === this.provider)
         const services = this._getExtensionServices(extDef)
         if (services.length > 0) {
@@ -1110,9 +1110,9 @@ export default {
       this.fetchSupportedServiceData()
     },
     _getExtensionServices (extDef) {
-      if (!extDef || !extDef.details || !extDef.details['network.capabilities']) return []
+      if (!extDef || !extDef.details || !extDef.details['network.service.capabilities']) return []
       try {
-        const caps = JSON.parse(extDef.details['network.capabilities'])
+        const caps = JSON.parse(extDef.details['network.service.capabilities'])
         return (caps && caps.services) ? caps.services : []
       } catch (e) {
         return []
diff --git a/ui/src/views/offering/AddVpcOffering.vue b/ui/src/views/offering/AddVpcOffering.vue
@@ -686,7 +686,7 @@ export default {
         return []
       }
 
-      const capsJson = extDef.details['network.capabilities']
+      const capsJson = extDef.details['network.service.capabilities']
       if (capsJson) {
         try {
           const caps = JSON.parse(capsJson)

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@`
`196`	`196`	`* <pre>{"host":"192.168.1.10","namespace":"cs-net-42"}</pre>`
`197`	`197`	`*`
`198`	`198`	`* <h3>Network capabilities</h3>`
`199`		`- * When creating the extension, set detail {@code network.capabilities} to a`
	`199`	`+ * When creating the extension, set detail {@code network.service.capabilities} to a`
`200`	`200`	`* JSON object describing the services and their capabilities:`
`201`	`201`	`* <pre>`
`202`	`202`	`* {`
`@@ -333,7 +333,7 @@ public NetworkExtensionElement withProviderName(String providerName) {`
`333`	`333`	`public Map<Service, Map<Capability, String>> getCapabilities() {`
`334`	`334`	`try {`
`335`	`335`	`// If this element is scoped to a provider name, prefer capabilities stored`
`336`		`- // in the extension's "network.capabilities" detail. The ExtensionHelper`
	`336`	`+ // in the extension's "network.service.capabilities" detail. The ExtensionHelper`
`337`	`337`	`// exposes a helper that loads the Service→Capability map from the DB.`
`338`	`338`	`if (providerName != null && !providerName.isBlank()) {`
`339`	`339`	`Map<Service, Map<Capability, String>> caps = extensionHelper.getNetworkCapabilitiesForProvider(null, providerName);`
`@@ -342,7 +342,7 @@ public Map<Service, Map<Capability, String>> getCapabilities() {`
`342`	`342`	`}`
`343`	`343`	`}`
`344`	`344`	`} catch (Exception e) {`
`345`		`- logger.warn("Failed to load network capabilities from extension details for provider '{}': {}", providerName, e.getMessage());`
	`345`	`+ logger.warn("Failed to load network service capabilities from extension details for provider '{}': {}", providerName, e.getMessage());`
`346`	`346`	`}`
`347`	`347`
`348`	`348`	`return DEFAULT_CAPABILITIES;`
Original file line number	Diff line number	Diff line change
`@@ -1266,7 +1266,11 @@ public Map<Service, Set<Provider>> getNetworkOfferingServiceProvidersMap(long ne`
`1266`	`1266`	`if (providers == null) {`
`1267`	`1267`	`providers = new HashSet<Provider>();`
`1268`	`1268`	`}`
`1269`		`- providers.add(resolveProvider(instance.getProvider()));`
	`1269`	`+`
	`1270`	`+ final Provider provider = resolveProvider(instance.getProvider());`
	`1271`	`+ if (provider != null) {`
	`1272`	`+ providers.add(provider);`
	`1273`	`+ }`
`1270`	`1274`	`serviceProviderMap.put(Service.getService(service), providers);`
`1271`	`1275`	`}`
`1272`	`1276`
Original file line number	Diff line number	Diff line change
`@@ -723,7 +723,9 @@ public boolean applyRules(Network network, Purpose purpose, List<? extends Firew`
`723`	`723`	`String fwProviderName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), Service.Firewall);`
`724`	`724`	`if (fwProviderName != null) {`
`725`	`725`	`NetworkElement element = _networkModel.getElementImplementingProvider(fwProviderName);`
`726`		`- handled = ((FirewallServiceProvider) element).applyFWRules(network, rules);`
	`726`	`+ if (element instanceof FirewallServiceProvider) {`
	`727`	`+ handled = ((FirewallServiceProvider) element).applyFWRules(network, rules);`
	`728`	`+ }`
`727`	`729`	`}`
`728`	`730`	`}`
`729`	`731`	`break;`
`@@ -743,7 +745,9 @@ public boolean applyRules(Network network, Purpose purpose, List<? extends Firew`
`743`	`745`	`String pfProviderName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), Service.PortForwarding);`
`744`	`746`	`if (pfProviderName != null) {`
`745`	`747`	`NetworkElement element = _networkModel.getElementImplementingProvider(pfProviderName);`
`746`		`- handled = ((PortForwardingServiceProvider) element).applyPFRules(network, (List<PortForwardingRule>) rules);`
	`748`	`+ if (element instanceof PortForwardingServiceProvider) {`
	`749`	`+ handled = ((PortForwardingServiceProvider) element).applyPFRules(network, (List<PortForwardingRule>) rules);`
	`750`	`+ }`
`747`	`751`	`}`
`748`	`752`	`}`
`749`	`753`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -2055,7 +2055,9 @@ protected boolean applyLbRules(Network network, List<LoadBalancingRule> rules) t`
`2055`	`2055`	`String lbProviderName = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.Lb);`
`2056`	`2056`	`if (lbProviderName != null) {`
`2057`	`2057`	`NetworkElement element = _networkModel.getElementImplementingProvider(lbProviderName);`
`2058`		`- handled = ((LoadBalancingServiceProvider) element).applyLBRules(network, rules);`
	`2058`	`+ if (element instanceof LoadBalancingServiceProvider) {`
	`2059`	`+ handled = ((LoadBalancingServiceProvider) element).applyLBRules(network, rules);`
	`2060`	`+ }`
`2059`	`2061`	`}`
`2060`	`2062`	`}`
`2061`	`2063`	`return handled;`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,10 @@ public boolean applyACLItemsToNetwork(final long networkId, final List<NetworkAC`
`455`	`455`	`if (aclProviderName != null) {`
`456`	`456`	`foundProvider = true;`
`457`	`457`	`NetworkElement element = _networkModel.getElementImplementingProvider(aclProviderName);`
`458`		`- handled = ((NetworkACLServiceProvider) element).applyNetworkACLs(network, rules);`
	`458`	`+ if (element instanceof NetworkACLServiceProvider) {`
	`459`	`+ logger.debug("Applying NetworkACL for network: {} with Network ACL service provider: {}", network, aclProviderName);`
	`460`	`+ handled = ((NetworkACLServiceProvider) element).applyNetworkACLs(network, rules);`
	`461`	`+ }`
`459`	`462`	`}`
`460`	`463`	`}`
`461`	`464`	`if (handled) {`
Original file line number	Diff line number	Diff line change
`@@ -4250,6 +4250,6 @@`
`4250`	`4250`	`"label.external.network.service": "External Network Service",`
`4251`	`4251`	`"message.confirm.disable.external.network.provider": "Are you sure you want to disable the External Network provider?",`
`4252`	`4252`	`"message.no.network.orchestrator.extensions": "No NetworkOrchestrator extensions found. Please create one first via createExtension API.",`
`4253`		`-"message.extension.services.from.capabilities": "Services are derived automatically from the extension's network.capabilities detail.",`
	`4253`	`+"message.extension.services.from.capabilities": "Services are derived automatically from the extension's network.service.capabilities detail.",`
`4254`	`4254`	`"message.select.extension": "Please select an extension."`
`4255`	`4255`	`}`