[Microservice API] VPC Mgr and Subnet Mgr Issue Fix

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/config/ConstantsConfig.java

@@ -0,0 +1,24 @@
+/*
+Copyright 2019 The Alcor Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+*/
+package com.futurewei.alcor.subnet.config;
+
+public class ConstantsConfig {
+
+    public static int HighIpInterval = 1;
+    public static int LowIpInterval = 3;
+    public static int BaseInterval = 0;
+
+}

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/config/UnitTestConfig.java

@@ -5,6 +5,7 @@ public class UnitTestConfig {
     public static String projectId = "3dda2801-d675-4688-a63f-dcda8d327f50";
     public static String vpcId = "9192a4d4-ffff-4ece-b3f0-8d36e3d88038";
     public static String subnetId = "9192a4d4-ffff-4ece-b3f0-8d36e3d88000";
+    public static String gatewayIp = "10.0.0.10";
     public static String name = "test_subnet";
     public static String updateName = "update_subnet";
     public static String cidr = "10.0.0.0/16";

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java

@@ -22,6 +22,7 @@
 import com.futurewei.alcor.common.utils.CommonUtil;
 import com.futurewei.alcor.common.utils.ControllerUtil;
 import com.futurewei.alcor.common.utils.DateUtil;
+import com.futurewei.alcor.subnet.exception.GatewayIpUnsupported;
 import com.futurewei.alcor.subnet.service.SubnetDatabaseService;
 import com.futurewei.alcor.subnet.service.SubnetService;
 import com.futurewei.alcor.subnet.utils.RestPreconditionsUtil;
@@ -50,7 +51,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 import static org.springframework.web.bind.annotation.RequestMethod.*;
 
@@ -139,6 +139,13 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB
             String subnetId = inSubnetEntity.getId();
             String vpcId = inSubnetEntity.getVpcId();
             String cidr = inSubnetEntity.getCidr();
+            String gatewayIp = inSubnetEntity.getGatewayIp();
+            boolean gatewayIpIsValid = SubnetManagementUtil.checkGatewayIpInputSupported(gatewayIp, cidr);
+            if (!gatewayIpIsValid) {
+                throw new GatewayIpUnsupported();
+            }
+            boolean gatewayIpIsInAllocatedRange = SubnetManagementUtil.checkGatewayIpIsInAllocatedRange(gatewayIp, cidr);
+
             RestPreconditionsUtil.verifyResourceFound(vpcId);
             RestPreconditionsUtil.populateResourceProjectId(inSubnetEntity, projectId);
 
@@ -183,11 +190,10 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB
                 return s;
             });
 
-
             // Verify/Allocate Gateway IP
             CompletableFuture<IpAddrRequest> ipFuture = CompletableFuture.supplyAsync(() -> {
                 try {
-                    return this.subnetService.allocateIpAddressForGatewayPort(subnetId, cidr, vpcId);
+                    return this.subnetService.allocateIpAddressForGatewayPort(subnetId, cidr, vpcId, gatewayIp, gatewayIpIsInAllocatedRange);
                 } catch (Exception e) {
                     throw new CompletionException(e);
                 }
@@ -218,10 +224,17 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB
             if (macState != null) {
                 inSubnetEntity.setGatewayMacAddress(macState.getMacAddress());
             }
-            inSubnetEntity.setGatewayIp(ipResponse.getIp());
-            if (ipResponse.getIpVersion() == 4) {
+            if (gatewayIpIsInAllocatedRange) {
+                inSubnetEntity.setGatewayIp(ipResponse.getIp());
+            } else {
+                String gatewayIP = SubnetManagementUtil.setGatewayIpValue(gatewayIp, cidr);
+                if (gatewayIp != null) {
+                    inSubnetEntity.setGatewayIp(gatewayIP);
+                }
+            }
+            if (ipResponse != null && ipResponse.getIpVersion() == 4) {
                 inSubnetEntity.setIpV4RangeId(ipResponse.getRangeId());
-            }else if (ipResponse.getIpVersion() == 6) {
+            }else if (ipResponse != null &&  ipResponse.getIpVersion() == 6) {
                 inSubnetEntity.setIpV6RangeId(ipResponse.getRangeId());
             }
 
@@ -239,6 +252,22 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB
                 inSubnetEntity.setTenantId(inSubnetEntity.getProjectId());
             }
 
+            // enable_dhcp
+            Boolean dhcpEnable = inSubnetEntity.getDhcpEnable();
+            if (dhcpEnable == null) {
+                inSubnetEntity.setDhcpEnable(true);
+            }
+
+            // allocation_pools
+            List<AllocationPool> allocationPoolList = inSubnetEntity.getAllocationPools();
+            if (allocationPoolList == null || allocationPoolList.size() == 0) {
+                String[] ips = this.subnetService.cidrToFirstIpAndLastIp(cidr);
+                List<AllocationPool> allocationPools = new ArrayList<>();
+                AllocationPool allocationPool = new AllocationPool(ips[0], ips[1]);
+                allocationPools.add(allocationPool);
+                inSubnetEntity.setAllocationPools(allocationPools);
+            }
+
             // tags
 ////            List<String> tags = inSubnetWebResponseObject.getTags();
 ////            if (tags == null) {
@@ -259,6 +288,9 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB
 //                throw new ResourcePersistenceException();
 //            }
 
+            // update to vpc with subnet id
+            this.subnetService.addSubnetIdToVpc(subnetId, projectId, vpcId);
+
             return new SubnetWebJson(inSubnetEntity);
 
         } catch (CompletionException e) {

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/exception/GatewayIpUnsupported.java

@@ -0,0 +1,23 @@
+/*
+Copyright 2019 The Alcor Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+*/
+package com.futurewei.alcor.subnet.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code= HttpStatus.INTERNAL_SERVER_ERROR, reason="GatewayIp is unsupported")
+public class GatewayIpUnsupported extends Exception {
+}

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/exception/SubnetIdIsNull.java

@@ -0,0 +1,23 @@
+/*
+Copyright 2019 The Alcor Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+        you may not use this file except in compliance with the License.
+        You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+*/
+package com.futurewei.alcor.subnet.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code= HttpStatus.INTERNAL_SERVER_ERROR, reason="Subnet id is null")
+public class SubnetIdIsNull extends Exception {
+}

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/service/SubnetService.java

