Merge "sort out signature of extraceField method"

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 ec7c72195d34d0b3c5e7a6a99f3b648eee52d817..6af81f00df49894cb01b6be9ddfb53fe7e67a206 100644 (file)
--- 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
@@ -59,7 +59,6 @@ public class NeutronL2gatewayConnectionNorthbound extends AbstractNeutronNorthbo
     UriInfo uriInfo;
 
     private static final String RESOURCE_NAME = "L2gatewayConnection";
-    private static final String INTERFACE_NAME = "L2gatewayConnection CRUD Interface";
 
     @Override
     protected String getResourceName() {

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 399d834944dc8f69aa754e1589a8ce483b0c8345..2b7494a928a55fc9b2fe42a51f2e12cb52ef1ced 100644 (file)
--- 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
@@ -306,7 +306,6 @@ public class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNorthbound
             final NeutronLoadBalancerPoolMemberRequest input) {
 
         INeutronLoadBalancerPoolCRUD loadBalancerPoolInterface = getNeutronCRUD();
-        NeutronLoadBalancerPool singletonPool = loadBalancerPoolInterface.get(loadBalancerPoolUUID);
 
         if (input.isSingleton()) {
             NeutronLoadBalancerPoolMember singleton = input.getSingleton();
@@ -348,9 +347,6 @@ public class NeutronLoadBalancerPoolNorthbound extends AbstractNeutronNorthbound
         if (singletonPool == null) {
             throw new ResourceNotFoundException("Pool doesn't Exist");
         }
-        NeutronLoadBalancerPoolMember original = singletonPool
-                .getNeutronLoadBalancerPoolMember(loadBalancerPoolMemberUUID);
-
         loadBalancerPoolInterface.updateNeutronLoadBalancerPoolMember(loadBalancerPoolUUID, loadBalancerPoolMemberUUID,
                 singleton);
         return Response.status(HttpURLConnection.HTTP_OK).entity(input).build();

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 0443007a7e14aeaa352ceb64366cf1504d0333b0..da1827f52454b64e3f7f0dda8343ff4cfe526947 100644 (file)
--- 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
@@ -80,22 +80,6 @@ public class NeutronRoutersNorthbound
         return getNeutronInterfaces(false).getRouterInterface();
     }
 
-    private NeutronCRUDInterfaces getAttachInterfaces() {
-        NeutronCRUDInterfaces answer = new NeutronCRUDInterfaces().fetchINeutronRouterCRUD(this);
-        if (answer.getRouterInterface() == null) {
-            throw new ServiceUnavailableException(serviceUnavailable());
-        }
-        answer = answer.fetchINeutronPortCRUD(this).fetchINeutronSubnetCRUD(this);
-        if (answer.getPortInterface() == null) {
-            throw new ServiceUnavailableException("Port CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString());
-        }
-        if (answer.getSubnetInterface() == null) {
-            throw new ServiceUnavailableException(
-                    "Subnet CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString());
-        }
-        return answer;
-    }
-
     @Override
     protected NeutronRouterRequest newNeutronRequest(NeutronRouter o) {
         return new NeutronRouterRequest(o);