Skip to content

Commit 00d83b5

Browse files
ustcweizhouDaanHoogland
authored andcommitted
CLOUDSTACK-9203: fix issue when update vm in isolated networks
1 parent 515d408 commit 00d83b5

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2460,16 +2460,14 @@ public UserVm updateVirtualMachine(long id, String displayName, String group, Bo
24602460
if (zone.getNetworkType() == NetworkType.Basic) {
24612461
// Get default guest network in Basic zone
24622462
defaultNetwork = _networkModel.getExclusiveGuestNetwork(zone.getId());
2463-
} else {
2464-
if (zone.isSecurityGroupEnabled()) { // advanced zone with security groups
2465-
NicVO defaultNic = _nicDao.findDefaultNicForVM(vm.getId());
2466-
if (defaultNic != null) {
2467-
defaultNetwork = _networkDao.findById(defaultNic.getNetworkId());
2468-
}
2463+
} else if (zone.isSecurityGroupEnabled()) {
2464+
NicVO defaultNic = _nicDao.findDefaultNicForVM(vm.getId());
2465+
if (defaultNic != null) {
2466+
defaultNetwork = _networkDao.findById(defaultNic.getNetworkId());
24692467
}
24702468
}
24712469

2472-
if (defaultNetwork == null || defaultNetwork.getGuestType() != Network.GuestType.Shared) {
2470+
if (defaultNetwork == null && (zone.getNetworkType() == NetworkType.Basic || zone.isSecurityGroupEnabled())) {
24732471
throw new InvalidParameterValueException("Cannot find default network for vm:" + vm.getId());
24742472
}
24752473

0 commit comments

Comments
 (0)