VNF: list VNF provider by vmId

Author: weizhouapache

api/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManager.java

@@ -51,4 +51,5 @@ void createIsolatedNetworkRulesForVnfAppliance(DataCenter zone, VirtualMachineTe
                                                    UserVm vm, DeployVnfApplianceCmd cmd)
             throws InsufficientAddressCapacityException, ResourceAllocationException, ResourceUnavailableException;
 
+    String getVnfProviderForVm(UserVm userVm);
 }

plugins/vnf-providers/custom/src/main/java/org/apache/cloudstack/vnf/api/command/VnfListProvidersCmd.java

@@ -21,11 +21,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.uservm.UserVm;
+
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.api.response.VnfProviderResponse;
 import org.apache.cloudstack.vnf.VnfProviderManager;
 import org.apache.cloudstack.vnf.VnfProvider;
@@ -50,6 +54,13 @@ public class VnfListProvidersCmd extends BaseListCmd {
             description = "Name of the Vnf provider")
     private String name;
 
+    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
+            type = CommandType.UUID,
+            entityType = UserVmResponse.class,
+            description = "The ID of the virtual machine")
+    private Long vmId;
+
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -59,14 +70,30 @@ public String getName() {
         return name;
     }
 
+    public Long getVmId() {
+        return vmId;
+    }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
     @Override
     public void execute()  {
         List<VnfProvider> vnfProviders = new ArrayList<>();
-        if (StringUtils.isEmpty(name)) {
+        if (vmId != null) {
+            UserVm userVm = _userVmService.getUserVm(vmId);
+            String vnfProviderName = vnfTemplateManager.getVnfProviderForVm(userVm);
+            if (vnfProviderName != null) {
+                if (name != null && !vnfProviderName.equals(name)) {
+                    throw new InvalidParameterValueException("VNF provider names do not match. VNF provider name: " + vnfProviderName);
+                }
+                VnfProvider vnfProvider = vnfService.getVnfProviderByName(vnfProviderName);
+                if (vnfProvider != null) {
+                    vnfProviders.add(vnfProvider);
+                }
+            }
+        } else if (StringUtils.isEmpty(name)) {
             vnfProviders.addAll(vnfService.getVnfProviders());
         } else {
             VnfProvider vnfProvider = vnfService.getVnfProviderByName(name);

server/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImpl.java

@@ -389,4 +389,16 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws
             logger.debug("Created network rules for VNF appliance on isolated network {}", network);
         }
     }
+
+    @Override
+    public String getVnfProviderForVm(UserVm userVm) {
+        if (userVm == null) {
+            return null;
+        }
+        VnfTemplateDetailVO vnfProviderName = vnfTemplateDetailsDao.findDetail(userVm.getTemplateId(), VNF.VnfDetail.VNF_PROVIDER.name().toLowerCase());
+        if (vnfProviderName != null) {
+            return vnfProviderName.getValue();
+        }
+        return null;
+    }
 }