fixups & UI enhancements

Author: vishesh92

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

@@ -3179,9 +3179,9 @@ private HostVO persistNewHost(HostVO host, StartupCommand startup) {
         // Check for GPU devices again because we couldn't persist the GPU devices earlier due to missing host ID
         if (startup instanceof StartupRoutingCommand &&
             CollectionUtils.isNotEmpty(((StartupRoutingCommand) startup).getGpuDevices())) {
-            // Add GPU devices to the host
             StartupRoutingCommand ssCmd = ((StartupRoutingCommand) startup);
-            gpuService.addGpuDevicesToHost(hostVo, ssCmd.getGpuDevices());
+            host.setGpuGroups(getGroupDetails(host, ssCmd.getGpuDevices(), ssCmd.getGpuGroupDetails()));
+            _hostDao.update(hostVo.getId(), host);
         }
         return hostVo;
     }

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

@@ -83,8 +83,10 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 @Component
@@ -792,6 +794,10 @@ public HashMap<String, HashMap<String, VgpuTypesInfo>> getGpuGroupDetailsFromGpu
         HashMap<String, HashMap<String, VgpuTypesInfo>> gpuGroupDetails = new HashMap<>();
         List<GpuDeviceVO> gpuDevices = gpuDeviceDao.listByHostId(host.getId());
         for (final GpuDeviceVO device : gpuDevices) {
+            if (GpuDevice.ManagedState.Unmanaged.equals(device.getManagedState())) {
+                // Skip unmanaged devices
+                continue;
+            }
 
             // Calculate GPU capacity and update gpuGroupDetails
             GpuCardVO card = gpuCardDao.findById(device.getCardId());
@@ -1052,6 +1058,7 @@ private boolean updateGpuDeviceManagedState(List<Long> gpuDeviceIds, GpuDevice.M
             throw new InvalidParameterValueException("GPU device IDs cannot be empty");
         }
         List<GpuDeviceVO> gpuDevices = new ArrayList<>();
+        Set<Long> hostIds = new HashSet<>();
         for (Long gpuDeviceId : gpuDeviceIds) {
             GpuDeviceVO gpuDevice = gpuDeviceDao.findById(gpuDeviceId);
             if (gpuDevice == null) {
@@ -1069,12 +1076,20 @@ private boolean updateGpuDeviceManagedState(List<Long> gpuDeviceIds, GpuDevice.M
                                 gpuDevice, gpuDevice.getVmId()));
             }
             gpuDevices.add(gpuDevice);
+            hostIds.add(gpuDevice.getHostId());
         }
 
         for (GpuDeviceVO gpuDevice : gpuDevices) {
             gpuDevice.setManagedState(managedState);
             gpuDeviceDao.update(gpuDevice.getId(), gpuDevice);
         }
+
+        for (Long hostId : hostIds) {
+            HostVO host = hostDao.findById(hostId);
+            host.setGpuGroups(getGpuGroupDetailsFromGpuDevicesOnHost(host));
+            hostDao.update(hostId, host);
+        }
+
         return true;
     }
 

ui/public/locales/en.json

@@ -89,6 +89,7 @@
 "label.action.delete.egress.firewall": "Delete egress firewall rule",
 "label.action.delete.firewall": "Delete firewall rule",
 "label.action.delete.interface.static.route": "Remove Tungsten Fabric interface static route",
+"label.action.delete.gpu.card": "Delete GPU card",
 "label.action.delete.guest.os": "Delete guest OS",
 "label.action.delete.guest.os.category": "Delete guest OS category",
 "label.action.delete.guest.os.hypervisor.mapping": "Delete guest OS hypervisor mapping",
@@ -110,6 +111,7 @@
 "label.action.delete.template": "Delete Template",
 "label.action.delete.tungsten.router.table": "Remove Tungsten Fabric route table from Network",
 "label.action.delete.user": "Delete User",
+"label.action.delete.vgpu.profile": "Delete vGPU profile",
 "label.action.delete.volume": "Delete volume",
 "label.action.delete.zone": "Delete zone",
 "label.action.destroy.instance": "Destroy Instance",
@@ -1080,6 +1082,7 @@
 "label.gpu.device": "GPU Device",
 "label.gpu.devices": "GPU Devices",
 "label.gpu.enabled": "GPU Enabled",
+"label.gpuenabled": "GPU Enabled",
 "label.gpudevicetype": "Device Type",
 "label.gpu.devices.add": "Add GPU Device",
 "label.gpu.devices.delete": "Delete GPU Device",
@@ -1474,7 +1477,7 @@
 "label.maxerrorretry": "Max error retry",
 "label.maxgpu": "Max. GPUs",
 "label.maxguestslimit": "Max guest limit",
-"label.maxheads": "Max heads",
+"label.maxheads": "Max. heads",
 "label.maxhostspercluster": "Max hosts per cluster",
 "label.maximum": "Maximum",
 "label.maxinstance": "Max Instances",
@@ -2491,6 +2494,7 @@
 "label.update.bgp.peer": "Update BGP peer",
 "label.update.condition": "Update condition",
 "label.update.gpu.device": "Update GPU device",
