From 326cc64c2f5a43e6a3de3e4580851eb7ed0784bf Mon Sep 17 00:00:00 2001 From: Michael Vorburger Date: Fri, 13 Apr 2018 22:08:31 +0200 Subject: [PATCH] remove irrelevant old JavaDoc from a long bygone era in northbound.api and some other minor clean up like: * make all Logger constants private * move constants to beginning of class * remove wrong empty lines, add required empty lines * made some package local fields private * remove clearly un-used fields Change-Id: I0b087aae2dc35470e1d006675aa6f9c080d3de3f Signed-off-by: Michael Vorburger --- .../api/NeutronBgpvpnsNorthbound.java | 25 ++--------------- .../api/NeutronFirewallNorthbound.java | 21 +------------- .../api/NeutronFirewallPolicyNorthbound.java | 21 ++------------ .../api/NeutronFirewallRulesNorthbound.java | 21 ++------------ .../api/NeutronFloatingIpsNorthbound.java | 24 ++-------------- .../NeutronL2gatewayConnectionNorthbound.java | 22 ++------------- .../api/NeutronL2gatewayNorthbound.java | 20 ++----------- ...onLoadBalancerHealthMonitorNorthbound.java | 21 ++------------ ...NeutronLoadBalancerListenerNorthbound.java | 21 +------------- .../api/NeutronLoadBalancerNorthbound.java | 22 --------------- .../NeutronLoadBalancerPoolNorthbound.java | 28 ++----------------- .../NeutronMeteringLabelRulesNorthbound.java | 20 +------------ .../api/NeutronMeteringLabelsNorthbound.java | 22 ++------------- .../api/NeutronNetworksNorthbound.java | 25 ++--------------- .../api/NeutronPortsNorthbound.java | 23 +-------------- .../api/NeutronQosPolicyNorthbound.java | 1 - .../api/NeutronRoutersNorthbound.java | 27 ++---------------- .../NeutronSFCFlowClassifiersNorthbound.java | 23 ++------------- .../api/NeutronSFCPortChainsNorthbound.java | 22 ++------------- .../NeutronSFCPortPairGroupsNorthbound.java | 23 ++------------- .../api/NeutronSFCPortPairsNorthbound.java | 20 +------------ .../api/NeutronSecurityGroupRequest.java | 2 +- .../api/NeutronSecurityGroupsNorthbound.java | 23 ++------------- .../api/NeutronSecurityRuleRequest.java | 2 +- .../api/NeutronSecurityRulesNorthbound.java | 21 +------------- .../api/NeutronSubnetsNorthbound.java | 22 +-------------- .../api/NeutronTapFlowNorthbound.java | 1 - .../api/NeutronTapServiceNorthbound.java | 1 - .../api/NeutronTrunksNorthbound.java | 1 - .../api/NeutronVpnIkePoliciesNorthbound.java | 22 ++------------- .../NeutronVpnIpSecPoliciesNorthbound.java | 21 +------------- ...tronVpnIpSecSiteConnectionsNorthbound.java | 19 ------------- .../api/NeutronVpnServicesNorthbound.java | 21 +------------- 33 files changed, 48 insertions(+), 560 deletions(-) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java index 8c7fd10a3..7c067f46a 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronBgpvpnsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -32,32 +31,17 @@ import org.opendaylight.neutron.spi.INeutronBgpvpnCRUD; import org.opendaylight.neutron.spi.NeutronBgpvpn; /** - * Neutron Northbound REST APIs for Bgpvpn.
- * This class provides REST APIs for managing neutron Bgpvpns - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for Bgpvpn. */ - @Path("/bgpvpns") public final class NeutronBgpvpnsNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Bgpvpn"; + @Context UriInfo uriInfo; - private static final String RESOURCE_NAME = "Bgpvpn"; - @Override protected String getResourceName() { return RESOURCE_NAME; @@ -66,7 +50,6 @@ public final class NeutronBgpvpnsNorthbound /** * Returns a list of all Bgpvpns. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackBgpvpns.class) @@ -126,7 +109,6 @@ public final class NeutronBgpvpnsNorthbound /** * Returns a specific Bgpvpn. */ - @Path("{bgpvpnUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -181,7 +163,6 @@ public final class NeutronBgpvpnsNorthbound /** * Deletes a Bgpvpn. */ - @Path("{bgpvpnUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java index 130bba8d2..2a5fe93b4 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,21 +27,7 @@ import org.opendaylight.neutron.spi.INeutronFirewallCRUD; import org.opendaylight.neutron.spi.NeutronFirewall; /** - * Neutron Northbound REST APIs for Firewall.
- * This class provides REST APIs for managing neutron Firewall - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for Firewall. */ @Path("/fw/firewalls") public final class NeutronFirewallNorthbound @@ -105,7 +90,6 @@ public final class NeutronFirewallNorthbound /** * Returns a specific Firewall. */ - @Path("{firewallUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -123,7 +107,6 @@ public final class NeutronFirewallNorthbound /** * Creates new Firewall. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -136,7 +119,6 @@ public final class NeutronFirewallNorthbound /** * Updates a Firewall. */ - @Path("{firewallUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -151,7 +133,6 @@ public final class NeutronFirewallNorthbound /** * Deletes a Firewall. */ - @Path("{firewallUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java index ecf131c2d..b0aa703af 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,21 +27,7 @@ import org.opendaylight.neutron.spi.INeutronFirewallPolicyCRUD; import org.opendaylight.neutron.spi.NeutronFirewallPolicy; /** - * Neutron Northbound REST APIs for Firewall Policies.
- * This class provides REST APIs for managing neutron Firewall Policies - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for Firewall Policies. */ @Path("/fw/firewall_policies") public final class NeutronFirewallPolicyNorthbound extends @@ -104,7 +89,6 @@ public final class NeutronFirewallPolicyNorthbound extends /** * Returns a specific Firewall Policy. */ - @Path("{firewallPolicyUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -121,7 +105,7 @@ public final class NeutronFirewallPolicyNorthbound extends /** * Creates new Firewall Policy. - * */ + */ @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -150,7 +134,6 @@ public final class NeutronFirewallPolicyNorthbound extends /** * Deletes a Firewall Policy. */ - @Path("{firewallPolicyUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java index 4627e47f1..75e1dcbbf 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,25 +27,12 @@ import org.opendaylight.neutron.spi.INeutronFirewallRuleCRUD; import org.opendaylight.neutron.spi.NeutronFirewallRule; /** - * Neutron Northbound REST APIs for Firewall Rule.
- * This class provides REST APIs for managing neutron Firewall Rule - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for Firewall Rule. */ - @Path("fw/firewall_rules") public final class NeutronFirewallRulesNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Firewall Rule"; @Override @@ -133,7 +119,6 @@ public final class NeutronFirewallRulesNorthbound /** * Returns a specific Firewall Rule. */ - @Path("{firewallRuleUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -151,7 +136,6 @@ public final class NeutronFirewallRulesNorthbound /** * Creates new Firewall Rule. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -179,7 +163,6 @@ public final class NeutronFirewallRulesNorthbound /** * Deletes a Firewall Rule. */ - @Path("{firewallRuleUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpsNorthbound.java index 1e686f13a..e47035440 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFloatingIpsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,26 +27,12 @@ import org.opendaylight.neutron.spi.INeutronFloatingIpCRUD; import org.opendaylight.neutron.spi.NeutronFloatingIp; /** - * Neutron Northbound REST APIs.
- * This class provides REST APIs for managing Neutron Floating IPs - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for managing Neutron Floating IPs. */ - @Path("/floatingips") public final class NeutronFloatingIpsNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Floating IP"; @Override @@ -58,7 +43,6 @@ public final class NeutronFloatingIpsNorthbound /** * Returns a list of all FloatingIps. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -112,7 +96,6 @@ public final class NeutronFloatingIpsNorthbound /** * Returns a specific FloatingIp. */ - @Path("{floatingipUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -130,7 +113,6 @@ public final class NeutronFloatingIpsNorthbound /** * Creates new FloatingIps. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -143,7 +125,6 @@ public final class NeutronFloatingIpsNorthbound /** * Updates a FloatingIp. */ - @Path("{floatingipUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -159,7 +140,6 @@ public final class NeutronFloatingIpsNorthbound /** * Deletes a FloatingIp. */ - @Path("{floatingipUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionNorthbound.java index 802e1d71e..d035a29ec 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayConnectionNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,27 +28,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Neutron Northbound REST APIs for L2 gateway Connection.
- * This class provides REST APIs for managing L2 gateway Connection - * * * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for L2 gateway Connection. */ - @Path("/l2gateway-connections") public final class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronNorthbound { - static final Logger LOG = LoggerFactory.getLogger(NeutronL2gatewayConnectionNorthbound.class); + private static final Logger LOG = LoggerFactory.getLogger(NeutronL2gatewayConnectionNorthbound.class); private static final String RESOURCE_NAME = "L2gatewayConnection"; @@ -82,7 +67,6 @@ public final class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronN /** * Returns a list of all L2gateway Connections. - * */ @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -112,7 +96,7 @@ public final class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronN && (queryConnectionID == null || queryConnectionID.equals(connection.getID())) && (queryL2gatewayID == null || queryL2gatewayID.equals(connection.getL2gatewayID())) && (queryNetworkID == null || queryNetworkID.equals(connection.getNetworkID())) - && (querySegmentID == null || (Integer.valueOf(querySegmentID).equals(connection.getSegmentID()))) + && (querySegmentID == null || Integer.valueOf(querySegmentID).equals(connection.getSegmentID())) && (queryPortID == null || queryPortID.equals(connection.getPortID()))) { if (fields.size() > 0) { ans.add(connection.extractFields(fields)); diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java index acd14eee6..216ca2109 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronL2gatewayNorthbound.java @@ -29,26 +29,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * Neutron Northbound REST APIs for L2 gateway.
- * This class provides REST APIs for managing L2 gateway - * * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for L2 gateway. */ - @Path("/l2-gateways") public final class NeutronL2gatewayNorthbound extends AbstractNeutronNorthbound { - static final Logger LOG = LoggerFactory.getLogger(NeutronL2gatewayNorthbound.class); + + private static final Logger LOG = LoggerFactory.getLogger(NeutronL2gatewayNorthbound.class); private static final String RESOURCE_NAME = "L2gateway"; @@ -73,7 +60,6 @@ public final class NeutronL2gatewayNorthbound @ResponseCode(code = HttpURLConnection.HTTP_CONFLICT, condition = "Conflict"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) - public Response createL2gateway(final NeutronL2gatewayRequest input) { LOG.debug("CreateL2gateway NeutronL2gatewayRequest"); return create(input); diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java index 0098dbbf8..1dc12f67a 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,20 +27,7 @@ import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; /** - * Neutron Northbound REST APIs for Load Balancer HealthMonitor.
- * This class provides REST APIs for managing neutron LoadBalancerHealthMonitor - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for Load Balancer HealthMonitor. * */ @Path("/lbaas/healthmonitors") @@ -65,7 +51,6 @@ public final class NeutronLoadBalancerHealthMonitorNorthbound @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) - public Response listGroups( // return fields @QueryParam("fields") List fields, @@ -127,7 +112,6 @@ public final class NeutronLoadBalancerHealthMonitorNorthbound /** * Returns a specific LoadBalancerHealthMonitor. */ - @Path("{loadBalancerHealthMonitorID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -146,7 +130,6 @@ public final class NeutronLoadBalancerHealthMonitorNorthbound /** * Creates new LoadBalancerHealthMonitor. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -174,7 +157,7 @@ public final class NeutronLoadBalancerHealthMonitorNorthbound /** * Deletes a LoadBalancerHealthMonitor. - * */ + */ @Path("{loadBalancerHealthMonitorID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java index 5f2f869aa..6c937d757 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,21 +27,7 @@ import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD; import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; /** - * Neutron Northbound REST APIs for LoadBalancerListener Policies.
- * This class provides REST APIs for managing neutron LoadBalancerListener Policies - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for LoadBalancerListener Policies. */ @Path("/lbaas/listeners") public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutronNorthbound fields, @@ -112,7 +96,6 @@ public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutron /** * Returns a specific LoadBalancerListener. */ - @Path("{loadBalancerListenerID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -130,7 +113,6 @@ public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutron /** * Creates new LoadBalancerListener. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -158,7 +140,6 @@ public final class NeutronLoadBalancerListenerNorthbound extends AbstractNeutron /** * Deletes a LoadBalancerListener. */ - @Path("{loadBalancerListenerID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java index 6b35ed82e..eb730649e 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,20 +28,6 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancer; /** * Neutron Northbound REST APIs for LoadBalancers.
- * This class provides REST APIs for managing neutron LoadBalancers - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * */ @Path("/lbaas/loadbalancers") public final class NeutronLoadBalancerNorthbound @@ -64,7 +49,6 @@ public final class NeutronLoadBalancerNorthbound @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) - public Response listGroups( // return fields @QueryParam("fields") List fields, @@ -105,11 +89,9 @@ public final class NeutronLoadBalancerNorthbound /** * Returns a specific LoadBalancer. */ - @Path("{loadBalancerID}") @GET @Produces({ MediaType.APPLICATION_JSON }) - @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_FOUND, condition = "Not Found"), @@ -124,11 +106,9 @@ public final class NeutronLoadBalancerNorthbound /** * Creates new LoadBalancer. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_CREATED, condition = "Created"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) public Response createLoadBalancers(final NeutronLoadBalancerRequest input) { @@ -142,7 +122,6 @@ public final class NeutronLoadBalancerNorthbound @PUT @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) - @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_FOUND, condition = "Not Found"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) @@ -154,7 +133,6 @@ public final class NeutronLoadBalancerNorthbound /** * Deletes a LoadBalancer. */ - @Path("{loadBalancerID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java index 7f6f1d900..ba9bf0773 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,28 +28,11 @@ import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; /** - * Neutron Northbound REST APIs for LoadBalancerPool Policies.
- * This class provides REST APIs for managing neutron LoadBalancerPool Policies - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for LoadBalancerPool Policies. * - */ - -/** - * For now, the LB pool member data is maintained with the INeutronLoadBalancerPoolCRUD, + *

For now, the LB pool member data is maintained with the INeutronLoadBalancerPoolCRUD, * and not duplicated within the INeutronLoadBalancerPoolMemberCRUD's cache. */ - @Path("/lbaas/pools") public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNorthbound { @@ -71,7 +53,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) - public Response listGroups( // return fields @QueryParam("fields") List fields, @@ -120,7 +101,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort /** * Returns a specific LoadBalancerPool. */ - @Path("{loadBalancerPoolID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -138,7 +118,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort /** * Creates new LoadBalancerPool. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -166,7 +145,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort /** * Deletes a LoadBalancerPool. */ - @Path("{loadBalancerPoolUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), @@ -311,7 +289,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort /** * Updates a LB member pool. */ - @Path("{loadBalancerPoolUUID}/members/{loadBalancerPoolMemberUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -337,7 +314,6 @@ public final class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNort /** * Deletes a LoadBalancerPoolMember. */ - @Path("{loadBalancerPoolUUID}/members/{loadBalancerPoolMemberUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java index e8b213d4c..572d1d8b9 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,25 +27,11 @@ import org.opendaylight.neutron.spi.NeutronMeteringLabelRule; /** * Neutron Northbound REST APIs for Metering Lable Rules.
- * This class provides REST APIs for managing neutron metering label rules - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * */ - @Path("/metering/metering-label-rules") public final class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Metering Label Rule"; @Override @@ -57,7 +42,6 @@ public final class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNo /** * Returns a list of all metering label rules. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @@ -98,7 +82,6 @@ public final class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNo /** * Returns a specific metering label rule. */ - @Path("{ruleUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -145,7 +128,6 @@ public final class NeutronMeteringLabelRulesNorthbound extends AbstractNeutronNo /** * Deletes a Metering Label rule. */ - @Path("{ruleUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java index c96f27b39..343704536 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -27,26 +26,12 @@ import org.opendaylight.neutron.spi.INeutronMeteringLabelCRUD; import org.opendaylight.neutron.spi.NeutronMeteringLabel; /** - * Neutron Northbound REST APIs for Metering Lables.
- * This class provides REST APIs for managing neutron metering labels - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for Metering Lables. */ - @Path("/metering/metering-labels") public final class NeutronMeteringLabelsNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Metering Label"; @Override @@ -57,7 +42,6 @@ public final class NeutronMeteringLabelsNorthbound extends /** * Returns a list of all metering labels. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @@ -95,7 +79,6 @@ public final class NeutronMeteringLabelsNorthbound extends /** * Returns a specific metering label. */ - @Path("{labelUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -127,7 +110,6 @@ public final class NeutronMeteringLabelsNorthbound extends /** * Deletes a Metering Label. */ - @Path("{labelUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java index e7ddee463..7a7104ab5 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronNetworksNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -32,32 +31,17 @@ import org.opendaylight.neutron.spi.INeutronNetworkCRUD; import org.opendaylight.neutron.spi.NeutronNetwork; /** - * Neutron Northbound REST APIs for Network.
- * This class provides REST APIs for managing neutron Networks - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for Network. */ - @Path("/networks") public final class NeutronNetworksNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Network"; + @Context UriInfo uriInfo; - private static final String RESOURCE_NAME = "Network"; - @Override protected String getResourceName() { return RESOURCE_NAME; @@ -66,7 +50,6 @@ public final class NeutronNetworksNorthbound /** * Returns a list of all Networks. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @@ -133,7 +116,6 @@ public final class NeutronNetworksNorthbound /** * Returns a specific Network. */ - @Path("{netUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -193,7 +175,6 @@ public final class NeutronNetworksNorthbound /** * Deletes a Network. */ - @Path("{netUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java index 2d871f56e..cab8108c5 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronPortsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -31,23 +30,8 @@ import org.opendaylight.neutron.spi.INeutronPortCRUD; import org.opendaylight.neutron.spi.NeutronPort; /** - * Neutron Northbound REST APIs.
- * This class provides REST APIs for managing neutron port objects - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for managing neutron port objects. */ - @Path("/ports") public final class NeutronPortsNorthbound extends AbstractNeutronNorthbound { @@ -65,7 +49,6 @@ public final class NeutronPortsNorthbound /** * Returns a list of all Ports. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackPorts.class) @@ -131,7 +114,6 @@ public final class NeutronPortsNorthbound /** * Returns a specific Port. */ - @Path("{portUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -150,7 +132,6 @@ public final class NeutronPortsNorthbound /** * Creates new Ports. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -188,7 +169,6 @@ public final class NeutronPortsNorthbound /** * Updates a Port. */ - @Path("{portUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -206,7 +186,6 @@ public final class NeutronPortsNorthbound /** * Deletes a Port. */ - @Path("{portUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java index cb5e57dc5..9c7e7d1fb 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronQosPolicyNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java index 96cee57e0..a192f0742 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,28 +28,12 @@ import org.opendaylight.neutron.spi.NeutronRouter; import org.opendaylight.neutron.spi.NeutronRouterInterface; /** - * Neutron Northbound REST APIs.
- * This class provides REST APIs for managing neutron routers - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for managing neutron routers. */ - @Path("/routers") public final class NeutronRoutersNorthbound extends AbstractNeutronNorthbound { - static final String ROUTER_INTERFACE_STR = "network:router_interface"; - static final String ROUTER_GATEWAY_STR = "network:router_gateway"; + private static final String RESOURCE_NAME = "Router"; @Override @@ -61,7 +44,6 @@ public final class NeutronRoutersNorthbound /** * Returns a list of all Routers. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackRouters.class) @@ -111,7 +93,6 @@ public final class NeutronRoutersNorthbound /** * Returns a specific Router. */ - @Path("{routerUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -131,7 +112,6 @@ public final class NeutronRoutersNorthbound /** * Creates new Routers. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -151,7 +131,6 @@ public final class NeutronRoutersNorthbound /** * Updates a Router. */ - @Path("{routerUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -167,7 +146,6 @@ public final class NeutronRoutersNorthbound /** * Deletes a Router. */ - @Path("{routerUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), @@ -180,7 +158,6 @@ public final class NeutronRoutersNorthbound /** * Adds an interface to a router. */ - @Path("{routerUUID}/add_router_interface") @PUT @Produces({ MediaType.APPLICATION_JSON }) diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifiersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifiersNorthbound.java index ca35c4b26..41f31efac 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifiersNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCFlowClassifiersNorthbound.java @@ -27,26 +27,12 @@ import org.opendaylight.neutron.spi.INeutronSFCFlowClassifierCRUD; import org.opendaylight.neutron.spi.NeutronSFCFlowClassifier; /** - * Neutron Northbound REST APIs for OpenStack SFC Flow Classifier.
- * This class provides REST APIs for managing OpenStack SFC Flow Classifier - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for OpenStack SFC Flow Classifier. */ - @Path("/sfc/flowclassifiers") public final class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Sfc Flow Classifier"; @Override @@ -57,7 +43,6 @@ public final class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNo /** * Returns a list of all SFC Flow Classifiers. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -120,7 +105,6 @@ public final class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNo /** * Returns a specific SFC Flow Classifier. */ - @Path("{flowClassifierUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -150,12 +134,11 @@ public final class NeutronSFCFlowClassifiersNorthbound extends AbstractNeutronNo @Override protected void updateDelta(String uuid, NeutronSFCFlowClassifier delta, NeutronSFCFlowClassifier original) { /* - * note: what we get appears to not be a delta but + * note: what we get appears to not be a delta but * rather an incomplete updated object. So we need to set * the ID to complete the object and then send that down * for folks to check */ - delta.setID(uuid); delta.setTenantID(original.getTenantID()); } diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainsNorthbound.java index 6d46e78bf..d5038b6d0 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortChainsNorthbound.java @@ -27,23 +27,8 @@ import org.opendaylight.neutron.spi.INeutronSFCPortChainCRUD; import org.opendaylight.neutron.spi.NeutronSFCPortChain; /** - * Neutron Northbound REST APIs for OpenStack SFC Port Chain.
- * This class provides REST APIs for managing OpenStack SFC Port Chain - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for OpenStack SFC Port Chain. */ - @Path("/sfc/portchains") public final class NeutronSFCPortChainsNorthbound extends AbstractNeutronNorthbound { @@ -58,7 +43,6 @@ public final class NeutronSFCPortChainsNorthbound /** * Returns a list of all SFC Port Chains. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -93,7 +77,6 @@ public final class NeutronSFCPortChainsNorthbound /** * Returns a specific SFC Port Chain. */ - @Path("{portChainUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -123,12 +106,11 @@ public final class NeutronSFCPortChainsNorthbound @Override protected void updateDelta(String uuid, NeutronSFCPortChain delta, NeutronSFCPortChain original) { /* - * note: what we get appears to not be a delta but + * note: what we get appears to not be a delta but * rather an incomplete updated object. So we need to set * the ID to complete the object and then send that down * for folks to check */ - delta.setID(uuid); delta.setTenantID(original.getTenantID()); } diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupsNorthbound.java index 4b658e051..54c61c5e7 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairGroupsNorthbound.java @@ -27,23 +27,8 @@ import org.opendaylight.neutron.spi.INeutronSFCPortPairGroupCRUD; import org.opendaylight.neutron.spi.NeutronSFCPortPairGroup; /** - * Neutron Northbound REST APIs for OpenStack SFC Port Pair.
- * This class provides REST APIs for managing OpenStack SFC Port Pair - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for OpenStack SFC Port Pair. */ - @Path("/sfc/portpairgroups") public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNorthbound { @@ -58,7 +43,6 @@ public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNor /** * Returns a list of all SFC Port Pair Groups. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -94,7 +78,6 @@ public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNor /** * Returns a specific SFC Port Pair Group. */ - @Path("{portPairGroupUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -124,12 +107,11 @@ public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNor @Override protected void updateDelta(String uuid, NeutronSFCPortPairGroup delta, NeutronSFCPortPairGroup original) { /* - * note: what we get appears to not be a delta but + * Note: what we get appears to not be a delta but * rather an incomplete updated object. So we need to set * the ID to complete the object and then send that down * for folks to check */ - delta.setID(uuid); delta.setTenantID(original.getTenantID()); } @@ -152,7 +134,6 @@ public final class NeutronSFCPortPairGroupsNorthbound extends AbstractNeutronNor /** * Deletes the SFC Port Pair Group. */ - @Path("{portPairGroupUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairsNorthbound.java index 278987a71..35ca4484f 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSFCPortPairsNorthbound.java @@ -27,23 +27,8 @@ import org.opendaylight.neutron.spi.INeutronSFCPortPairCRUD; import org.opendaylight.neutron.spi.NeutronSFCPortPair; /** - * Neutron Northbound REST APIs for OpenStack SFC Port Pair.
- * This class provides REST APIs for managing OpenStack SFC Port Pair - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for OpenStack SFC Port Pair. */ - @Path("/sfc/portpairs") public final class NeutronSFCPortPairsNorthbound extends AbstractNeutronNorthbound { @@ -58,7 +43,6 @@ public final class NeutronSFCPortPairsNorthbound /** * Returns a list of all SFC Port Pairs. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -97,7 +81,6 @@ public final class NeutronSFCPortPairsNorthbound /** * Returns a specific SFC Port Pair. */ - @Path("{portPairUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -155,7 +138,6 @@ public final class NeutronSFCPortPairsNorthbound /** * Deletes the SFC Port Pair. */ - @Path("{portPairUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java index 3ef3e40f9..cb5c9b3f6 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupRequest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -20,6 +19,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityGroup; @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") public final class NeutronSecurityGroupRequest implements INeutronRequest { + /** * See OpenStack Network API v2.0 Reference for a * description of annotated attributes and operations. diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java index 4801dbb5b..5edc05ecd 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -28,25 +27,12 @@ import org.opendaylight.neutron.spi.INeutronSecurityGroupCRUD; import org.opendaylight.neutron.spi.NeutronSecurityGroup; /** - * Neutron Northbound REST APIs for Security Group.
- * This class provides REST APIs for managing neutron Security Group - * - *

- *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration + * Neutron Northbound REST APIs for Security Group. */ @Path("/security-groups") public final class NeutronSecurityGroupsNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Security Group"; @Override @@ -63,7 +49,6 @@ public final class NeutronSecurityGroupsNorthbound extends @ResponseCode(code = HttpURLConnection.HTTP_UNAUTHORIZED, condition = "Unauthorized"), @ResponseCode(code = HttpURLConnection.HTTP_NOT_IMPLEMENTED, condition = "Not Implemented"), @ResponseCode(code = HttpURLConnection.HTTP_UNAVAILABLE, condition = "No providers available") }) - public Response listGroups( // return fields @QueryParam("fields") List fields, @@ -94,7 +79,6 @@ public final class NeutronSecurityGroupsNorthbound extends /** * Returns a specific Security Group. */ - @Path("{securityGroupUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -112,7 +96,6 @@ public final class NeutronSecurityGroupsNorthbound extends /** * Creates new Security Group. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -125,7 +108,6 @@ public final class NeutronSecurityGroupsNorthbound extends /** * Updates a Security Group. */ - @Path("{securityGroupUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -141,7 +123,6 @@ public final class NeutronSecurityGroupsNorthbound extends /** * Deletes a Security Group. */ - @Path("{securityGroupUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java index ec91da735..dff94cd4f 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRuleRequest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -20,6 +19,7 @@ import org.opendaylight.neutron.spi.NeutronSecurityRule; @XmlAccessorType(XmlAccessType.NONE) @SuppressFBWarnings("URF_UNREAD_FIELD") public final class NeutronSecurityRuleRequest implements INeutronRequest { + /** * See OpenStack Network API v2.0 Reference for a * description of annotated attributes and operations. diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java index 717a70fa1..11eb9385c 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,25 +28,11 @@ import org.opendaylight.neutron.spi.NeutronSecurityRule; /** * Neutron Northbound REST APIs for Security Rule.
- * This class provides REST APIs for managing neutron Security Rule - * - *

- *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration */ - @Path("/security-group-rules") public final class NeutronSecurityRulesNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Security Rule"; @Override @@ -116,7 +101,6 @@ public final class NeutronSecurityRulesNorthbound /** * Returns a specific Security Rule. */ - @Path("{securityRuleUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -134,7 +118,6 @@ public final class NeutronSecurityRulesNorthbound /** * Creates new Security Rule. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -147,7 +130,6 @@ public final class NeutronSecurityRulesNorthbound /** * Updates a Security Rule. */ - @Path("{securityRuleUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -163,7 +145,6 @@ public final class NeutronSecurityRulesNorthbound /** * Deletes a Security Rule. */ - @Path("{securityRuleUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java index 2f4f4a2db..ba8f5c1b9 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSubnetsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -32,25 +31,11 @@ import org.opendaylight.neutron.spi.NeutronSubnet; /** * Neutron Northbound REST APIs for Subnets.
- * This class provides REST APIs for managing neutron Subnets - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * */ - @Path("/subnets") public final class NeutronSubnetsNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "Subnet"; @Override @@ -126,7 +111,6 @@ public final class NeutronSubnetsNorthbound /** * Returns a specific Subnet. */ - @Path("{subnetUUID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -145,7 +129,6 @@ public final class NeutronSubnetsNorthbound /** * Creates new Subnets. */ - @POST @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -163,7 +146,6 @@ public final class NeutronSubnetsNorthbound * complete updated object. So, that needs to be sent down to * folks to check */ - delta.setID(uuid); delta.setNetworkUUID(original.getNetworkUUID()); delta.setTenantID(original.getTenantID()); @@ -174,7 +156,6 @@ public final class NeutronSubnetsNorthbound /** * Updates a Subnet. */ - @Path("{subnetUUID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @@ -190,7 +171,6 @@ public final class NeutronSubnetsNorthbound /** * Deletes a Subnet. */ - @Path("{subnetUUID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowNorthbound.java index 3bd900b49..4b38bce2b 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapFlowNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceNorthbound.java index 0c3ee715a..a8ca5c9f5 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTapServiceNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunksNorthbound.java index b5fcf7196..f63654713 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunksNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronTrunksNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePoliciesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePoliciesNorthbound.java index 4fe759e79..2630c014d 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePoliciesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIkePoliciesNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,26 +28,12 @@ import org.opendaylight.neutron.spi.INeutronVpnIkePolicyCRUD; import org.opendaylight.neutron.spi.NeutronVpnIkePolicy; /** - * Neutron Northbound REST APIs for VPN IKE Policy.
- * This class provides REST APIs for managing neutron VPN IKE Policies - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for VPN IKE Policy. */ - @Path("/vpn/ikepolicies") public final class NeutronVpnIkePoliciesNorthbound extends AbstractNeutronNorthbound { + private static final String RESOURCE_NAME = "VPNIKEPolicy"; @Override @@ -59,7 +44,6 @@ public final class NeutronVpnIkePoliciesNorthbound /** * Returns a list of all VPN IKE Policies. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -108,7 +92,6 @@ public final class NeutronVpnIkePoliciesNorthbound /** * Returns a specific VPN IKE Policy. */ - @Path("{policyID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -155,7 +138,6 @@ public final class NeutronVpnIkePoliciesNorthbound /** * Deletes a VPN IKE Policy. */ - @Path("{policyID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPoliciesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPoliciesNorthbound.java index 3a13dba08..e281e25ef 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPoliciesNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecPoliciesNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -29,23 +28,8 @@ import org.opendaylight.neutron.spi.INeutronVpnIpSecPolicyCRUD; import org.opendaylight.neutron.spi.NeutronVpnIpSecPolicy; /** - * Neutron Northbound REST APIs for VPN IPSEC Policy.
- * This class provides REST APIs for managing neutron VPN IPSEC Policies - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for VPN IPSEC Policy. */ - @Path("/vpn/ipsecpolicies") public final class NeutronVpnIpSecPoliciesNorthbound extends AbstractNeutronNorthbound { @@ -60,7 +44,6 @@ public final class NeutronVpnIpSecPoliciesNorthbound extends /** * Returns a list of all VPN IPSEC Policies. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -108,7 +91,6 @@ public final class NeutronVpnIpSecPoliciesNorthbound extends /** * Returns a specific VPN IPSEC Policy. */ - @Path("{policyID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -155,7 +137,6 @@ public final class NeutronVpnIpSecPoliciesNorthbound extends /** * Deletes a VPN IPSEC Policy. */ - @Path("{policyID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionsNorthbound.java index d14e80903..208919f82 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionsNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronVpnIpSecSiteConnectionsNorthbound.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.neutron.northbound.api; import java.net.HttpURLConnection; @@ -30,22 +29,7 @@ import org.opendaylight.neutron.spi.NeutronVpnIpSecSiteConnection; /** * Neutron Northbound REST APIs for VPN IPSEC SiteConnection.
- * This class provides REST APIs for managing neutron VPN IPSEC SiteConnections - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * */ - @Path("/vpn/ipsecsiteconnections") public final class NeutronVpnIpSecSiteConnectionsNorthbound extends AbstractNeutronNorthbound - * This class provides REST APIs for managing neutron VPN Services - * - *
- *
- * Authentication scheme : HTTP Basic
- * Authentication realm : opendaylight
- * Transport : HTTP and HTTPS
- *
- * HTTPS Authentication is disabled by default. Administrator can enable it in - * tomcat-server.xml after adding a proper keystore / SSL certificate from a - * trusted authority.
- * More info : - * http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html#Configuration - * + * Neutron Northbound REST APIs for VPN Service. */ - @Path("/vpn/vpnservices") public final class NeutronVpnServicesNorthbound extends AbstractNeutronNorthbound { @@ -60,7 +44,6 @@ public final class NeutronVpnServicesNorthbound /** * Returns a list of all VPN Services. */ - @GET @Produces({ MediaType.APPLICATION_JSON }) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful"), @@ -109,7 +92,6 @@ public final class NeutronVpnServicesNorthbound /** * Returns a specific VPN Service. */ - @Path("{serviceID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -154,7 +136,6 @@ public final class NeutronVpnServicesNorthbound /** * Deletes a VPN Service. */ - @Path("{serviceID}") @DELETE @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_NO_CONTENT, condition = "No Content"), -- 2.36.6