@@ -41,12 +41,15 @@ public void fallbackOperation (AtomicReference<RouteWebJson> routeResponseAtomic
     public MacStateJson allocateMacAddressForGatewayPort(String projectId, String vpcId, String portId) throws Exception;
 
     // Verify/Allocate Gateway IP
-    public IpAddrRequest allocateIpAddressForGatewayPort(String subnetId, String cidr, String vpcId) throws Exception;
+    public IpAddrRequest allocateIpAddressForGatewayPort(String subnetId, String cidr, String vpcId, String gatewayIp, boolean isOpenToBeAllocated) throws Exception;
 
     // Transfer cidr to first IP and last IP
     public String[] cidrToFirstIpAndLastIp (String cidr);
 
     // Verify cidr block
     public boolean verifyCidrBlock (String cidr) throws ParameterUnexpectedValueException, FallbackException;
 
+    // update to vpc with subnet id
+    public void addSubnetIdToVpc (String subnetId, String projectId, String vpcId) throws Exception;
+
 }

services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/service/implement/SubnetServiceImp.java

@@ -5,7 +5,9 @@
 import com.futurewei.alcor.common.entity.ResponseId;
 import com.futurewei.alcor.common.exception.FallbackException;
 import com.futurewei.alcor.common.utils.ControllerUtil;
+import com.futurewei.alcor.subnet.config.ConstantsConfig;
 import com.futurewei.alcor.subnet.config.IpVersionConfig;
+import com.futurewei.alcor.subnet.exception.SubnetIdIsNull;
 import com.futurewei.alcor.subnet.service.SubnetDatabaseService;
 import com.futurewei.alcor.subnet.service.SubnetService;
 import com.futurewei.alcor.web.entity.route.RouteEntity;
@@ -159,7 +161,7 @@ public MacStateJson allocateMacAddressForGatewayPort(String projectId, String vp
     }
 
     @Override
-    public IpAddrRequest allocateIpAddressForGatewayPort(String subnetId, String cidr, String vpcId) throws FallbackException {
+    public IpAddrRequest allocateIpAddressForGatewayPort(String subnetId, String cidr, String vpcId, String gatewayIp, boolean isOpenToBeAllocated) throws FallbackException {
         String ipManagerServiceUrl = ipUrl;
         String ipManagerCreateRangeUrl = ipUrl + "range";
         String ipAddressRangeId = UUID.randomUUID().toString();
@@ -200,10 +202,18 @@ public IpAddrRequest allocateIpAddressForGatewayPort(String subnetId, String cid
             throw new FallbackException("fallback request");
         }
 
+        if (!isOpenToBeAllocated) {
+            IpAddrRequest ipAddrRequest = new IpAddrRequest();
+            ipAddrRequest.setIpVersion(ipRangeResponse.getIpVersion());
+            ipAddrRequest.setRangeId(ipRangeResponse.getId());
+            return ipAddrRequest;
+        }
+
         // Allocate Ip Address
         IpAddrRequest ipAddrRequest = new IpAddrRequest();
         ipAddrRequest.setRangeId(ipRangeResponse.getId());
         ipAddrRequest.setIpVersion(ipRangeResponse.getIpVersion());
+        ipAddrRequest.setIp(gatewayIp);
         ipAddrRequest.setVpcId(vpcId);
         ipAddrRequest.setSubnetId(subnetId);
 
@@ -238,6 +248,16 @@ public String[] cidrToFirstIpAndLastIp(String cidr) {
         if (highIp == null || lowIp == null) {
             return null;
         }
+
+        String[] highIps = highIp.split("\\.");
+        String[] lowIps = lowIp.split("\\.");
+        Integer high = Integer.parseInt(highIps[highIps.length - 1]) - ConstantsConfig.HighIpInterval;
+        Integer low = Integer.parseInt(lowIps[lowIps.length - 1]) + ConstantsConfig.LowIpInterval;
+        highIps[highIps.length - 1] = String.valueOf(high);
+        lowIps[lowIps.length - 1] = String.valueOf(low);
+        highIp = String.join(".", highIps);
+        lowIp = String.join(".", lowIps);
+
         String[] res = new String[2];
         res[0] = lowIp;
         res[1] = highIp;
@@ -282,4 +302,15 @@ public boolean verifyCidrBlock(String cidr) throws FallbackException {
 
     }
 
+    @Override
+    public void addSubnetIdToVpc(String subnetId, String projectId, String vpcId) throws Exception {
+        if (subnetId == null) {
+            throw new SubnetIdIsNull();
+        }
+
+        String vpcManagerServiceUrl = vpcUrl + projectId + "/vpcs/" + vpcId + "/subnets/" + subnetId;
+        restTemplate.put(vpcManagerServiceUrl, VpcWebJson.class);
+
+    }
+
 }