+"label.update.vgpu.profile": "Update vGPU profile",
 "label.update.sharedfs": "Update Shared FileSystem",
 "label.update.instance.group": "Update Instance group",
 "label.update.ip.range": "Update IP range",
@@ -2785,6 +2789,7 @@
 "message.action.delete.external.load.balancer": "Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device.",
 "message.action.delete.ingress.rule": "Please confirm that you want to delete this ingress rule.",
 "message.action.delete.ipv4.subnet": "Please confirm that you want to delete this IPv4 subnet.",
+"message.action.delete.gpu.card": "Please confirm that you want to delete this GPU card.",
 "message.action.delete.guest.os": "Please confirm that you want to delete this guest os. System defined entry cannot be deleted.",
 "message.action.delete.guest.os.category": "Please confirm that you want to delete this guest os category.",
 "message.action.delete.guest.os.hypervisor.mapping": "Please confirm that you want to delete this guest os hypervisor mapping. System defined entry cannot be deleted.",
@@ -2803,6 +2808,7 @@
 "message.action.delete.snapshot": "Please confirm that you want to delete this Snapshot.",
 "message.action.delete.template": "Please confirm that you want to delete this Template.",
 "message.action.delete.tungsten.router.table": "Please confirm that you want to remove Route Table from this Network?",
+"message.action.delete.vgpu.profile": "Please confirm that you want to delete this vGPU profile.",
 "message.action.delete.volume": "Please confirm that you want to delete this volume. Note: this will not delete any Snapshots of this volume.",
 "message.action.delete.vpn.user": "Please confirm that you want to delete the VPN user.",
 "message.action.delete.zone": "Please confirm that you want to delete this zone.",
@@ -3014,6 +3020,7 @@
 "message.confirm.delete.ciscoasa1000v": "Please confirm you want to delete CiscoASA1000v.",
 "message.confirm.delete.ciscovnmc.resource": "Please confirm you want to delete CiscoVNMC resource.",
 "message.confirm.delete.gpu.devices": "Please confirm that you would like to delete this GPU device?",
+"message.confirm.delete.vgpu.profile": "Please confirm that you want to delete this vGPU profile?",
 "message.confirm.delete.f5": "Please confirm that you would like to delete F5.",
 "message.confirm.delete.internal.lb": "Please confirm you want to delete internal LB.",
 "message.confirm.delete.netscaler": "Please confirm that you would like to delete NetScaler.",
@@ -3746,6 +3753,9 @@
 "message.success.update.bucket": "Successfully updated bucket",
 "message.success.update.condition": "Successfully updated condition",
 "message.success.update.gpu.device": "Successfully updated GPU device",
+"message.success.create.vgpu.profile": "Successfully created vGPU profile",
+"message.success.update.vgpu.profile": "Successfully updated vGPU profile",
+"message.success.delete.vgpu.profile": "Successfully deleted vGPU profile",
 "message.success.update.sharedfs": "Successfully updated Shared FileSystem",
 "message.success.update.ipaddress": "Successfully updated IP address",
 "message.success.update.iprange": "Successfully updated IP range",

ui/src/components/view/ListView.vue

@@ -220,7 +220,7 @@
           {{ record.maxresolutionx }}x{{ record.maxresolutiony }}
         </span>
         <span v-else>
-          {{  text }}
+          {{ text }}
         </span>
       </template>
       <template v-if="column.key === 'templateid'">
@@ -973,6 +973,9 @@
           @onClick="removeVMSchedule(record)"
         />
       </template>
+      <template v-if="column.key === 'vgpuActions'">
+        <slot name="actionButtons" :record="record" :actions="actions"></slot>
+      </template>
     </template>
     <template #footer>
       <span v-if="hasSelected">

ui/src/components/view/SearchView.vue

@@ -320,7 +320,7 @@ export default {
         if (['zoneid', 'domainid', 'imagestoreid', 'storageid', 'state', 'account', 'hypervisor', 'level',
           'clusterid', 'podid', 'groupid', 'entitytype', 'accounttype', 'systemvmtype', 'scope', 'provider',
           'type', 'scope', 'managementserverid', 'serviceofferingid',
-          'diskofferingid', 'networkid', 'usagetype', 'restartrequired',
+          'diskofferingid', 'networkid', 'usagetype', 'restartrequired', 'gpuenabled',
           'displaynetwork', 'guestiptype', 'usersource', 'arch', 'oscategoryid', 'templatetype', 'gpucardid', 'vgpuprofileid'].includes(item)
         ) {
           type = 'list'
@@ -429,6 +429,16 @@ export default {
         this.fields[restartRequiredIndex].loading = false
       }
 
+      if (arrayField.includes('gpuenabled')) {
+        const gpuEnabledIndex = this.fields.findIndex(item => item.name === 'gpuenabled')
+        this.fields[gpuEnabledIndex].loading = true
+        this.fields[gpuEnabledIndex].opts = [
+          { id: 'true', name: 'label.yes' },
+          { id: 'false', name: 'label.no' }
+        ]
+        this.fields[gpuEnabledIndex].loading = false
+      }
+
       if (arrayField.includes('resourcetype')) {
         const resourceTypeIndex = this.fields.findIndex(item => item.name === 'resourcetype')
         this.fields[resourceTypeIndex].loading = true