CLOUDSTACK-8073 load cidrs on create response

Author: DaanHoogland

server/src/com/cloud/api/ApiDBUtils.java

@@ -201,6 +201,7 @@
 import com.cloud.network.security.SecurityGroupVO;
 import com.cloud.network.security.dao.SecurityGroupDao;
 import com.cloud.network.vpc.NetworkACL;
+import com.cloud.network.vpc.NetworkACLItemCidrsDao;
 import com.cloud.network.vpc.StaticRouteVO;
 import com.cloud.network.vpc.VpcGatewayVO;
 import com.cloud.network.vpc.VpcManager;
@@ -357,6 +358,7 @@ public class ApiDBUtils {
     static ConfigurationDao s_configDao;
     static ConsoleProxyDao s_consoleProxyDao;
     static FirewallRulesCidrsDao s_firewallCidrsDao;
+    static NetworkACLItemCidrsDao s_networkACLItemCidrsDao;
     static VMInstanceDao s_vmDao;
     static ResourceLimitService s_resourceLimitMgr;
     static ProjectService s_projectMgr;
@@ -524,6 +526,8 @@ public class ApiDBUtils {
     @Inject
     private FirewallRulesCidrsDao firewallCidrsDao;
     @Inject
+    private NetworkACLItemCidrsDao networkACLItemCidrsDao;
+    @Inject
     private VMInstanceDao vmDao;
     @Inject
     private ResourceLimitService resourceLimitMgr;
@@ -692,6 +696,7 @@ void init() {
         s_configDao = configDao;
         s_consoleProxyDao = consoleProxyDao;
         s_firewallCidrsDao = firewallCidrsDao;
+        s_networkACLItemCidrsDao = networkACLItemCidrsDao;
         s_vmDao = vmDao;
         s_resourceLimitMgr = resourceLimitMgr;
         s_projectMgr = projectMgr;
@@ -1241,6 +1246,10 @@ public static List<String> findFirewallSourceCidrs(long id) {
         return s_firewallCidrsDao.getSourceCidrs(id);
     }
 
+    public static List<String> findNetworkAclItemSourceCidrs(long id) {
+        return s_networkACLItemCidrsDao.getCidrs(id);
+    }
+
     public static Account getProjectOwner(long projectId) {
         return s_projectMgr.getProjectOwner(projectId);
     }

server/src/com/cloud/api/ApiResponseHelper.java

@@ -2349,7 +2349,8 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte
             response.setEndPort(Integer.toString(aclItem.getSourcePortEnd()));
         }
 
-        response.setCidrList(StringUtils.join(aclItem.getSourceCidrList(), ","));
+        List<String> cidrs = ApiDBUtils.findNetworkAclItemSourceCidrs(aclItem.getId());
+        response.setCidrList(StringUtils.join(cidrs, ","));
 
         response.setTrafficType(aclItem.getTrafficType().toString());