Routed v25

- add test_01_subnet_zone
- fix dedicate to domain/account failure
- list subnets for network by keyword and subnet

api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateIpv4SubnetForGuestNetworkCmd.java

@@ -57,7 +57,7 @@ public class CreateIpv4SubnetForGuestNetworkCmd extends BaseAsyncCmd {
 
     @Parameter(name = ApiConstants.SUBNET,
             type = CommandType.STRING,
-            description = "The CIDR for this Ipv4 subnet.")
+            description = "The CIDR of this Ipv4 subnet.")
     private String subnet;
 
     @Parameter(name = ApiConstants.CIDR_SIZE,

api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListIpv4SubnetsForGuestNetworkCmd.java

@@ -51,6 +51,11 @@ public class ListIpv4SubnetsForGuestNetworkCmd extends BaseListCmd {
             description = "UUID of zone Ipv4 subnet which the IPv4 subnet belongs to.")
     private Long parentId;
 
+    @Parameter(name = ApiConstants.SUBNET,
+            type = CommandType.STRING,
+            description = "The CIDR of the Ipv4 subnet.")
+    private String subnet;
+
     @Parameter(name = ApiConstants.ZONE_ID,
             type = CommandType.UUID,
             entityType = ZoneResponse.class,
@@ -73,6 +78,10 @@ public Long getZoneId() {
         return zoneId;
     }
 
+    public String getSubnet() {
+        return subnet;
+    }
+
     @Override
     public void execute() {
         List<? extends Ipv4GuestSubnetNetworkMap> subnets = routedIpv4Manager.listIpv4GuestSubnetsForGuestNetwork(this);

engine/schema/src/main/java/org/apache/cloudstack/network/dao/Ipv4GuestSubnetNetworkMapDaoImpl.java

@@ -74,6 +74,7 @@ public void init() {
         networkSearchBuilder.and("domainId", networkSearchBuilder.entity().getDomainId(), SearchCriteria.Op.NEQ);
         networkSearchBuilder.and("accountId", networkSearchBuilder.entity().getAccountId(), SearchCriteria.Op.NEQ);
         DomainAccountNeqSearch = createSearchBuilder();
+        DomainAccountNeqSearch.and("parentId", DomainAccountNeqSearch.entity().getParentId(), SearchCriteria.Op.EQ);
         DomainAccountNeqSearch.join("network", networkSearchBuilder, networkSearchBuilder.entity().getId(),
                 DomainAccountNeqSearch.entity().getNetworkId(), JoinBuilder.JoinType.INNER);
         DomainAccountNeqSearch.done();
@@ -97,13 +98,15 @@ public List<Ipv4GuestSubnetNetworkMapVO> listUsedByParent(long parentId) {
     @Override
     public List<Ipv4GuestSubnetNetworkMapVO> listUsedByOtherDomains(long parentId, Long domainId) {
         SearchCriteria<Ipv4GuestSubnetNetworkMapVO> sc = DomainAccountNeqSearch.create();
+        sc.setParameters("parentId", parentId);
         sc.setJoinParameters("network", "domainId", domainId);
         return listBy(sc);
     }
 
     @Override
     public List<Ipv4GuestSubnetNetworkMapVO> listUsedByOtherAccounts(long parentId, Long accountId) {
         SearchCriteria<Ipv4GuestSubnetNetworkMapVO> sc = DomainAccountNeqSearch.create();
+        sc.setParameters("parentId", parentId);
         sc.setJoinParameters("network", "accountId", accountId);
         return listBy(sc);
     }

server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java

@@ -418,6 +418,8 @@ public List<? extends Ipv4GuestSubnetNetworkMap> listIpv4GuestSubnetsForGuestNet
         Long id = cmd.getId();
         Long zoneId = cmd.getZoneId();
         Long parentId = cmd.getParentId();
+        String subnet = cmd.getSubnet();
+        String keyword = cmd.getKeyword();
 
         SearchCriteria sc = ipv4GuestSubnetNetworkMapDao.createSearchCriteria();
         if (id != null) {
@@ -434,6 +436,12 @@ public List<? extends Ipv4GuestSubnetNetworkMap> listIpv4GuestSubnetsForGuestNet
         if (parentId != null) {
             sc.addAnd("parentId", SearchCriteria.Op.EQ, parentId);
         }
+        if (subnet != null) {
+            sc.addAnd("subnet", SearchCriteria.Op.EQ, subnet);
+        }
+        if (keyword != null) {
+            sc.addAnd("subnet", SearchCriteria.Op.LIKE, keyword);
+        }
         return ipv4GuestSubnetNetworkMapDao.search(sc, null);
     }