fixup

Author: vishesh92

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java

@@ -401,9 +401,7 @@ protected UserVm createKubernetesNode(String joinIp) throws ManagementServerExce
         if (StringUtils.isNotBlank(kubernetesCluster.getKeyPair())) {
             keypairs.add(kubernetesCluster.getKeyPair());
         }
-        if (kubernetesCluster.getSecurityGroupId() != null &&
-                networkModel.checkSecurityGroupSupportForNetwork(zone, networkIds,
-                        List.of(kubernetesCluster.getSecurityGroupId()))) {
+        if (kubernetesCluster.getSecurityGroupId() != null && networkModel.checkSecurityGroupSupportForNetwork(zone, networkIds, List.of(kubernetesCluster.getSecurityGroupId()))) {
             List<Long> securityGroupIds = new ArrayList<>();
             securityGroupIds.add(kubernetesCluster.getSecurityGroupId());
             nodeVm = userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, clusterTemplate, networkIds, securityGroupIds, owner,

server/src/main/java/com/cloud/network/NetworkModelImpl.java

@@ -2764,7 +2764,7 @@ public boolean isSecurityGroupSupportedForZone(Long zoneId) {
     @Override
     public boolean checkSecurityGroupSupportForNetwork(DataCenter zone, List<Long> networkIds,
                                                        List<Long> securityGroupsIds) {
-        if (zone.isSecurityGroupEnabled() || isSecurityGroupSupportedForZone(zone.getId())) {
+        if (zone.isSecurityGroupEnabled()) {
             return true;
         }
         if (CollectionUtils.isNotEmpty(networkIds)) {

server/src/main/java/org/apache/cloudstack/storage/template/VnfTemplateManagerImpl.java

@@ -291,7 +291,7 @@ protected Map<Network, String> getManagementNetworkAndIp(VirtualMachineTemplate
     @Override
     public SecurityGroup createSecurityGroupForVnfAppliance(DataCenter zone, VirtualMachineTemplate template, Account owner,
                                                             DeployVnfApplianceCmd cmd) {
-        if (zone == null || !zone.isSecurityGroupEnabled() || !networkModel.isSecurityGroupSupportedForZone(zone.getId())) {
+        if (zone == null || !(zone.isSecurityGroupEnabled() || networkModel.isSecurityGroupSupportedForZone(zone.getId()))) {
             return null;
         }
         if (!cmd.getVnfConfigureManagement()) {

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -566,7 +566,7 @@ protected NetworkVO getDefaultNetworkForAdvancedZone(DataCenter dc) {
             throw new CloudRuntimeException(String.format("%s is not advanced.", dc.toString()));
         }
 
-        if (dc.isSecurityGroupEnabled() || _networkModel.isSecurityGroupSupportedForZone(dc.getId())) {
+        if (dc.isSecurityGroupEnabled()) {
             List<NetworkVO> networks = _networkDao.listByZoneSecurityGroup(dc.getId());
             if (CollectionUtils.isEmpty(networks)) {
                 throw new CloudRuntimeException(String.format("Can not found security enabled network in SG %s.", dc.toString()));