From 7a9d43e95988b77a84cc671ea1b37c4b2873514d Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 11 Mar 2021 13:05:37 +0530 Subject: [PATCH 1/2] test: fix listVolumes call for detach volume migration check (#4785) Signed-off-by: Abhishek Kumar --- test/integration/smoke/test_vm_life_cycle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 3def05346a4..2328a87c593 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -1305,7 +1305,7 @@ class TestMigrateVMwithVolume(cloudstackTestCase): Volume.migrate(self.apiclient, storageid=target_pool.id, volumeid=volume1.id) - vol = Volume.list(self.apiclient, volume=volume1.id)[0] + vol = Volume.list(self.apiclient, id=volume1.id)[0] self.assertEqual(vol.storageid, target_pool.id, "Storage pool was not the same as expected") From 025b654b5df3a0eecb797e6a969b11bbba24ad5a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 11 Mar 2021 13:06:44 +0530 Subject: [PATCH 2/2] server: use network details from nic network (#4772) Signed-off-by: Abhishek Kumar --- .../java/com/cloud/api/ApiResponseHelper.java | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index c2d912b68d6..da4de8f91d5 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -3922,7 +3922,6 @@ public class ApiResponseHelper implements ResponseGenerator { NicResponse response = new NicResponse(); NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId()); VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, result.getInstanceId()); - UserVmJoinVO userVm = _entityMgr.findById(UserVmJoinVO.class, result.getInstanceId()); List nicExtraDhcpOptionVOs = _nicExtraDhcpOptionDao.listByNicId(result.getId()); // The numbered comments are to keep track of the data returned from here and UserVmJoinDaoImpl.setUserVmResponse() @@ -3936,15 +3935,13 @@ public class ApiResponseHelper implements ResponseGenerator { response.setVmId(vm.getUuid()); } - if (userVm != null){ - if (userVm.getTrafficType() != null) { - /*4: trafficType*/ - response.setTrafficType(userVm.getTrafficType().toString()); - } - if (userVm.getGuestType() != null) { - /*5: guestType*/ - response.setType(userVm.getGuestType().toString()); - } + if (network.getTrafficType() != null) { + /*4: trafficType*/ + response.setTrafficType(network.getTrafficType().toString()); + } + if (network.getGuestType() != null) { + /*5: guestType*/ + response.setType(network.getGuestType().toString()); } /*6: ipAddress*/ response.setIpaddress(result.getIPv4Address()); @@ -3953,9 +3950,7 @@ public class ApiResponseHelper implements ResponseGenerator { /*8: netmask*/ response.setNetmask(result.getIPv4Netmask()); /*9: networkName*/ - if(userVm != null && userVm.getNetworkName() != null) { - response.setNetworkName(userVm.getNetworkName()); - } + response.setNetworkName(network.getName()); /*10: macAddress*/ response.setMacAddress(result.getMacAddress()); /*11: IPv6Address*/