Revert zone guest cidr setting

Author: Sheng Yang

api/src/com/cloud/api/commands/CreateZoneCmd.java

@@ -47,6 +47,9 @@ public class CreateZoneCmd extends BaseCmd {
     @Parameter(name=ApiConstants.DNS2, type=CommandType.STRING, description="the second DNS for the Zone")
     private String dns2;
 
+    @Parameter(name=ApiConstants.GUEST_CIDR_ADDRESS, type=CommandType.STRING, description="the guest CIDR address for the Zone")
+    private String guestCidrAddress;
+
     @Parameter(name=ApiConstants.INTERNAL_DNS1, type=CommandType.STRING, required=true, description="the first internal DNS for the Zone")
     private String internalDns1;
 
@@ -84,6 +87,10 @@ public String getDns2() {
         return dns2;
     }
 
+    public String getGuestCidrAddress() {
+        return guestCidrAddress;
+    }
+
     public String getInternalDns1() {
         return internalDns1;
     }

api/src/com/cloud/api/commands/UpdateZoneCmd.java

@@ -50,6 +50,9 @@ public class UpdateZoneCmd extends BaseCmd {
     @Parameter(name=ApiConstants.DNS2, type=CommandType.STRING, description="the second DNS for the Zone")
     private String dns2;
 
+    @Parameter(name=ApiConstants.GUEST_CIDR_ADDRESS, type=CommandType.STRING, description="the guest CIDR address for the Zone")
+    private String guestCidrAddress;
+
     @IdentityMapper(entityTableName="data_center")
     @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="the ID of the Zone")
     private Long id;
@@ -93,6 +96,10 @@ public String getDns2() {
         return dns2;
     }
 
+    public String getGuestCidrAddress() {
+        return guestCidrAddress;
+    }
+
     public Long getId() {
         return id;
     }

api/src/com/cloud/api/response/ZoneResponse.java

@@ -50,6 +50,9 @@ public class ZoneResponse extends BaseResponse {
     @SerializedName(ApiConstants.VLAN) @Param(description="the vlan range of the zone")
     private String vlan;
 
+    @SerializedName(ApiConstants.GUEST_CIDR_ADDRESS) @Param(description="the guest CIDR address for the Zone")
+    private String guestCidrAddress;
+    
     //TODO - generate description
     @SerializedName("status")
     private String status;
@@ -116,6 +119,10 @@ public void setVlan(String vlan) {
         this.vlan = vlan;
     }
 
+    public void setGuestCidrAddress(String guestCidrAddress) {
+        this.guestCidrAddress = guestCidrAddress;
+    }
+
     public void setStatus(String status) {
         this.status = status;
     }

api/src/com/cloud/dc/DataCenter.java

@@ -41,6 +41,8 @@ public enum NetworkType {
 
     String getDns2();
 
+    String getGuestNetworkCidr();
+
     String getName();
 
     Long getDomainId();

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

@@ -861,6 +861,7 @@ public ZoneResponse createZoneResponse(DataCenter dataCenter, Boolean showCapaci
             zoneResponse.setInternalDns1(dataCenter.getInternalDns1());
             zoneResponse.setInternalDns2(dataCenter.getInternalDns2());
             // FIXME zoneResponse.setVlan(dataCenter.get.getVnet());
+            zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
         }
 
         if (showCapacities != null && showCapacities) {

server/src/com/cloud/configuration/ConfigurationManager.java

@@ -123,6 +123,7 @@ ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMa
      * @param dns2
      * @param internalDns1
      * @param internalDns2
+     * @param guestCidr
      * @param zoneType
      * @param allocationState
      * @param networkDomain
@@ -133,7 +134,7 @@ ServiceOfferingVO createServiceOffering(long userId, boolean isSystem, VirtualMa
      * @throws
      * @throws
      */
-    DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String domain, Long domainId, NetworkType zoneType, String allocationState,
+    DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, Long domainId, NetworkType zoneType, String allocationState,
             String networkDomain, boolean isSecurityGroupEnabled);
 
     /**

server/src/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -1360,6 +1360,7 @@ public DataCenter editZone(UpdateZoneCmd cmd) {
         String dns2 = cmd.getDns2();
         String internalDns1 = cmd.getInternalDns1();
         String internalDns2 = cmd.getInternalDns2();
+        String guestCidr = cmd.getGuestCidrAddress();
         List<String> dnsSearchOrder = cmd.getDnsSearchOrder();
         Boolean isPublic = cmd.isPublic();
         String allocationStateStr = cmd.getAllocationState();
@@ -1410,6 +1411,10 @@ public DataCenter editZone(UpdateZoneCmd cmd) {
             zoneName = zone.getName();
         }
 
+        if ((guestCidr != null) && !NetUtils.validateGuestCidr(guestCidr)) {
+            throw new InvalidParameterValueException("Please enter a valid guest cidr");
+        }
+
         // Make sure the zone exists
         if (!validZone(zoneId)) {
             throw new InvalidParameterValueException("A zone with ID: " + zoneId + " does not exist.");
@@ -1433,6 +1438,10 @@ public DataCenter editZone(UpdateZoneCmd cmd) {
             internalDns1 = zone.getInternalDns1();
         }
 
+        if (guestCidr == null) {
+            guestCidr = zone.getGuestNetworkCidr();
+        }
+
         // validate network domain
         if (networkDomain != null && !networkDomain.isEmpty()) {
             if (!NetUtils.verifyDomainName(networkDomain)) {
@@ -1459,6 +1468,7 @@ public DataCenter editZone(UpdateZoneCmd cmd) {
         zone.setDns2(dns2);
         zone.setInternalDns1(internalDns1);
         zone.setInternalDns2(internalDns2);
+        zone.setGuestNetworkCidr(guestCidr);
 
         if (networkDomain != null) {
             if (networkDomain.isEmpty()) {
@@ -1531,12 +1541,15 @@ public DataCenter editZone(UpdateZoneCmd cmd) {
 
     @Override
     @DB
-    public DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String domain, Long domainId,
+    public DataCenterVO createZone(long userId, String zoneName, String dns1, String dns2, String internalDns1, String internalDns2, String guestCidr, String domain, Long domainId,
             NetworkType zoneType, String allocationStateStr, String networkDomain, boolean isSecurityGroupEnabled) {
 
         // checking the following params outside checkzoneparams method as we do
         // not use these params for updatezone
         // hence the method below is generic to check for common params
+        if ((guestCidr != null) && !NetUtils.validateGuestCidr(guestCidr)) {
+            throw new InvalidParameterValueException("Please enter a valid guest cidr");
+        }
 
         // Validate network domain
         if (networkDomain != null) {
@@ -1555,7 +1568,7 @@ public DataCenterVO createZone(long userId, String zoneName, String dns1, String
         try {
             txn.start();
             // Create the new zone in the database
-            DataCenterVO zone = new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, domain, domainId, zoneType, zoneToken, networkDomain, isSecurityGroupEnabled);
+            DataCenterVO zone = new DataCenterVO(zoneName, null, dns1, dns2, internalDns1, internalDns2, guestCidr, domain, domainId, zoneType, zoneToken, networkDomain, isSecurityGroupEnabled);
             if (allocationStateStr != null && !allocationStateStr.isEmpty()) {
                 Grouping.AllocationState allocationState = Grouping.AllocationState.valueOf(allocationStateStr);
                 zone.setAllocationState(allocationState);
@@ -1625,6 +1638,7 @@ public DataCenter createZone(CreateZoneCmd cmd) {
         String dns2 = cmd.getDns2();
         String internalDns1 = cmd.getInternalDns1();
         String internalDns2 = cmd.getInternalDns2();
+        String guestCidr = cmd.getGuestCidrAddress();
         Long domainId = cmd.getDomainId();
         String type = cmd.getNetworkType();
         Boolean isBasic = false;
@@ -1644,6 +1658,14 @@ public DataCenter createZone(CreateZoneCmd cmd) {
 
         NetworkType zoneType = isBasic ? NetworkType.Basic : NetworkType.Advanced;
 
+        // Guest cidr is required for Advanced zone creation; error out when the
+        // parameter specified for Basic zone
+        if (zoneType == NetworkType.Advanced && guestCidr == null && !isSecurityGroupEnabled) {
+            throw new InvalidParameterValueException("guestCidrAddress parameter is required for Advanced zone creation");
+        } else if (zoneType == NetworkType.Basic && guestCidr != null) {
+            throw new InvalidParameterValueException("guestCidrAddress parameter is not supported for Basic zone");
+        }
+
         DomainVO domainVO = null;
 
         if (userId == null) {
@@ -1658,7 +1680,7 @@ public DataCenter createZone(CreateZoneCmd cmd) {
             isSecurityGroupEnabled = true;
         }
 
-        return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, domainVO != null ? domainVO.getName() : null, domainId, zoneType, allocationState, networkDomain,
+        return createZone(userId, zoneName, dns1, dns2, internalDns1, internalDns2, guestCidr, domainVO != null ? domainVO.getName() : null, domainId, zoneType, allocationState, networkDomain,
                 isSecurityGroupEnabled);
     }
 
@@ -2345,8 +2367,29 @@ public Vlan createVlanAndPublicIpRange(Long userId, Long zoneId, Long podId, Str
 
         String newVlanSubnet = NetUtils.getSubNet(vlanGateway, vlanNetmask);
 
-        // TODO: Check if the new VLAN's subnet conflicts with the guest network in
+        // Check if the new VLAN's subnet conflicts with the guest network in
         // the specified zone (guestCidr is null for basic zone)
+        String guestNetworkCidr = zone.getGuestNetworkCidr();
+        if (guestNetworkCidr != null) {
+            String[] cidrPair = guestNetworkCidr.split("\\/");
+            String guestIpNetwork = NetUtils.getIpRangeStartIpFromCidr(cidrPair[0], Long.parseLong(cidrPair[1]));
+            long guestCidrSize = Long.parseLong(cidrPair[1]);
+            long vlanCidrSize = NetUtils.getCidrSize(vlanNetmask);
+
+            long cidrSizeToUse = -1;
+            if (vlanCidrSize < guestCidrSize) {
+                cidrSizeToUse = vlanCidrSize;
+            } else {
+                cidrSizeToUse = guestCidrSize;
+            }
+
+            String guestSubnet = NetUtils.getCidrSubNet(guestIpNetwork, cidrSizeToUse);
+
+            if (newVlanSubnet.equals(guestSubnet)) {
+                throw new InvalidParameterValueException("The new IP range you have specified has the same subnet as the guest network in zone: " + zone.getName()
+                        + ". Please specify a different gateway/netmask.");
+            }
+        }
 
         // Check if there are any errors with the IP range
         checkPublicIpRangeErrors(zoneId, vlanId, vlanGateway, vlanNetmask, startIP, endIP);
@@ -2758,6 +2801,18 @@ public void checkPodCidrSubnets(long dcId, Long podIdToBeSkipped, String cidr) {
         newCidrPair.add(1, (long) getCidrSize(cidr));
         currentPodCidrSubnets.put(new Long(-1), newCidrPair);
 
+        DataCenterVO dcVo = _zoneDao.findById(dcId);
+        String guestNetworkCidr = dcVo.getGuestNetworkCidr();
+
+        // Guest cidr can be null for Basic zone
+        String guestIpNetwork = null;
+        Long guestCidrSize = null;
+        if (guestNetworkCidr != null) {
+            String[] cidrTuple = guestNetworkCidr.split("\\/");
+            guestIpNetwork = NetUtils.getIpRangeStartIpFromCidr(cidrTuple[0], Long.parseLong(cidrTuple[1]));
+            guestCidrSize = Long.parseLong(cidrTuple[1]);
+        }
+
         String zoneName = getZoneName(dcId);
 
         // Iterate through all pods in this zone
@@ -2774,10 +2829,27 @@ public void checkPodCidrSubnets(long dcId, Long podIdToBeSkipped, String cidr) {
             long cidrSize = ((Long) cidrPair.get(1)).longValue();
 
             long cidrSizeToUse = -1;
-            cidrSizeToUse = cidrSize;
+            if (guestCidrSize == null || cidrSize < guestCidrSize) {
+                cidrSizeToUse = cidrSize;
+            } else {
+                cidrSizeToUse = guestCidrSize;
+            }
 
             String cidrSubnet = NetUtils.getCidrSubNet(cidrAddress, cidrSizeToUse);
 
+            if (guestNetworkCidr != null) {
+                String guestSubnet = NetUtils.getCidrSubNet(guestIpNetwork, cidrSizeToUse);
+                // Check that cidrSubnet does not equal guestSubnet
+                if (cidrSubnet.equals(guestSubnet)) {
+                    if (podName.equals("newPod")) {
+                        throw new InvalidParameterValueException("The subnet of the pod you are adding conflicts with the subnet of the Guest IP Network. Please specify a different CIDR.");
+                    } else {
+                        throw new InvalidParameterValueException("Warning: The subnet of pod " + podName + " in zone " + zoneName
+                                + " conflicts with the subnet of the Guest IP Network. Please change either the pod's CIDR or the Guest IP Network's subnet, and re-run install-vmops-management.");
+                    }
+                }
+            }
+
             // Iterate through the rest of the pods
             for (Long otherPodId : currentPodCidrSubnets.keySet()) {
                 if (podId.equals(otherPodId)) {

server/src/com/cloud/dc/DataCenterVO.java

@@ -69,6 +69,9 @@ public class DataCenterVO implements DataCenter, Identity {
     @Column(name="router_mac_address", updatable = false, nullable=false)
     private String routerMacAddress = "02:00:00:00:00:01";
 
+    @Column(name="guest_network_cidr")
+    private String guestNetworkCidr = null;
+    
     @Column(name="domain_id")
     private Long domainId = null;
 
@@ -171,20 +174,21 @@ public void setFirewallProvider(String firewallProvider) {
         this.firewallProvider = firewallProvider;
     }
 
-    public DataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) {
-        this(name, description, dns1, dns2, dns3, dns4, domain, domainId, zoneType, zoneToken, domainSuffix, false);
+    public DataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4,String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) {
+        this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false);
         this.id = id;
         this.allocationState = Grouping.AllocationState.Enabled;
         this.uuid = UUID.randomUUID().toString();
 	}
 
-    public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled) {
+    public DataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled) {
         this.name = name;
         this.description = description;
         this.dns1 = dns1;
         this.dns2 = dns2;
         this.internalDns1 = dns3;
         this.internalDns2 = dns4;
+        this.guestNetworkCidr = guestCidr;
         this.domain = domain;
         this.domainId = domainId;
         this.networkType = zoneType;
@@ -230,6 +234,17 @@ public void setUserDataProvider(String userDataProvider) {
         this.userDataProvider = userDataProvider;
     }
 
+    @Override
+    public String getGuestNetworkCidr()
+    {
+    	return guestNetworkCidr;
+    }
+    
+    public void setGuestNetworkCidr(String guestNetworkCidr)
+    {
+    	this.guestNetworkCidr = guestNetworkCidr;
+    }
+
     @Override
     public Long getDomainId() {
 		return domainId;

server/src/com/cloud/network/NetworkManagerImpl.java

@@ -2491,11 +2491,14 @@ public Network createGuestNetwork(long networkOfferingId, String name, String di
         if (networks == null || networks.isEmpty()) {
             throw new CloudRuntimeException("Fail to create a network");
         } else {
-            if (networks.size() > 1) {
-                throw new InvalidParameterValueException("Cannot determine a guest network to deploy in, please specify one");
-            }
             if (networks.size() > 0 && networks.get(0).getGuestType() == Network.GuestType.Isolated && networks.get(0).getTrafficType() == TrafficType.Guest) {
-                network = networks.get(0);
+                Network defaultGuestNetwork = networks.get(0);
+                for (Network nw : networks) {
+                    if (nw.getCidr() != null && nw.getCidr().equals(zone.getGuestNetworkCidr())) {
+                        defaultGuestNetwork = nw;
+                    }
+                }
+                network = defaultGuestNetwork;
             } else {
                 // For shared network
                 network = networks.get(0);