Skip to content

[Vmware] Use host FQDN if host IP is not found on VNC command #5414

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

Closed
nvazquez wants to merge 2 commits into from
Closed

[Vmware] Use host FQDN if host IP is not found on VNC command #5414

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1bc4fc
use host FQDN if host IP is not found on VNC command
nvazquez Sep 7, 2021
9c5f256
Refactor
nvazquez Sep 8, 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
17 changes: 14 additions & 3 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 @@ -38,6 +38,7 @@

import com.cloud.storage.Storage;
import com.cloud.utils.exception.CloudRuntimeException;
import com.vmware.vim25.HostDnsConfig;
import com.vmware.vim25.InvalidStateFaultMsg;
import com.vmware.vim25.RuntimeFaultFaultMsg;
import com.vmware.vim25.TaskInfo;
Expand Down Expand Up @@ -1177,24 +1178,34 @@ public boolean configureVm(Ternary<VirtualDevice, VirtualDeviceConfigSpecOperati
return false;
}

private String getHostFqdn(HostMO hostMO, String hostName) {
Copy link
Contributor

@sureshanaparti sureshanaparti Sep 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nvazquez I think, it is better to keep this method in HostMO.

public String getHostFqdn() {
        try {
             HostDnsConfig hostDnsConfig = getHostNetworkInfo().getDnsConfig();
             return String.format("%s.%s", hostDnsConfig.getHostName(), hostDnsConfig.getDomainName());
         } catch (Exception e) {
             s_logger.error("Could not get host FQDN for host: " + getHostName());
         }
         return null;
}

try {
HostDnsConfig hostDnsConfig = hostMO.getHostNetworkInfo().getDnsConfig();
return String.format("%s.%s", hostDnsConfig.getHostName(), hostDnsConfig.getDomainName());
} catch (Exception e) {
s_logger.error("Could not get host FQDN for host: " + hostName);
}
return null;
}

public Pair<String, Integer> getVncPort(String hostNetworkName) throws Exception {
HostMO hostMo = getRunningHost();
VmwareHypervisorHostNetworkSummary summary = hostMo.getHyperHostNetworkSummary(hostNetworkName);

VirtualMachineConfigInfo configInfo = getConfigInfo();
List<OptionValue> values = configInfo.getExtraConfig();

String hostKey = StringUtils.isNotBlank(summary.getHostIp()) ? summary.getHostIp() : getHostFqdn(hostMo, hostMo.getHostName());
if (values != null) {
for (OptionValue option : values) {
if (option.getKey().equals("RemoteDisplay.vnc.port")) {
String value = (String)option.getValue();
if (value != null) {
return new Pair<String, Integer>(summary.getHostIp(), Integer.parseInt(value));
return new Pair<String, Integer>(hostKey, Integer.parseInt(value));
}
}
}
}
return new Pair<String, Integer>(summary.getHostIp(), 0);
return new Pair<String, Integer>(hostKey, 0);
}

// vmdkDatastorePath: [datastore name] vmdkFilePath
Expand Down