Remove superfulous class from neutron NB bundle.

[controller.git] / opendaylight / northbound / networkconfiguration / neutron / src / main / java / org / opendaylight / controller / networkconfig / neutron / northbound / NeutronRoutersNorthbound.java

diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
index e83d1fe51b8769674f7ebd067a640a449ec230bb..df2009ed2b76170bd281be4fd57d100f3f2203dc 100644 (file)
--- a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
+++ b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
@@ -30,6 +30,7 @@ import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
 import org.opendaylight.controller.networkconfig.neutron.INeutronRouterAware;\r
 import org.opendaylight.controller.networkconfig.neutron.INeutronRouterCRUD;\r
 import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;\r
+import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;\r
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;\r
 import org.opendaylight.controller.networkconfig.neutron.NeutronPort;\r
 import org.opendaylight.controller.networkconfig.neutron.NeutronRouter;\r
@@ -91,7 +92,7 @@ public class NeutronRoutersNorthbound {
             @QueryParam("page_reverse") String pageReverse\r
             // sorting not supported\r
             ) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -135,7 +136,7 @@ public class NeutronRoutersNorthbound {
             @PathParam("routerUUID") String routerUUID,\r
             // return fields\r
             @QueryParam("fields") List<String> fields) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -164,12 +165,12 @@ public class NeutronRoutersNorthbound {
             @ResponseCode(code = 401, condition = "Unauthorized"),\r
             @ResponseCode(code = 501, condition = "Not Implemented") })\r
     public Response createRouters(final NeutronRouterRequest input) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -240,12 +241,12 @@ public class NeutronRoutersNorthbound {
             @PathParam("routerUUID") String routerUUID,\r
             NeutronRouterRequest input\r
             ) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronNetworkCRUD networkInterface = NeutronNBInterfaces.getIfNBNetworkCRUD("default", this);\r
+        INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this);\r
         if (networkInterface == null) {\r
             throw new ServiceUnavailableException("Network CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -319,7 +320,7 @@ public class NeutronRoutersNorthbound {
             @ResponseCode(code = 501, condition = "Not Implemented") })\r
     public Response deleteRouter(\r
             @PathParam("routerUUID") String routerUUID) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -371,17 +372,17 @@ public class NeutronRoutersNorthbound {
             @PathParam("routerUUID") String routerUUID,\r
             NeutronRouter_Interface input\r
             ) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronPortCRUD portInterface = NeutronNBInterfaces.getIfNBPortCRUD("default",this);\r
+        INeutronPortCRUD portInterface = NeutronCRUDInterfaces.getINeutronPortCRUD(this);\r
         if (portInterface == null) {\r
             throw new ServiceUnavailableException("Port CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronSubnetCRUD subnetInterface = NeutronNBInterfaces.getIfNBSubnetCRUD("default",this);\r
+        INeutronSubnetCRUD subnetInterface = NeutronCRUDInterfaces.getINeutronSubnetCRUD(this);\r
         if (subnetInterface == null) {\r
             throw new ServiceUnavailableException("Subnet CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
@@ -456,17 +457,17 @@ public class NeutronRoutersNorthbound {
             @PathParam("routerUUID") String routerUUID,\r
             NeutronRouter_Interface input\r
             ) {\r
-        INeutronRouterCRUD routerInterface = NeutronNBInterfaces.getIfNBRouterCRUD("default",this);\r
+        INeutronRouterCRUD routerInterface = NeutronCRUDInterfaces.getINeutronRouterCRUD(this);\r
         if (routerInterface == null) {\r
             throw new ServiceUnavailableException("Router CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronPortCRUD portInterface = NeutronNBInterfaces.getIfNBPortCRUD("default",this);\r
+        INeutronPortCRUD portInterface = NeutronCRUDInterfaces.getINeutronPortCRUD(this);\r
         if (portInterface == null) {\r
             throw new ServiceUnavailableException("Port CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r
         }\r
-        INeutronSubnetCRUD subnetInterface = NeutronNBInterfaces.getIfNBSubnetCRUD("default",this);\r
+        INeutronSubnetCRUD subnetInterface = NeutronCRUDInterfaces.getINeutronSubnetCRUD(this);\r
         if (subnetInterface == null) {\r
             throw new ServiceUnavailableException("Subnet CRUD Interface "\r
                     + RestMessages.SERVICEUNAVAILABLE.toString());\r