NE: apply copilot's suggestions

Author: weizhouapache

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsManagerImpl.java

@@ -1894,7 +1894,7 @@ public CustomActionResultResponse runCustomAction(RunCustomActionCmd cmd) {
             accountService.checkAccess(caller, null, true, network);
             return runNetworkCustomAction(network, customActionVO, extensionVO, actionResourceType, cmdParameters);
         } else if (entity instanceof Vpc) {
-            // VPC custom action: find a tier network and dispatch to the same NetworkCustomActionProvider
+            // VPC custom action: dispatched directly to NetworkCustomActionProvider (no agent)
             Vpc vpc = (Vpc) entity;
             accountService.checkAccess(caller, null, true, vpc);
             return runVpcCustomAction(vpc, customActionVO, extensionVO, actionResourceType, cmdParameters);
@@ -2030,22 +2030,25 @@ protected CustomActionResultResponse runNetworkCustomAction(Network network,
             parameters = ExtensionCustomAction.Parameter.validateParameterValues(actionParameters, cmdParameters);
         }
 
-        // Find the provider name for this network (try CustomAction first, then other services)
-        String providerName = null;
-        for (Service service : new Service[]{Service.CustomAction, Service.SourceNat, Service.StaticNat,
-                Service.PortForwarding, Service.Firewall, Service.Gateway}) {
-            providerName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), service);
-            if (StringUtils.isNotBlank(providerName)) {
-                break;
-            }
-        }
+        // Find the provider name for this network
+        String providerName = networkServiceMapDao.getProviderForServiceInNetwork(network.getId(), Service.CustomAction);;
         if (StringUtils.isBlank(providerName)) {
             logger.error("No network service provider found for network {}", network.getId());
             result.put(ApiConstants.DETAILS, "No network service provider found for this network");
             response.setResult(result);
             return response;
         }
 
+        // Check if provider name matches the extension name
+        if (!providerName.equals(extensionVO.getName())) {
+            logger.error("Provider name '{}' for network {} does not match extension name '{}'",
+                    providerName, network.getId(), extensionVO.getName());
+            result.put(ApiConstants.DETAILS, "Network service provider '" + providerName +
+                    "' does not match extension '" + extensionVO.getName() + "'");
+            response.setResult(result);
+            return response;
+        }
+
         // Get the network element implementing that provider
         NetworkElement element = networkModel.getElementImplementingProvider(providerName);
         if (element == null) {
@@ -2116,21 +2119,24 @@ protected CustomActionResultResponse runVpcCustomAction(Vpc vpc,
         }
 
         // Find the provider name for this VPC
-        String providerName = null;
-        for (Service service : new Service[]{Service.CustomAction, Service.SourceNat, Service.StaticNat,
-                Service.PortForwarding, Service.NetworkACL, Service.Gateway}) {
-            providerName = vpcServiceMapDao.getProviderForServiceInVpc(vpc.getId(), service);
-            if (StringUtils.isNotBlank(providerName)) {
-                break;
-            }
-        }
+        String providerName = vpcServiceMapDao.getProviderForServiceInVpc(vpc.getId(), Service.CustomAction);;
         if (StringUtils.isBlank(providerName)) {
             logger.error("No VPC service provider found for VPC {}", vpc.getId());
             result.put(ApiConstants.DETAILS, "No VPC service provider found for this VPC");
             response.setResult(result);
             return response;
         }
 
+        // Check if provider name matches the extension name
+        if (!providerName.equals(extensionVO.getName())) {
+            logger.error("Provider name '{}' for vpc {} does not match extension name '{}'",
+                    providerName, vpc.getId(), extensionVO.getName());
+            result.put(ApiConstants.DETAILS, "Network service provider '" + providerName +
+                    "' does not match extension '" + extensionVO.getName() + "'");
+            response.setResult(result);
+            return response;
+        }
+
         // Get the network element implementing that provider
         NetworkElement element = networkModel.getElementImplementingProvider(providerName);
         if (element == null) {

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

@@ -330,7 +330,7 @@ protected Extension resolveExtension(Network network) {
             logger.warn("Network {} has no physical network — cannot resolve extension", network.getId());
             return null;
         }
-        if (providerName != null && !providerName.isBlank()) {
+        if (StringUtils.isNotBlank(providerName)) {
             Extension ext = extensionHelper.getExtensionForPhysicalNetworkAndProvider(physicalNetworkId, providerName);
             if (ext != null) {
                 return ext;

server/src/main/java/com/cloud/network/NetworkModelImpl.java

@@ -1316,15 +1316,15 @@ public List<? extends Provider> listSupportedNetworkServiceProviders(String serv
         // for extension names that are not in the built-in registry.
         try {
             List<PhysicalNetworkServiceProviderVO> nsps = _pNSPDao.listAll();
+            List<Extension> extensions = extensionHelper.listExtensionsByType(Extension.Type.NetworkOrchestrator);
             if (CollectionUtils.isNotEmpty(nsps)) {
                 Set<String> extensionProviderNames = new HashSet<>();
-                List<Extension> extensions = extensionHelper.listExtensionsByType(Extension.Type.NetworkOrchestrator);
                 if (extensions != null) {
                     for (Extension extension : extensions) {
                         if (extension == null || StringUtils.isBlank(extension.getName())) {
                             continue;
                         }
-                        extensionProviderNames.add(extension.getName().toLowerCase());
+                        extensionProviderNames.add(extension.getName());
                     }
                 }
 

ui/public/locales/en.json

@@ -1731,6 +1731,7 @@
 "label.networkofferingdisplaytext": "Network Offering",
 "label.networkofferingid": "Network Offering",
 "label.networkofferingname": "Network Offering",
+"label.networkorchestrator": "Network Orchestrator",
 "label.networkrate": "Network rate (Mb/s)",
 "label.networkread": "Network read",
 "label.networks": "Networks",

ui/src/config/section/extension.js

@@ -45,7 +45,7 @@ export default {
     return fields
   },
   details: ['name', 'description', 'id', 'type', 'details', 'path', 'pathready', 'isuserdefined', 'orchestratorrequirespreparevm', 'reservedresourcedetails', 'created'],
-  filters: ['orchestrator', 'networkorchestrator'],
+  filters: ['Orchestrator', 'NetworkOrchestrator'],
   tabs: [{
     name: 'details',
     component: shallowRef(defineAsyncComponent(() => import('@/components/view/DetailsTab.vue')))