Make reorder ACL items invoke Netris controller (apache#90)

Author: nvazquez

engine/components-api/src/main/java/com/cloud/network/vpc/NetworkACLManager.java

@@ -93,5 +93,5 @@ public interface NetworkACLManager {
 
     boolean applyACLToPrivateGw(PrivateGateway gateway) throws ResourceUnavailableException;
 
-    boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems);
+    boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems, Network.Provider networkProvider);
 }

server/src/main/java/com/cloud/network/vpc/NetworkACLManagerImpl.java

@@ -369,15 +369,16 @@ public boolean applyACLToPrivateGw(final PrivateGateway gateway) throws Resource
     }
 
     @Override
-    public boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems) {
-        List<NetworkACLServiceProvider> nsxElements = new ArrayList<>();
-        nsxElements.add((NetworkACLServiceProvider) _ntwkModel.getElementImplementingProvider(Network.Provider.Nsx.getName()));
+    public boolean reorderAclRules(VpcVO vpc, List<? extends Network> networks,
+                                   List<? extends NetworkACLItem> networkACLItems, Network.Provider networkProvider) {
+        List<NetworkACLServiceProvider> providers = new ArrayList<>();
+        providers.add((NetworkACLServiceProvider) _ntwkModel.getElementImplementingProvider(networkProvider.getName()));
         try {
-            for (final NetworkACLServiceProvider provider : nsxElements) {
+            for (final NetworkACLServiceProvider provider : providers) {
                 return provider.reorderAclRules(vpc, networks, networkACLItems);
             }
         } catch (final Exception ex) {
-            logger.debug("Failed to reorder ACLs on NSX due to: " + ex.getLocalizedMessage());
+            logger.debug(String.format("Failed to reorder ACLs on %s due to: %s", networkProvider.getName(), ex.getLocalizedMessage()));
         }
         return false;
     }

server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java

@@ -28,7 +28,9 @@
 
 import com.cloud.dc.DataCenter;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.network.dao.NetrisProviderDao;
 import com.cloud.network.dao.NsxProviderDao;
+import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ServerApiException;
@@ -41,6 +43,7 @@
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -104,6 +107,8 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
     private VpcService _vpcSvc;
     @Inject
     private NsxProviderDao nsxProviderDao;
+    @Inject
+    private NetrisProviderDao netrisProviderDao;
 
     private String supportedProtocolsForAclRules = "tcp,udp,icmp,all";
 
@@ -1031,10 +1036,12 @@ public NetworkACLItem moveNetworkAclRuleToNewPosition(MoveNetworkAclItemCmd move
             }
             final DataCenter dc = _entityMgr.findById(DataCenter.class, vpc.getZoneId());
             final NsxProviderVO nsxProvider = nsxProviderDao.findByZoneId(dc.getId());
+            final NetrisProviderVO netrisProvider = netrisProviderDao.findByZoneId(dc.getId());
             List<NetworkVO> networks = _networkDao.listByAclId(lockedAcl.getId());
-            if (Objects.nonNull(nsxProvider) && !networks.isEmpty()) {
+            if (ObjectUtils.anyNotNull(nsxProvider, netrisProvider) && !networks.isEmpty()) {
                 allAclRules = getAllAclRulesSortedByNumber(lockedAcl.getId());
-                _networkAclMgr.reorderAclRules(vpc, networks, allAclRules);
+                Network.Provider networkProvider = nsxProvider != null ? Network.Provider.Nsx : Network.Provider.Netris;
+                _networkAclMgr.reorderAclRules(vpc, networks, allAclRules, networkProvider);
             }
             return networkACLItem;
         } finally {