rebase to 4.20 and adapt code to match other PR

Author: Alexandru Bagu

core/src/main/java/com/cloud/agent/api/GetVmIpAddressCommand.java

@@ -23,14 +23,14 @@ public class GetVmIpAddressCommand extends Command {
 
     String vmName;
     String vmNetworkCidr;
-    String vmNicMac;
     boolean windows = false;
+    String macAddress;
 
-    public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, String vmNicMac, boolean windows) {
+    public GetVmIpAddressCommand(String vmName, String vmNetworkCidr, boolean windows, String macAddress) {
         this.vmName = vmName;
         this.windows = windows;
         this.vmNetworkCidr = vmNetworkCidr;
-        this.vmNicMac = vmNicMac;
+        this.macAddress = macAddress;
     }
 
     @Override
@@ -50,7 +50,7 @@ public String getVmNetworkCidr() {
         return vmNetworkCidr;
     }
 
-    public String getVmNicMac() {
-        return vmNicMac;
+    public String getMacAddress() {
+        return macAddress;
     }
 }

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.getVmNicMac().replaceAll("-", ":");
+                    var normalizedMac = cmd.getMacAddress().replaceAll("-", ":");
                     for(var guestInfoNic : guestInfo.getNet()) {
                         var normalizedNicMac = guestInfoNic.getMacAddress().replaceAll("-", ":");
                         if (!result && normalizedNicMac.equalsIgnoreCase(normalizedMac)) {

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixRequestWrapperTest.java

@@ -1934,7 +1934,7 @@ public void testGetVmIpAddressCommand() throws XenAPIException, XmlRpcException
         vmIpsMap.put("Test", "127.0.0.1");
         rec.networks = vmIpsMap;
 
-        final GetVmIpAddressCommand getVmIpAddrCmd = new GetVmIpAddressCommand("Test", "127.0.0.1/24", "00:1b:63:84:45:e6", false);
+        final GetVmIpAddressCommand getVmIpAddrCmd = new GetVmIpAddressCommand("Test", "127.0.0.1/24", false, null);
 
         final CitrixRequestWrapper wrapper = CitrixRequestWrapper.getInstance();
         assertNotNull(wrapper);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -749,23 +749,25 @@ private class VmIpAddrFetchThread extends ManagedContextRunnable {
         boolean isWindows;
         Long hostId;
         String networkCidr;
+        String macAddress;
 
-        public VmIpAddrFetchThread(long vmId, String vmUuid, long nicId, String instanceName, boolean windows, Long hostId, String networkCidr) {
+        public VmIpAddrFetchThread(long vmId, String vmUuid, long nicId, String instanceName, boolean windows, Long hostId, String networkCidr, String macAddress) {
             this.vmId = vmId;
             this.vmUuid = vmUuid;
             this.nicId = nicId;
             this.vmName = instanceName;
             this.isWindows = windows;
             this.hostId = hostId;
             this.networkCidr = networkCidr;
+            this.macAddress = macAddress;
         }
 
         @Override
         protected void runInContext() {
-            NicVO nic = _nicDao.findById(nicId);
-            GetVmIpAddressCommand cmd = new GetVmIpAddressCommand(vmName, networkCidr, nic.getMacAddress(), isWindows);
+            GetVmIpAddressCommand cmd = new GetVmIpAddressCommand(vmName, networkCidr, isWindows, macAddress);
             boolean decrementCount = true;
 
+            NicVO nic = _nicDao.findById(nicId);
             try {
                 logger.debug("Trying IP retrieval for VM [id: {}, uuid: {}, name: {}], nic {}", vmId, vmUuid, vmName, nic);
                 Answer answer = _agentMgr.send(hostId, cmd);
@@ -2686,7 +2688,7 @@ protected void runInContext() {
                             boolean isWindows = _guestOSCategoryDao.findById(_guestOSDao.findById(vm.getGuestOSId()).getCategoryId()).getName().equalsIgnoreCase("Windows");
 
                             _vmIpFetchThreadExecutor.execute(new VmIpAddrFetchThread(vmId, vmInstance.getUuid(), nicId, vmInstance.getInstanceName(),
-                                    isWindows, vm.getHostId(), network.getCidr()));
+                                    isWindows, vm.getHostId(), network.getCidr(), nicVo.getMacAddress()));
 
                         }
                     } catch (Exception e) {