Skip to content

VMware: match nic mac for ip address fetch #10641

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
weizhouapache merged 11 commits into from
Oct 4, 2025
Merged

VMware: match nic mac for ip address fetch #10641

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
559c011
match nic mac for ip address fetch
Mar 29, 2025
4a40b00
rename field to properly match usage
Mar 29, 2025
2726aca
rebase to 4.20 and adapt code to match other PR
Apr 25, 2025
0dd48f1
Merge branch '4.20' into fix-vmware-ip-loss
DaanHoogland May 12, 2025
323eb1f
Merge branch '4.20' into fix-vmware-ip-loss
DaanHoogland May 13, 2025
5f0e76f
Update UserVmManagerImpl.java
alexandru-bagu May 19, 2025
33e0691
Merge branch '4.20' into fix-vmware-ip-loss
weizhouapache Sep 25, 2025
97e8e94
Update plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/…
weizhouapache Oct 1, 2025
230412d
fix ip fetch on L2 network
weizhouapache Oct 1, 2025
ccce3e9
Update server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
weizhouapache Oct 3, 2025
cddab12
Update plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/…
weizhouapache Oct 3, 2025
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
Prev Previous commit
Next Next commit
Merge branch '4.20' into fix-vmware-ip-loss
  • Loading branch information
@DaanHoogland
DaanHoogland authored May 13, 2025
commit 323eb1f7df937211bcb779c66d38d33061b63900
3 changes: 2 additions & 1 deletion ...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 @@ -5809,7 +5809,8 @@
String details = "Unable to find IP Address of VM. ";
String vmName = cmd.getVmName();
boolean result = false;
Answer answer = null;
String ip;
Answer answer;

VmwareContext context = getServiceContext();
VmwareHypervisorHost hyperHost = getHyperHost(context);
Expand All @@ -5827,18 +5828,18 @@
if (toolsStatus == VirtualMachineToolsStatus.TOOLS_NOT_INSTALLED) {
details += "Vmware tools not installed.";
} else {
var normalizedMac = cmd.getMacAddress().replaceAll("-", ":");

Check warning on line 5831 in plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

View check run for this annotation

Codecov / codecov/patch

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java#L5831 

Added line #L5831 was not covered by tests
for(var guestInfoNic : guestInfo.getNet()) {
var normalizedNicMac = guestInfoNic.getMacAddress().replaceAll("-", ":");

Check warning on line 5833 in plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

View check run for this annotation

Codecov / codecov/patch

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java#L5833 

Added line #L5833 was not covered by tests
if (!result && normalizedNicMac.equalsIgnoreCase(normalizedMac)) {
result = true;
details = null;

Check warning on line 5836 in plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

View check run for this annotation

Codecov / codecov/patch

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java#L5835-L5836 

Added lines #L5835 - L5836 were not covered by tests
for (var ipAddr : guestInfoNic.getIpAddress()) {
if(NetUtils.isIpWithInCidrRange(ipAddr, cmd.getVmNetworkCidr())) {
Comment thread
weizhouapache marked this conversation as resolved.
Outdated
details = ipAddr;

Check warning on line 5839 in plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

View check run for this annotation

Codecov / codecov/patch

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java#L5839 

Added line #L5839 was not covered by tests
}
}
Comment thread
weizhouapache marked this conversation as resolved.
}

Check warning on line 5842 in plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java

View check run for this annotation

Codecov / codecov/patch

plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java#L5841-L5842 

Added lines #L5841 - L5842 were not covered by tests
}
}
} else {
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.