Added DELETE on cors.allowed.methods for a few missing nb bundles. 56/3356/1
authorMadhu Venugopal <mavenugo@gmail.com>
Mon, 2 Dec 2013 17:36:13 +0000 (09:36 -0800)
committerMadhu Venugopal <mavenugo@gmail.com>
Mon, 2 Dec 2013 17:36:13 +0000 (09:36 -0800)
Also added toString() method to a few Neutron backend classes.

Change-Id: I484b785384c802bc47463567f5f0d7670eb044c3
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
12 files changed:
opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java
opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml
opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml
opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml
opendaylight/web/root/src/main/resources/WEB-INF/web.xml

index eb2b516..840887e 100644 (file)
@@ -27,7 +27,7 @@
         </init-param>
         <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
         </init-param>
         <init-param>
             <param-name>cors.allowed.headers</param-name>
index f7f7982..9d7ba5d 100644 (file)
@@ -240,5 +240,13 @@ public class NeutronNetwork {
         return ans;
     }
 
+    @Override
+    public String toString() {
+        return "NeutronNetwork [networkUUID=" + networkUUID + ", networkName=" + networkName + ", adminStateUp="
+                + adminStateUp + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
+                + ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork="
+                + providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + ", status=" + status
+                + ", subnets=" + subnets + ", myPorts=" + myPorts + "]";
+    }
 }
 
index b585554..536fc3f 100644 (file)
@@ -248,4 +248,12 @@ public class NeutronPort {
     public boolean isBoundToFloatingIP(String fixedIP) {
         return floatingIPMap.containsKey(fixedIP);
     }
+
+    @Override
+    public String toString() {
+        return "NeutronPort [portUUID=" + portUUID + ", networkUUID=" + networkUUID + ", name=" + name
+                + ", adminStateUp=" + adminStateUp + ", status=" + status + ", macAddress=" + macAddress
+                + ", fixedIPs=" + fixedIPs + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID="
+                + tenantID + ", floatingIPMap=" + floatingIPMap + "]";
+    }
 }
index e53c3d4..1dbe253 100644 (file)
@@ -11,6 +11,7 @@ package org.opendaylight.controller.networkconfig.neutron;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
@@ -428,4 +429,13 @@ public class NeutronSubnet {
     public void resetGatewayIPAllocated() {
         gatewayIPAssigned = false;
     }
+
+    @Override
+    public String toString() {
+        return "NeutronSubnet [subnetUUID=" + subnetUUID + ", networkUUID=" + networkUUID + ", name=" + name
+                + ", ipVersion=" + ipVersion + ", cidr=" + cidr + ", gatewayIP=" + gatewayIP + ", dnsNameservers="
+                + dnsNameservers + ", allocationPools=" + allocationPools + ", hostRoutes=" + hostRoutes
+                + ", enableDHCP=" + enableDHCP + ", tenantID=" + tenantID + ", myPorts=" + myPorts
+                + ", gatewayIPAssigned=" + gatewayIPAssigned + "]";
+    }
 }
index f5c1ae5..3154030 100644 (file)
@@ -27,7 +27,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index d4ace8d..2e9d9d0 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index 9f7c21a..ef58aab 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index 179db60..3fa41fe 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index cce0dfb..2efd81c 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index 29f2049..dac8cf6 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index ae2fce5..20529e9 100644 (file)
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>
index 0c5cb3a..89812af 100644 (file)
@@ -15,7 +15,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
-            <param-value>GET,POST,HEAD,OPTIONS,PUT</param-value>
+            <param-value>GET,POST,HEAD,OPTIONS,PUT,DELETE</param-value>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>