rename field to properly match usage

Alexandru Bagu · Alexandru Bagu · commit d3939f087086 · 2025-03-29T13:02:45.000+01:00
diff --git a/core/src/main/java/com/cloud/agent/api/GetVmIpAddressCommand.java b/core/src/main/java/com/cloud/agent/api/GetVmIpAddressCommand.java
@@ -23,14 +23,14 @@ public class GetVmIpAddressCommand extends Command {
 
     String vmName;
     String vmNetworkCidr;
-    String vmNetworkMac;
+    String vmNicMac;
     boolean windows = false;
 
-    public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, String vmNetworkMac, boolean windows) {
+    public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, String vmNicMac, boolean windows) {
         this.vmName = vmName;
         this.windows = windows;
         this.vmNetworkCidr = vmNetworkCidr;
-        this.vmNetworkMac = vmNetworkMac;
+        this.vmNicMac = vmNicMac;
     }
 
     @Override
@@ -50,7 +50,7 @@ public String getVmNetworkCidr() {
         return vmNetworkCidr;
     }
 
-    public String getVmNetworkMac() {
-        return vmNetworkMac;
+    public String getVmNicMac() {
+        return vmNicMac;
     }
 }
diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -5756,7 +5756,7 @@ protected Answer execute(GetVmIpAddressCommand cmd) {
                 if (toolsStatus == VirtualMachineToolsStatus.TOOLS_NOT_INSTALLED) {
                     details += "Vmware tools not installed.";
                 } else {
-                    var normalizedMac = cmd.getVmNetworkMac().replaceAll("-", ":");
+                    var normalizedMac = cmd.getVmNicMac().replaceAll("-", ":");
                     for(var guestInfoNic : guestInfo.getNet()) {
                         var normalizedNicMac = guestInfoNic.getMacAddress().replaceAll("-", ":");
                         if (!result && normalizedNicMac.equalsIgnoreCase(normalizedMac)) {

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public class GetVmIpAddressCommand extends Command {`
`23`	`23`
`24`	`24`	`String vmName;`
`25`	`25`	`String vmNetworkCidr;`
`26`		`- String vmNetworkMac;`
	`26`	`+ String vmNicMac;`
`27`	`27`	`boolean windows = false;`
`28`	`28`
`29`		`- public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, String vmNetworkMac, boolean windows) {`
	`29`	`+ public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, String vmNicMac, boolean windows) {`
`30`	`30`	`this.vmName = vmName;`
`31`	`31`	`this.windows = windows;`
`32`	`32`	`this.vmNetworkCidr = vmNetworkCidr;`
`33`		`- this.vmNetworkMac = vmNetworkMac;`
	`33`	`+ this.vmNicMac = vmNicMac;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`@@ -50,7 +50,7 @@ public String getVmNetworkCidr() {`
`50`	`50`	`return vmNetworkCidr;`
`51`	`51`	`}`
`52`	`52`
`53`		`- public String getVmNetworkMac() {`
`54`		`- return vmNetworkMac;`
	`53`	`+ public String getVmNicMac() {`
	`54`	`+ return vmNicMac;`
`55`	`55`	`}`
`56`	`56`	`}`