Added DELETE on cors.allowed.methods for a few missing nb bundles.

Also added toString() method to a few Neutron backend classes.

Change-Id: I484b785384c802bc47463567f5f0d7670eb044c3
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml b/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
index eb2b516d969cdcd3ccc95e0471c3ecea12930ff8..840887ecec60920372b9d343283e4fd852c68dd4 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/resources/WEB-INF/web.xml
@@ -27,7 +27,7 @@
         </init-param>
         <init-param>
             <param-name>cors.allowed.methods</param-name>
         </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>
         </init-param>
         <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
index f7f7982947467d11d13615c28f01638b32b8493c..9d7ba5d58a8535dec530c37e4e29c2c821031fec 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
+++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
@@ -240,5 +240,13 @@ public class NeutronNetwork {
         return ans;
     }
 
         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 + "]";
+    }

 }
 
 }
 

diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java
index b585554bf873734da16cc9f6b4871174b4f3645d..536fc3fd6e5ac1f2594cd8850afe8f9bd5538297 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java
+++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java
@@ -248,4 +248,12 @@ public class NeutronPort {
     public boolean isBoundToFloatingIP(String fixedIP) {
         return floatingIPMap.containsKey(fixedIP);
     }
     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 + "]";
+    }

 }
 }

diff --git a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
index e53c3d4b1a9ddee674c231bdf400f0beed22a162..1dbe253a5815ce75e4cea142ed2903a42cc31bdd 100644 (file)
--- a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
+++ b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
@@ -11,6 +11,7 @@ package org.opendaylight.controller.networkconfig.neutron;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 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;
 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;
     }
     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 + "]";
+    }

 }
 }

diff --git a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml
index f5c1ae5f9234afd435928bb9f2b8e0e1770af4d2..315403054df1ebfe7ff307f0b7a51c21dbee82b2 100644 (file)
--- a/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/flowprogrammer/src/main/resources/WEB-INF/web.xml
@@ -27,7 +27,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml
index d4ace8d89d8fb4fb0372e12ae5023702c0ed2835..2e9d9d0f684b36f7d2be3b28a7847877afc7c016 100644 (file)
--- a/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/hosttracker/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml
index 9f7c21a8b0cc9ef0a03e4645396df30089931cda..ef58aab0b581f095a9ec1d9232b968e0e8a3b478 100644 (file)
--- a/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/staticrouting/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml
index 179db608adffdfb043002cfba7b60a78867fe0cc..3fa41fee2b2e9290301ebd3a3bc3f70dc2f868d0 100644 (file)
--- a/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/statistics/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml
index cce0dfb259bc8f0d30f6e99f8b41fc9867735e77..2efd81c44e1c2c234e348b8ac6d4fd999eadb2d2 100644 (file)
--- a/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/switchmanager/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml b/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml
index 29f2049c2715f95b2fdc99ea287617f1d061ea7f..dac8cf622c245e028925234899bdaa76f1606889 100644 (file)
--- a/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/northbound/topology/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml
index ae2fce582ae34b9fc49c5a4c32381f1d83dfa25f..20529e90b4df3c06570852b4cff2bd81873882d8 100644 (file)
--- a/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/samples/northbound/loadbalancer/src/main/resources/WEB-INF/web.xml
@@ -26,7 +26,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>

diff --git a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml b/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
index 0c5cb3ac2719341726cb1235c2c714490feafdf5..89812af53df5447ef4426dd49ce312aff6f87a43 100644 (file)
--- a/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
+++ b/opendaylight/web/root/src/main/resources/WEB-INF/web.xml
@@ -15,7 +15,7 @@
           </init-param>
           <init-param>
             <param-name>cors.allowed.methods</param-name>
           </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>
           </init-param>
           <init-param>
             <param-name>cors.allowed.headers</param-name>