diff --git a/kubernetes/services/ignite_ip_config.xml b/kubernetes/services/ignite_ip_config.xml index 6e66078cd..7d8ea3230 100644 --- a/kubernetes/services/ignite_ip_config.xml +++ b/kubernetes/services/ignite_ip_config.xml @@ -38,9 +38,42 @@ Copyright(c) 2020 Futurewei Cloud + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java b/services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java index a7e3aa1d8..8e932ad79 100644 --- a/services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java +++ b/services/subnet_manager/src/main/java/com/futurewei/alcor/subnet/controller/SubnetController.java @@ -243,8 +243,12 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB // Synchronous blocking CompletableFuture allFuture = CompletableFuture.allOf(vpcFuture, ipFuture); allFuture.join(); + VpcWebJson vpcResponse = vpcFuture.join(); + String ipRangeId = ipFuture.join(); - logger.info("Total processing time:" + (System.currentTimeMillis() - start) + "ms"); + logger.info("[createSubnetState] Verified VPC id:" + vpcResponse.toString()); + logger.info("[createSubnetState] Allocated ip range:" + ipRangeId); + logger.info("[createSubnetState] Time to verify VPC id and allocate ip range:" + (System.currentTimeMillis() - start) + "ms"); this.subnetDatabaseService.addSubnet(inSubnetEntity); @@ -270,10 +274,10 @@ public SubnetWebJson createSubnetState(@PathVariable String projectId, @RequestB } if (Ipv4AddrUtil.formatCheck(gatewayIp)) { - inSubnetEntity.setIpV4RangeId(ipFuture.join()); + inSubnetEntity.setIpV4RangeId(ipRangeId); inSubnetEntity.setIpVersion(4); } else { - inSubnetEntity.setIpV6RangeId(ipFuture.join()); + inSubnetEntity.setIpV6RangeId(ipRangeId); inSubnetEntity.setIpVersion(6); }