Skip to content

Add internal cs name to vm during the ingest #5242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nvazquez merged 7 commits into from
Aug 13, 2021
Merged

Add internal cs name to vm during the ingest #5242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ef17a68
add internal cs name to vm during the ingest
Jul 26, 2021
57873a3
Update server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsMana…
DK101010 Jul 28, 2021
2b30b33
Merge branch 'master' into bug/update_internal_cs_name_during_ingest
Aug 2, 2021
25c71b7
Merge branch 'bug/update_internal_cs_name_during_ingest' of https://g…
Aug 2, 2021
68927f6
remove lang.StringUtils
Aug 2, 2021
e4b1b77
Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostM…
DK101010 Aug 10, 2021
4826694
Update vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostM…
DK101010 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public enum PowerState {

private String name;

private String internalCSName;

private PowerState powerState;

private Integer cpuCores;
Expand All @@ -55,6 +57,14 @@ public void setName(String name) {
this.name = name;
}

public String getInternalCSName() {
return internalCSName;
}

public void setInternalCSName(String internalCSName) {
this.internalCSName = internalCSName;
}

public PowerState getPowerState() {
return powerState;
}
Expand Down
1 change: 1 addition & 0 deletions ...hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7269,6 +7269,7 @@ private UnmanagedInstanceTO getUnmanagedInstance(VmwareHypervisorHost hyperHost,
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());
Expand Down
6 changes: 5 additions & 1 deletion server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,10 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
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()));
Expand Down Expand Up @@ -1002,7 +1006,7 @@ private UserVm importVirtualMachineInternal(final UnmanagedInstanceTO unmanagedI
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);
Expand Down
5 changes: 3 additions & 2 deletions vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostMO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,8 +579,9 @@ private void loadVmCache() throws Exception {

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);
}
}
}
Expand Down
9 changes: 9 additions & 0 deletions vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down