From: Madhu Venugopal Date: Mon, 2 Dec 2013 17:36:13 +0000 (-0800) Subject: Added DELETE on cors.allowed.methods for a few missing nb bundles. X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~278^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3a732170ba0a46ae7ca3b8bec8ba14858913920f;hp=-c 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 --- 3a732170ba0a46ae7ca3b8bec8ba14858913920f 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 eb2b516d96..840887ecec 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 f7f7982947..9d7ba5d58a 100644 --- 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; } + @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 b585554bf8..536fc3fd6e 100644 --- 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); } + + @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 e53c3d4b1a..1dbe253a58 100644 --- 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 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 + "]"; + } } 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 f5c1ae5f92..315403054d 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 d4ace8d89d..2e9d9d0f68 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 9f7c21a8b0..ef58aab0b5 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 179db608ad..3fa41fee2b 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 cce0dfb259..2efd81c44e 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 29f2049c27..dac8cf622c 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 ae2fce582a..20529e90b4 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers 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 0c5cb3ac27..89812af53d 100644 --- 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 @@ cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT + GET,POST,HEAD,OPTIONS,PUT,DELETE cors.allowed.headers