Fix how XenServer uses GPU Card name

Author: vishesh92

api/src/main/java/org/apache/cloudstack/gpu/GpuCard.java

@@ -59,4 +59,11 @@ public interface GpuCard extends InternalIdentity, Identity {
      * @return the date when the GPU card was created
      */
     Date getCreated();
+
+
+    /**
+     * @return the group name of the GPU card based on how the XenServer expects it.
+     */
+    String getGroupName();
+
 }

engine/schema/src/main/java/com/cloud/gpu/GpuCardVO.java

@@ -139,4 +139,9 @@ public void setVendorId(String vendorId) {
     public Date getCreated() {
         return created;
     }
+
+    @Override
+    public String getGroupName() {
+        return "Group of " + getVendorName() + " " + getDeviceName() + " GPUs";
+    }
 }

engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java

@@ -139,7 +139,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
             "GROUP BY vm.service_offering_id) results GROUP BY pci, type";
 
     private static final String COUNT_VMS_BASED_ON_VGPU_TYPES1 =
-            "SELECT gpu_card.device_name, vgpu_profile.name, COUNT(gpu_device.vm_id) "
+            "SELECT CONCAT(gpu_card.vendor_name,  ' ',  gpu_card.device_name), vgpu_profile.name, COUNT(gpu_device.vm_id) "
             + "FROM `cloud`.`gpu_device` "
             + "INNER JOIN `cloud`.`host` ON gpu_device.host_id = host.id "
             + "INNER JOIN `cloud`.`gpu_card` ON gpu_device.card_id = gpu_card.id "

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

@@ -4276,7 +4276,7 @@ public boolean isGPUDeviceAvailable(ServiceOffering offering, Host host, Long vm
     public boolean isGPUDeviceAvailable(Host host, Long vmId, VgpuProfileVO vgpuProfile, int gpuCount) {
         if (host.getHypervisorType().equals(HypervisorType.XenServer)) {
             GpuCardVO gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
-            String groupName = gpuCard.getName();
+            String groupName = gpuCard.getGroupName();
             String vgpuType = vgpuProfile.getName();
             return isGPUDeviceAvailable(host, groupName, vgpuType);
         } else {
@@ -4289,7 +4289,7 @@ public GPUDeviceTO getGPUDevice(VirtualMachine vm, long hostId, VgpuProfileVO vg
         HostVO host = _hostDao.findById(vm.getHostId());
         if (host.getHypervisorType().equals(HypervisorType.XenServer)) {
             GpuCardVO gpuCard = gpuCardDao.findById(vgpuProfile.getCardId());
-            String groupName = gpuCard.getName();
+            String groupName = gpuCard.getGroupName();
             String vgpuType = vgpuProfile.getName();
             return getGPUDevice(vm.getHostId(), groupName, vgpuType);
         } else {

server/src/main/java/org/apache/cloudstack/gpu/GpuServiceImpl.java

@@ -819,12 +819,13 @@ public HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetailsFromGpu
         for (final GpuDeviceVO device : gpuDevices) {
             // Calculate GPU capacity and update gpuGroupDetails
             GpuCardVO card = gpuCardDao.findById(device.getCardId());
-            if (!gpuGroupDetails.containsKey(card.getDeviceName())) {
-                gpuGroupDetails.put(card.getDeviceName(), new HashMap<>());
+            String groupName = card.getName();
+            if (!gpuGroupDetails.containsKey(groupName)) {
+                gpuGroupDetails.put(groupName, new HashMap<>());
             }
             VgpuProfileVO vgpuProfile = vgpuProfileDao.findById(device.getVgpuProfileId());
 
-            VgpuTypesInfo gpuDeviceInfo = gpuGroupDetails.get(card.getDeviceName()).get(vgpuProfile.getName());
+            VgpuTypesInfo gpuDeviceInfo = gpuGroupDetails.get(groupName).get(vgpuProfile.getName());
             long remainingCapacity = 0L;
             long maxCapacity = 1L;
             if (GpuDevice.State.Free.equals(device.getState()) && GpuDevice.ManagedState.Managed.equals(
@@ -836,9 +837,14 @@ public HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetailsFromGpu
                 remainingCapacity = 0L;
             }
             if (gpuDeviceInfo == null) {
-                gpuDeviceInfo = new VgpuTypesInfo(card.getName(), vgpuProfile.getName(), null, null, null, null,
+                gpuDeviceInfo = new VgpuTypesInfo(card.getName(), vgpuProfile.getName(), vgpuProfile.getVideoRam(), vgpuProfile.getMaxHeads(),
+                        vgpuProfile.getMaxResolutionX(), vgpuProfile.getMaxResolutionY(),
                         vgpuProfile.getMaxVgpuPerPgpu(), remainingCapacity, maxCapacity);
-                gpuGroupDetails.get(card.getDeviceName()).put(vgpuProfile.getName(), gpuDeviceInfo);
+                gpuDeviceInfo.setDeviceName(card.getDeviceName());
+                gpuDeviceInfo.setVendorId(card.getVendorId());
+                gpuDeviceInfo.setVendorName(card.getVendorName());
+                gpuDeviceInfo.setDeviceId(card.getDeviceId());
+                gpuGroupDetails.get(groupName).put(vgpuProfile.getName(), gpuDeviceInfo);
             } else {
                 // Update the existing VgpuTypesInfo with the new device's information
                 gpuDeviceInfo.setRemainingCapacity(gpuDeviceInfo.getRemainingCapacity() + remainingCapacity);