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

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

This commit is contained in:
Rohit Yadav 2020-06-08 07:01:52 +05:30
parent debde60c94 056e6768a2
commit cd63d6812f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1223,8 +1223,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, RedundantResource, DnsServ
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
_userVmMgr.setupVmForPvlan(false, userVm.getHostId(), nic);
_userVmMgr.setupVmForPvlan(false, vm.getVirtualMachine().getHostId(), nic);
}
return true;
}
@ -1248,8 +1247,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, RedundantResource, DnsServ
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
_userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
_userVmMgr.setupVmForPvlan(true, vm.getVirtualMachine().getHostId(), nic);
}
}
@ -1272,8 +1270,7 @@ NetworkMigrationResponder, AggregatedCommandExecutor, RedundantResource, DnsServ
}
} else if (vm.getType() == VirtualMachine.Type.User) {
assert vm instanceof UserVmVO;
final UserVmVO userVm = (UserVmVO) vm.getVirtualMachine();
_userVmMgr.setupVmForPvlan(true, userVm.getHostId(), nic);
_userVmMgr.setupVmForPvlan(true, vm.getVirtualMachine().getHostId(), nic);
}
}