Merge pull request #90 from MissionCriticalCloud/fix/vpc-static-route…

…-listing Limit static route result to corresponding vpcId when a gwId is passed
MissionCriticalCloud · Oct 6, 2016 · 6f8d992 · 6f8d992
2 parents 65ce1b2 + 68a122c
commit 6f8d992
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/...ore/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java b/...ore/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListStaticRoutesCmd.java
@@ -1,5 +1,6 @@
 package org.apache.cloudstack.api.command.user.vpc;
 
+import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.network.vpc.StaticRoute;
 import com.cloud.network.vpc.VpcGateway;
 import com.cloud.utils.Pair;
@@ -62,13 +63,18 @@ public String getCidr() {
 
     @Override
     public void execute() {
+        // When we specify a gateway id, limit the search to the corresponding vpcId
+        if (vpcId == null) {
+            vpcId = retrieveVpcId();
+        }
+
         final Pair<List<? extends StaticRoute>, Integer> result = _vpcService.listStaticRoutes(this);
         final ListResponse<StaticRouteResponse> response = new ListResponse<>();
         final List<StaticRouteResponse> routeResponses = new ArrayList<>();
 
         // Compatibility with pre 5.1
         // If gatewayId was passed, lookup its CIDR and match static routes to it
-        final Optional<String> gatewayCidr = retrieveGateway();
+        final Optional<String> gatewayCidr = retrieveGatewayCidr();
 
         result.first().stream()
               .filter(route -> NetUtils.isIpWithtInCidrRange(route.getGwIpAddress(), gatewayCidr.get()))
@@ -90,12 +96,23 @@ public String getCommandName() {
         return s_name;
     }
 
-    private Optional<String> retrieveGateway() {
+    private Optional<String> retrieveGatewayCidr() {
         final Optional<String> gatewayCidr = Optional.of("0.0.0.0/0");
         if (gatewayId != null) {
             final VpcGateway gateway = _vpcService.getVpcPrivateGateway(gatewayId);
             gatewayCidr.of(NetUtils.ipAndNetMaskToCidr(gateway.getGateway(), gateway.getNetmask()));
         }
         return gatewayCidr;
     }
+
+    private Long retrieveVpcId() {
+        if (gatewayId != null) {
+            final VpcGateway gateway = _vpcService.getVpcPrivateGateway(gatewayId);
+            if (gateway == null) {
+                throw new InvalidParameterValueException("Private gateway with id " + gatewayId + " cannot be found");
+            }
+            return gateway.getVpcId();
+        }
+        return null;
+    }
 }