DaanHoogland commented on code in PR #10493:
URL: https://github.com/apache/cloudstack/pull/10493#discussion_r2046208833
##########
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java:
##########
@@ -3173,6 +3136,35 @@ public UserVm updateVirtualMachine(long id, String
displayName, String group, Bo
.getUuid(), nic.getId(), extraDhcpOptionsMap);
}
+ boolean isVMware = (vm.getHypervisorType() == HypervisorType.VMware);
+
+ if (securityGroupIdList != null && isVMware) {
+ throw new InvalidParameterValueException("Security group feature
is not supported for VMware hypervisor");
+ } else if (securityGroupIdList != null) {
+ DataCenterVO zone = _dcDao.findById(vm.getDataCenterId());
+ List<Long> networkIds = new ArrayList<>();
+ try {
+ if (zone.getNetworkType() == NetworkType.Basic) {
+ // Get default guest network in Basic zone
+ Network defaultNetwork =
_networkModel.getExclusiveGuestNetwork(zone.getId());
+ networkIds.add(defaultNetwork.getId());
+ } else {
+ networkIds =
networks.stream().map(Network::getId).collect(Collectors.toList());
+ }
+ } catch (InvalidParameterValueException e) {
+ if(logger.isDebugEnabled()) {
+ logger.debug(e.getMessage(),e);
+ }
+ }
+
+ if (_networkModel.checkSecurityGroupSupportForNetwork(
+
_accountMgr.getActiveAccountById(vm.getAccountId()),
+ zone, networkIds, securityGroupIdList)
+ ) {
+ updateSecurityGroup(vm, securityGroupIdList);
+ }
+ }
Review Comment:
can we extract this bit in a checkAndUpdate method?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
