etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9548: PVLAN: VM migrate commands fails due to wrong casting 

Fix ensures, getting DomainRouterVO and UserVmVO properly from the VirtualMachineProfile
This commit is contained in:
Murali Reddy 2016-10-19 15:44:42 +05:30
parent 38a28698c3
commit edc359080c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/com/cloud/network/element/VirtualRouterElement.java
View File

@ -1144,7 +1144,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
if (vm.getType() == VirtualMachine.Type.DomainRouter) {
assert vm instanceof DomainRouterVO;
final DomainRouterVO router = (DomainRouterVO) vm.getVirtualMachine();
final DomainRouterVO router = _routerDao.findById(vm.getId());
final DataCenterVO dcVO = _dcDao.findById(network.getDataCenterId());
final NetworkTopology networkTopology = networkTopologyContext.retrieveNetworkTopology(dcVO);
@ -1156,7 +1156,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
final UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmMgr.setupVmForPvlan(false, userVm.getHostId(), nic);
}
return true;
@ -1169,7 +1169,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
if (vm.getType() == VirtualMachine.Type.DomainRouter) {
assert vm instanceof DomainRouterVO;
final DomainRouterVO router = (DomainRouterVO) vm.getVirtualMachine();
final DomainRouterVO router = _routerDao.findById(vm.getId());
final DataCenterVO dcVO = _dcDao.findById(network.getDataCenterId());
final NetworkTopology networkTopology = networkTopologyContext.retrieveNetworkTopology(dcVO);
@ -1181,7 +1181,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
final UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
}
}
@ -1193,7 +1193,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
if (vm.getType() == VirtualMachine.Type.DomainRouter) {
assert vm instanceof DomainRouterVO;
final DomainRouterVO router = (DomainRouterVO) vm.getVirtualMachine();
final DomainRouterVO router = _routerDao.findById(vm.getId());
final DataCenterVO dcVO = _dcDao.findById(network.getDataCenterId());
final NetworkTopology networkTopology = networkTopologyContext.retrieveNetworkTopology(dcVO);
@ -1205,7 +1205,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
final UserVmVO userVm = _userVmDao.findById(vm.getId());
_userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
}
}