commit b0bd61388db811d34ceddfbd4c583c6346326084
author Wu wenbin <wuwenbin2@huawei.com> Tue May 10 19:20:23 2016 +0800
committer Gerrit Code Review <gerrit@onlab.us> Tue May 10 11:52:25 2016 +0000
tree 74c4c844562dfc88ca8a491a119be72b5c42281f
parent bee5ecaa148f16721208da5438b93049d448823d

ONOS-4512 vtn-web can't delete router/net/floating/port

Change-Id: I6860aed0c719d4c8f62f21055e650f9f7b29a6f8

apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java

diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
index 56066ab..d4b269c 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/FloatingIpWebResource.java
@@ -151,8 +151,10 @@
         }
     }
 
-    @Path("{floatingIpUUID}")
     @DELETE
+    @Path("{floatingIpUUID}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
     public Response deleteSingleFloatingIp(@PathParam("floatingIpUUID") String id)
             throws IOException {
         try {

apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java

diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
index a4b3fa3..d7389b7 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/RouterWebResource.java
@@ -158,8 +158,10 @@
         }
     }
 
-    @Path("{routerUUID}")
     @DELETE
+    @Path("{routerUUID}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
     public Response deleteSingleRouter(@PathParam("routerUUID") String id)
             throws IOException {
         try {

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

diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
index 0de07cf..5d1ccad 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/SubnetWebResource.java
@@ -147,8 +147,10 @@
         }
     }
 
-    @Path("{subnetUUID}")
     @DELETE
+    @Path("{subnetUUID}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
     public Response deleteSingleSubnet(@PathParam("subnetUUID") String id)
             throws IOException {
         try {

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

diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
index 380e4ad..f32b131 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/TenantNetworkWebResource.java
@@ -240,6 +240,8 @@
 
     @DELETE
     @Path("{id}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
     public Response deleteNetworks(@PathParam("id") String id) {
         log.debug("Deletes network by identifier {}.", id);
         Set<TenantNetworkId> networkSet = new HashSet<>();

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

diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
index 9ac9f64..f99192c 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/VirtualPortWebResource.java
@@ -130,8 +130,10 @@
         }
     }
 
-    @Path("{portUUID}")
     @DELETE
+    @Path("{portUUID}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
     public Response deletePorts(@PathParam("portUUID") String id) {
         Set<VirtualPortId> vPortIds = new HashSet<>();
         try {