apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.14' into 4.15

Browse Source
This commit is contained in:
Rohit Yadav 2021-03-11 13:31:46 +05:30
commit 3f84b9ab42
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/com/cloud/api/ApiResponseHelper.java
View File

@ -3972,7 +3972,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<NicExtraDhcpOptionVO> nicExtraDhcpOptionVOs = _nicExtraDhcpOptionDao.listByNicId(result.getId());
// The numbered comments are to keep track of the data returned from here and UserVmJoinDaoImpl.setUserVmResponse()
@ -3986,15 +3985,13 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setVmId(vm.getUuid());
}
if (userVm != null){
if (userVm.getTrafficType() != null) {
if (network.getTrafficType() != null) {
/*4: trafficType*/
response.setTrafficType(userVm.getTrafficType().toString());
response.setTrafficType(network.getTrafficType().toString());
}
if (userVm.getGuestType() != null) {
if (network.getGuestType() != null) {
/*5: guestType*/
response.setType(userVm.getGuestType().toString());
}
response.setType(network.getGuestType().toString());
}
/*6: ipAddress*/
response.setIpaddress(result.getIPv4Address());
@ -4003,9 +4000,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*/

2
test/integration/smoke/test_vm_life_cycle.py
View File

@ -1329,7 +1329,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")