commit bac6283d1724f94d228d173bd40a5b50ff248b9d
author jiangrui <jiangrui1@huawei.com> Tue Aug 25 20:30:16 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Wed Aug 26 00:50:20 2015 +0000
tree 81f1419dd32554c99b57ab038a366be4f5100fcd
parent 743a8492b87cf27b7f0104096b3a4b7f6e0007bf

[ONOS-2718][ONOS-2722][ONOS-2723] Fix three bugs of vtnweb.

Change-Id: I4dc631c879e1a7239ce1538289cea51d903ddb50

apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java

diff --git a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
index 779777f..1d4a5f4 100644
--- a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
+++ b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
@@ -15,6 +15,7 @@
  */

 package org.onosproject.vtnweb.resources;

 

+import static com.google.common.base.Preconditions.checkArgument;

 import static com.google.common.base.Preconditions.checkNotNull;

 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;

 

@@ -225,6 +226,8 @@
      */

     public Iterable<Subnet> changeJsonToSub(JsonNode subnetNodes) {

         checkNotNull(subnetNodes, JSON_NOT_NULL);

+        checkArgument(!subnetNodes.get("enable_dhcp").isBoolean(), "enable_dhcp should be boolean");

+        checkArgument(!subnetNodes.get("shared").isBoolean(), "shared should be boolean");

         Map<SubnetId, Subnet> subMap = new HashMap<SubnetId, Subnet>();

         if (!subnetNodes.hasNonNull("id")) {

             return null;

@@ -245,7 +248,7 @@
             ipVersion = Version.INET;

             break;

         default:

-            ipVersion = null;

+            throw new IllegalArgumentException("ipVersion should be 4 or 6.");

         }

 

         IpPrefix cidr = IpPrefix.valueOf(subnetNodes.get("cidr").asText());

apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java

diff --git a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
index 092ea89..65e9589 100644
--- a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
+++ b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
@@ -16,6 +16,7 @@
 package org.onosproject.vtnweb.resources;

 

 import static com.google.common.base.Preconditions.checkNotNull;

+import static com.google.common.base.Preconditions.checkArgument;

 import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;

 import static javax.ws.rs.core.Response.Status.OK;

 

@@ -268,6 +269,9 @@
         ConcurrentMap<TenantNetworkId, TenantNetwork> networksMap = Maps

                 .newConcurrentMap();

         if (node != null) {

+            checkArgument(!node.get("admin_state_up").isBoolean(), "admin_state_up should be boolean");

+            checkArgument(!node.get("shared").isBoolean(), "shared should be boolean");

+            checkArgument(!node.get("router:external").isBoolean(), "router:external should be boolean");

             String name = node.get("name").asText();

             boolean adminStateUp = node.get("admin_state_up").asBoolean();

             String state = node.get("status").asText();

apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java

diff --git a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
index 1bcb291..64266a5 100644
--- a/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
+++ b/apps/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
@@ -94,7 +94,7 @@
     public Response getportsById(@PathParam("id") String id) {

 

         if (!get(VirtualPortService.class).exists(VirtualPortId.portId(id))) {

-            return ok("the virtualPort does not exists").build();

+            return ok("The virtualPort does not exists").build();

         }

         VirtualPort virtualPort = nullIsNotFound(get(VirtualPortService.class)

                 .getPort(VirtualPortId.portId(id)), VPORT_NOT_FOUND);