CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException

Sakshams · yadvr · commit a1791cb4a8fb · 2015-01-18T17:28:17.000+05:30
(cherry picked from commit 1df0453) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java
@@ -17,6 +17,7 @@
 package com.cloud.hypervisor;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.cloudstack.framework.config.ConfigKey;
 
@@ -81,4 +82,6 @@ public interface HypervisorGuru extends Adapter {
     List<Command> finalizeExpungeNics(VirtualMachine vm, List<NicProfile> nics);
 
     List<Command> finalizeExpungeVolumes(VirtualMachine vm);
+
+    Map<String, String> getClusterSettings(long vmId);
 }
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3487,6 +3487,13 @@ private VMInstanceVO orchestrateReConfigureVm(String vmUuid, ServiceOffering old
                         newServiceOffering.getSpeed(), minMemory * 1024L * 1024L, newServiceOffering.getRamSize() * 1024L * 1024L, newServiceOffering.getLimitCpuUse());
 
         Long dstHostId = vm.getHostId();
+        if(vm.getHypervisorType().equals(HypervisorType.VMware)) {
+            HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType());
+            Map<String, String> details = null;
+            details = hvGuru.getClusterSettings(vm.getId());
+            reconfigureCmd.getVirtualMachine().setDetails(details);
+        }
+
         ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Running, vm.getType(), vm.getId());
         work.setStep(Step.Prepare);
         work.setResourceType(ItWorkVO.ResourceType.Host);
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalGuru.java
@@ -84,4 +84,10 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
     public boolean trackVmHostChange() {
         return false;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
 }
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/guru/HypervGuru.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 import javax.ejb.Local;
 import javax.inject.Inject;
@@ -194,4 +195,10 @@ public int compare(NicTO arg0, NicTO arg1) {
     public final boolean trackVmHostChange() {
         return false;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
 }
diff --git a/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java b/plugins/hypervisors/ovm/src/com/cloud/ovm/hypervisor/OvmGuru.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.ovm.hypervisor;
 
+import java.util.Map;
+
 import javax.ejb.Local;
 import javax.inject.Inject;
 
@@ -58,4 +60,10 @@ public boolean trackVmHostChange() {
         return true;
     }
 
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
+
 }
diff --git a/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java b/plugins/hypervisors/simulator/src/com/cloud/simulator/SimulatorGuru.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.simulator;
 
+import java.util.Map;
+
 import javax.ejb.Local;
 import javax.inject.Inject;
 
@@ -56,4 +58,10 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
     public boolean trackVmHostChange() {
         return false;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
 }
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -552,4 +552,13 @@ public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {
 
         return commands;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        Map<String, String> details = new HashMap<String, String>();
+        long clusterId = getClusterId(vmId);
+        details.put(VmwareReserveCpu.key(), VmwareReserveCpu.valueIn(clusterId).toString());
+        details.put(VmwareReserveMemory.key(), VmwareReserveMemory.valueIn(clusterId).toString());
+        return details;
+    }
 }
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
@@ -18,6 +18,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import javax.ejb.Local;
 import javax.inject.Inject;
@@ -128,6 +129,11 @@ public boolean trackVmHostChange() {
         return true;
     }
 
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
     @Override
     public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {
         List<Command> commands = new ArrayList<Command>();
diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java
@@ -190,4 +190,10 @@ public List<Command> finalizeExpungeNics(VirtualMachine vm, List<NicProfile> nic
     public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {
         return null;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
 }
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.hypervisor;
 
+import java.util.Map;
+
 import javax.ejb.Local;
 import javax.inject.Inject;
 
@@ -86,4 +88,10 @@ public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
     public boolean trackVmHostChange() {
         return false;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
+
 }
diff --git a/server/src/com/cloud/hypervisor/LXCGuru.java b/server/src/com/cloud/hypervisor/LXCGuru.java
@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.hypervisor;
 
+import java.util.Map;
+
 import javax.ejb.Local;
 import javax.inject.Inject;
 
@@ -73,4 +75,9 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {
     public boolean trackVmHostChange() {
         return false;
     }
+
+    @Override
+    public Map<String, String> getClusterSettings(long vmId) {
+        return null;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,10 @@ public VirtualMachineTO implement(VirtualMachineProfile vm) {`
`84`	`84`	`public boolean trackVmHostChange() {`
`85`	`85`	`return false;`
`86`	`86`	`}`
	`87`	`+`
	`88`	`+ @Override`
	`89`	`+ public Map<String, String> getClusterSettings(long vmId) {`
	`90`	`+ return null;`
	`91`	`+ }`
	`92`	`+`
`87`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -552,4 +552,13 @@ public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {`
`552`	`552`
`553`	`553`	`return commands;`
`554`	`554`	`}`
	`555`	`+`
	`556`	`+ @Override`
	`557`	`+ public Map<String, String> getClusterSettings(long vmId) {`
	`558`	`+ Map<String, String> details = new HashMap<String, String>();`
	`559`	`+ long clusterId = getClusterId(vmId);`
	`560`	`+ details.put(VmwareReserveCpu.key(), VmwareReserveCpu.valueIn(clusterId).toString());`
	`561`	`+ details.put(VmwareReserveMemory.key(), VmwareReserveMemory.valueIn(clusterId).toString());`
	`562`	`+ return details;`
	`563`	`+ }`
`555`	`564`	`}`
Original file line number	Diff line number	Diff line change
`@@ -190,4 +190,10 @@ public List<Command> finalizeExpungeNics(VirtualMachine vm, List<NicProfile> nic`
`190`	`190`	`public List<Command> finalizeExpungeVolumes(VirtualMachine vm) {`
`191`	`191`	`return null;`
`192`	`192`	`}`
	`193`	`+`
	`194`	`+ @Override`
	`195`	`+ public Map<String, String> getClusterSettings(long vmId) {`
	`196`	`+ return null;`
	`197`	`+ }`
	`198`	`+`
`193`	`199`	`}`