apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add internal cs name to vm during the ingest (#5242)

Browse Source 
* add internal cs name to vm during the ingest

* Update server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java

Co-authored-by: dahn <daan.hoogland@gmail.com>

* remove lang.StringUtils

* Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>

* Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java

Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Co-authored-by: DK101010 <dirk.klahre@itelligence.de>
Co-authored-by: dahn <daan.hoogland@gmail.com>
Co-authored-by: sureshanaparti <12028987+sureshanaparti@users.noreply.github.com>
Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
This commit is contained in:
DK101010 2021-08-13 21:38:52 +02:00 committed by GitHub
parent 1bfb2f9fb1
commit 1d17d7cfbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
View File

@ -29,6 +29,8 @@ public class UnmanagedInstanceTO {
private String name;
private String internalCSName;
private PowerState powerState;
private Integer cpuCores;
@ -55,6 +57,14 @@ public class UnmanagedInstanceTO {
this.name = name;
}
public String getInternalCSName() {
return internalCSName;
}
public void setInternalCSName(String internalCSName) {
this.internalCSName = internalCSName;
}
public PowerState getPowerState() {
return powerState;
}

1
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -7277,6 +7277,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
instance = new UnmanagedInstanceTO();
instance.setName(vmMo.getVmName());
instance.setInternalCSName(vmMo.getInternalCSName());
instance.setCpuCores(vmMo.getConfigSummary().getNumCpu());
instance.setCpuCoresPerSocket(vmMo.getCoresPerSocket());
instance.setCpuSpeed(vmMo.getConfigSummary().getCpuReservation());

6
server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
View File

@ -956,6 +956,10 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, String.format("Failed to import VM: %s. %s", unmanagedInstance.getName(), Strings.nullToEmpty(e.getMessage())));
}
String internalCSName = unmanagedInstance.getInternalCSName();
if(StringUtils.isEmpty(internalCSName)){
internalCSName = instanceName;
}
Map<String, String> allDetails = new HashMap<>(details);
if (validatedServiceOffering.isDynamic()) {
allDetails.put(VmDetailConstants.CPU_NUMBER, String.valueOf(validatedServiceOffering.getCpu()));
@ -1002,7 +1006,7 @@ public class UnmanagedVMsManagerImpl implements UnmanagedVMsManager {
powerState = VirtualMachine.PowerState.PowerOn;
}
try {
userVm = userVmManager.importVM(zone, host, template, instanceName, displayName, owner,
userVm = userVmManager.importVM(zone, host, template, internalCSName, displayName, owner,
null, caller, true, null, owner.getAccountId(), userId,
validatedServiceOffering, null, hostName,
cluster.getHypervisorType(), allDetails, powerState);

5
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
View File

@ -579,8 +579,9 @@ public class HostMO extends BaseMO implements VmwareHypervisorHost {
if (s_logger.isTraceEnabled())
s_logger.trace("put " + vmName + " into host cache");
_vmCache.put(vmName, new VirtualMachineMO(_context, oc.getObj()));
VirtualMachineMO virtualMachine = new VirtualMachineMO(_context, oc.getObj());
virtualMachine.setInternalCSName(vmName);
_vmCache.put(vmName, virtualMachine);
}
}
}

9
vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View File

@ -130,6 +130,15 @@ public class VirtualMachineMO extends BaseMO {
public static final String ANSWER_NO = "1";
private ManagedObjectReference _vmEnvironmentBrowser = null;
private String internalCSName;
public String getInternalCSName() {
return internalCSName;
}
public void setInternalCSName(String internalVMName) {
this.internalCSName = internalVMName;
}
public VirtualMachineMO(VmwareContext context, ManagedObjectReference morVm) {
super(context, morVm);