Fix UpdateClusterCmd for Rolling maintenance, MockResourceManager

GabrielBrascher · GabrielBrascher · commit 38e69e5afa11 · 2020-06-22T15:49:16.000-03:00
Update Host name handling to update instead of persist

Allow update
 Storage name
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -63,6 +63,10 @@ public Long getId() {
         return id;
     }
 
+    public void setId(Long id) {
+        this.id = id;
+    }
+
     public String getHypervisor() {
         return hypervisor;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -45,6 +45,9 @@ public class UpdateStoragePoolCmd extends BaseCmd {
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = StoragePoolResponse.class, required = true, description = "the Id of the storage pool")
     private Long id;
 
+    @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, entityType = StoragePoolResponse.class, description = "Change the name of the storage pool", since = "4.15")
+    private String name;
+
     @Parameter(name = ApiConstants.TAGS, type = CommandType.LIST, collectionType = CommandType.STRING, description = "comma-separated list of tags for the storage pool")
     private List<String> tags;
 
@@ -66,6 +69,10 @@ public Long getId() {
         return id;
     }
 
+    public String getName() {
+        return name;
+    }
+
     public List<String> getTags() {
         return tags;
     }
diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -1028,12 +1028,12 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
     @Override
     @DB
     public Cluster updateCluster(UpdateClusterCmd cmd) {
-        final ClusterVO cluster = (ClusterVO) getCluster(cmd.getId());
-        final String clusterType = cmd.getClusterType();
-        final String hypervisor = cmd.getHypervisor();
-        final String allocationState = cmd.getAllocationState();
-        final String managedstate = cmd.getManagedstate();
-        final String name = cmd.getClusterName();
+        ClusterVO cluster = (ClusterVO) getCluster(cmd.getId());
+        String clusterType = cmd.getClusterType();
+        String hypervisor = cmd.getHypervisor();
+        String allocationState = cmd.getAllocationState();
+        String managedstate = cmd.getManagedstate();
+        String name = cmd.getClusterName();
 
         // Verify cluster information and update the cluster if needed
         boolean doUpdate = false;
@@ -1487,9 +1487,9 @@ public boolean checkAndMaintain(final long hostId) {
 
     @Override
     public Host updateHost(final UpdateHostCmd cmd) throws NoTransitionException {
-        final Long hostId = cmd.getId();
-        final String name = cmd.getName();
-        final Long guestOSCategoryId = cmd.getOsCategoryId();
+        Long hostId = cmd.getId();
+        String name = cmd.getName();
+        Long guestOSCategoryId = cmd.getOsCategoryId();
 
         // Verify that the host exists
         final HostVO host = _hostDao.findById(hostId);
@@ -1511,7 +1511,7 @@ public Host updateHost(final UpdateHostCmd cmd) throws NoTransitionException {
                 s_logger.debug("Updating Host Name to :" + name);
             }
             host.setName(name);
-            _hostDao.persist(host);
+            _hostDao.update(host.getId(), host);
         }
 
         if (guestOSCategoryId != null) {
diff --git a/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java b/server/src/main/java/com/cloud/resource/RollingMaintenanceManagerImpl.java
@@ -49,6 +49,7 @@
 import com.cloud.vm.VirtualMachineProfileImpl;
 import com.cloud.vm.dao.VMInstanceDao;
 import org.apache.cloudstack.affinity.AffinityGroupProcessor;
+import org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;
 import org.apache.cloudstack.api.command.admin.host.PrepareForMaintenanceCmd;
 import org.apache.cloudstack.api.command.admin.resource.StartRollingMaintenanceCmd;
 import org.apache.cloudstack.context.CallContext;
@@ -114,12 +115,15 @@ public boolean configure(String name, Map<String, Object> params) throws Configu
         return true;
     }
 
-    private void updateCluster(long clusterId, String state) {
+    private void updateCluster(long clusterId, String allocationState) {
         Cluster cluster = resourceManager.getCluster(clusterId);
         if (cluster == null) {
             throw new InvalidParameterValueException("Unable to find the cluster by id=" + clusterId);
         }
-        resourceManager.updateCluster(cluster, "", "", state, "");
+        UpdateClusterCmd updateClusterCmd = new UpdateClusterCmd();
+        updateClusterCmd.setId(clusterId);
+        updateClusterCmd.setAllocationState(allocationState);
+        resourceManager.updateCluster(updateClusterCmd);
     }
 
     private void generateReportAndFinishingEvent(StartRollingMaintenanceCmd cmd, boolean success, String details,
diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -792,6 +792,13 @@ public PrimaryDataStoreInfo updateStoragePool(UpdateStoragePoolCmd cmd) throws I
             throw new IllegalArgumentException("Unable to find storage pool with ID: " + id);
         }
 
+        String name = cmd.getName();
+        if(org.apache.commons.lang.StringUtils.isNotBlank(name)) {
+            pool.setName(name);
+            _storagePoolDao.update(pool.getId(), pool);
+        }
+
+
         final List<String> storagePoolTags = cmd.getTags();
         if (storagePoolTags != null) {
             if (s_logger.isDebugEnabled()) {
diff --git a/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java b/server/src/test/java/com/cloud/resource/MockResourceManagerImpl.java
@@ -25,6 +25,7 @@
 
 import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
 import org.apache.cloudstack.api.command.admin.cluster.DeleteClusterCmd;
+import org.apache.cloudstack.api.command.admin.cluster.UpdateClusterCmd;
 import org.apache.cloudstack.api.command.admin.host.AddHostCmd;
 import org.apache.cloudstack.api.command.admin.host.AddSecondaryStorageCmd;
 import org.apache.cloudstack.api.command.admin.host.CancelMaintenanceCmd;
@@ -109,7 +110,7 @@ public boolean deleteCluster(final DeleteClusterCmd cmd) {
      * @see com.cloud.resource.ResourceService#updateCluster(com.cloud.org.Cluster, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
      */
     @Override
-    public Cluster updateCluster(final Cluster cluster, final String clusterType, final String hypervisor, final String allocationState, final String managedstate) {
+    public Cluster updateCluster(UpdateClusterCmd cmd) {
         // TODO Auto-generated method stub
         return null;
     }
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
@@ -15473,6 +15473,9 @@
                                 action: function (args) {
                                     var array1 =[];
 
+                                    if (args.data.name != null && args.data.name.length > 0)
+                                        array1.push("&name=" + args.data.name);
+
                                     $.ajax({
                                         url: createURL("updateCluster&id=" + args.context.clusters[0].id + array1.join("")),
                                         dataType: "json",
@@ -17023,6 +17026,8 @@
                                     if (args.data.annotation != null && args.data.annotation.length > 0)
                                         array1.push("&annotation=" + args.data.annotation);
 
+                                    if (args.data.name != null && args.data.name.length > 0)
+                                        array1.push("&name=" + args.data.name);
                                     $.ajax({
                                         url: createURL("updateHost&id=" + args.context.hosts[0].id + array1.join("")),
                                         dataType: "json",
@@ -17957,7 +17962,8 @@
 
                                 fields:[ {
                                     name: {
-                                        label: 'label.name'
+                                        label: 'label.name',
+                                        isEditable: true
                                     }
                                 },
                                 {
@@ -19552,6 +19558,9 @@
                                         array1.push("&capacityiops=" + capacityIops);
                                     }
 
+                                    if (args.data.name != null && args.data.name.length > 0)
+                                        array1.push("&name=" + args.data.name);
+
                                     $.ajax({
                                         url: createURL("updateStoragePool&id=" + args.context.primarystorages[0].id + array1.join("")),
                                         dataType: "json",
@@ -19684,7 +19693,8 @@
                                 title: 'label.details',
                                 fields:[ {
                                     name: {
-                                        label: 'label.name'
+                                        label: 'label.name',
+                                        isEditable: true
                                     }
                                 },
                                 {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ public Long getId() {`
`63`	`63`	`return id;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ public void setId(Long id) {`
	`67`	`+ this.id = id;`
	`68`	`+ }`
	`69`	`+`
`66`	`70`	`public String getHypervisor() {`
`67`	`71`	`return hypervisor;`
`68`	`72`	`}`