Move GPUService from Cmd classes to BaseCmd

vishesh92 · vishesh92 · commit ff22f1874153 · 2025-07-02T14:02:13.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
@@ -39,6 +39,7 @@
 import org.apache.cloudstack.alert.AlertService;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.gpu.GpuService;
 import org.apache.cloudstack.network.RoutedIpv4Manager;
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
 import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
@@ -130,6 +131,8 @@ public static enum CommandType {
     @Inject
     public UserVmService _userVmService;
     @Inject
+    public GpuService gpuService;
+    @Inject
     public ManagementService _mgr;
     @Inject
     public StorageService _storageService;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuCardCmd.java
@@ -39,9 +39,6 @@
         since = "4.21.0")
 public class CreateGpuCardCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateGpuDeviceCmd.java
@@ -40,9 +40,6 @@
             responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
 public class CreateGpuDeviceCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class, required = true,
                description = "ID of the host where the GPU device is located")
     private Long hostId;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/CreateVgpuProfileCmd.java
@@ -35,9 +35,6 @@
             responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin})
 public class CreateVgpuProfileCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuCardCmd.java
@@ -35,9 +35,6 @@
             since = "4.21.0", authorized = {RoleType.Admin})
 public class DeleteGpuCardCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteGpuDeviceCmd.java
@@ -36,9 +36,6 @@
         since = "4.21.0", authorized = {RoleType.Admin})
 public class DeleteGpuDeviceCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DeleteVgpuProfileCmd.java
@@ -35,9 +35,6 @@
             since = "4.21.0", authorized = {RoleType.Admin})
 public class DeleteVgpuProfileCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/DiscoverGpuDevicesCmd.java
@@ -34,9 +34,6 @@
             since = "4.21.0", authorized = {RoleType.Admin})
 public class DiscoverGpuDevicesCmd extends BaseListCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ListGpuDevicesCmdByAdmin.java
@@ -36,9 +36,6 @@
         since = "4.21.0")
 public class ListGpuDevicesCmdByAdmin extends ListGpuDevicesCmd implements AdminCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuDeviceResponse.class,
             description = "ID of the GPU device")
     private Long id;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/ManageGpuDeviceCmd.java
@@ -36,9 +36,6 @@
             authorized = {RoleType.Admin})
 public class ManageGpuDeviceCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UnmanageGpuDeviceCmd.java
@@ -36,9 +36,6 @@
             authorized = {RoleType.Admin})
 public class UnmanageGpuDeviceCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuCardCmd.java
@@ -35,9 +35,6 @@
             since = "4.21.0", authorized = {RoleType.Admin})
 public class UpdateGpuCardCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateGpuDeviceCmd.java
@@ -39,9 +39,6 @@
             responseHasSensitiveInfo = false, authorized = {RoleType.Admin})
 public class UpdateGpuDeviceCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GpuDeviceResponse.class, required = true,
                description = "ID of the GPU device to update")
     private Long id;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/gpu/UpdateVgpuProfileCmd.java
@@ -34,9 +34,6 @@
             responseHasSensitiveInfo = false, since = "4.21.0", authorized = {RoleType.Admin})
 public class UpdateVgpuProfileCmd extends BaseCmd {
 
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuCardsCmd.java
@@ -30,10 +30,6 @@
         responseObject = GpuCardResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.21.0")
 public class ListGpuCardsCmd extends BaseListCmd {
-
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListGpuDevicesCmd.java
@@ -36,10 +36,6 @@
         responseObject = GpuDeviceResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.21.0", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListGpuDevicesCmd extends BaseListCmd implements UserCmd {
-
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/gpu/ListVgpuProfilesCmd.java
@@ -31,10 +31,6 @@
         responseObject = VgpuProfileResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.21.0")
 public class ListVgpuProfilesCmd extends BaseListCmd {
-
-    @Inject
-    private GpuService gpuService;
-
     /// //////////////////////////////////////////////////
     /// ///////////// API parameters /////////////////////
     /// //////////////////////////////////////////////////
diff --git a/ui/src/views/offering/AddComputeOffering.vue b/ui/src/views/offering/AddComputeOffering.vue
@@ -1047,7 +1047,7 @@ export default {
         if (values.vgpuprofile) {
           params.vgpuprofileid = values.vgpuprofile
         }
-        if (values.gpucount && values.gpucount.length > 0) {
+        if (values.gpucount && values.gpucount > 0) {
           params.gpucount = values.gpucount
         }
         if (values.gpudisplay !== undefined) {
