From: Srini Seetharaman Date: Sat, 13 Sep 2014 19:30:10 +0000 (-0700) Subject: Bug 1856 - Fixing the correct cache access for NeutronLoadBalancer northbound. Withou... X-Git-Tag: release/helium~82^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=13dc5b9414642b0829f8a446740f9255f95937a1 Bug 1856 - Fixing the correct cache access for NeutronLoadBalancer northbound. Without this patch, all calls are lost from the cache. Change-Id: I61c8265b7ec4d1b5a0cc5e815e7df9d22c011319 Signed-off-by: Srini Seetharaman --- diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java index 748dffc8cf..bb645b34ec 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java +++ b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java @@ -38,8 +38,8 @@ import java.util.Iterator; import java.util.List; /** - * Neutron Northbound REST APIs for LoadBalancer Policies.
- * This class provides REST APIs for managing neutron LoadBalancer Policies + * Neutron Northbound REST APIs for LoadBalancers.
+ * This class provides REST APIs for managing neutron LoadBalancers * *
*
@@ -87,15 +87,13 @@ public class NeutronLoadBalancerNorthbound { @QueryParam("page_reverse") String pageReverse // sorting not supported ) { - INeutronLoadBalancerCRUD loadBalancerPoolInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( - this); - // INeutronLoadBalancerRuleCRUD firewallRuleInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerRuleCRUD(this); + INeutronLoadBalancerCRUD loadBalancerInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD(this); - if (loadBalancerPoolInterface == null) { + if (loadBalancerInterface == null) { throw new ServiceUnavailableException("LoadBalancer CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } - List allLoadBalancers = loadBalancerPoolInterface.getAllNeutronLoadBalancers(); + List allLoadBalancers = loadBalancerInterface.getAllNeutronLoadBalancers(); // List allLoadBalancerRules = firewallRuleInterface.getAllNeutronLoadBalancerRules(); List ans = new ArrayList(); // List rules = new ArrayList(); @@ -128,7 +126,7 @@ public class NeutronLoadBalancerNorthbound { /** * Returns a specific LoadBalancer */ - @Path("{loadBalancerPoolID}") + @Path("{loadBalancerID}") @GET @Produces({ MediaType.APPLICATION_JSON }) @@ -137,25 +135,25 @@ public class NeutronLoadBalancerNorthbound { @ResponseCode(code = 401, condition = "Unauthorized"), @ResponseCode(code = 404, condition = "Not Found"), @ResponseCode(code = 501, condition = "Not Implemented") }) - public Response showLoadBalancer(@PathParam("loadBalancerPoolID") String loadBalancerPoolID, + public Response showLoadBalancer(@PathParam("loadBalancerID") String loadBalancerID, // return fields @QueryParam("fields") List fields) { - INeutronLoadBalancerCRUD loadBalancerPoolInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( + INeutronLoadBalancerCRUD loadBalancerInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( this); - if (loadBalancerPoolInterface == null) { + if (loadBalancerInterface == null) { throw new ServiceUnavailableException("LoadBalancer CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } - if (!loadBalancerPoolInterface.neutronLoadBalancerExists(loadBalancerPoolID)) { + if (!loadBalancerInterface.neutronLoadBalancerExists(loadBalancerID)) { throw new ResourceNotFoundException("LoadBalancer UUID does not exist."); } if (fields.size() > 0) { - NeutronLoadBalancer ans = loadBalancerPoolInterface.getNeutronLoadBalancer(loadBalancerPoolID); + NeutronLoadBalancer ans = loadBalancerInterface.getNeutronLoadBalancer(loadBalancerID); return Response.status(200).entity( new NeutronLoadBalancerRequest(extractFields(ans, fields))).build(); } else { - return Response.status(200).entity(new NeutronLoadBalancerRequest(loadBalancerPoolInterface.getNeutronLoadBalancer( - loadBalancerPoolID))).build(); + return Response.status(200).entity(new NeutronLoadBalancerRequest(loadBalancerInterface.getNeutronLoadBalancer( + loadBalancerID))).build(); } } @@ -175,9 +173,9 @@ public class NeutronLoadBalancerNorthbound { @ResponseCode(code = 409, condition = "Conflict"), @ResponseCode(code = 501, condition = "Not Implemented") }) public Response createLoadBalancers(final NeutronLoadBalancerRequest input) { - INeutronLoadBalancerCRUD loadBalancerPoolInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( + INeutronLoadBalancerCRUD loadBalancerInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( this); - if (loadBalancerPoolInterface == null) { + if (loadBalancerInterface == null) { throw new ServiceUnavailableException("LoadBalancer CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } @@ -187,10 +185,10 @@ public class NeutronLoadBalancerNorthbound { /* * Verify that the LoadBalancer doesn't already exist. */ - if (loadBalancerPoolInterface.neutronLoadBalancerExists(singleton.getLoadBalancerID())) { + if (loadBalancerInterface.neutronLoadBalancerExists(singleton.getLoadBalancerID())) { throw new BadRequestException("LoadBalancer UUID already exists"); } - loadBalancerPoolInterface.addNeutronLoadBalancer(singleton); + loadBalancerInterface.addNeutronLoadBalancer(singleton); Object[] instances = ServiceHelper.getGlobalInstances(INeutronLoadBalancerAware.class, this, null); if (instances != null) { @@ -202,7 +200,7 @@ public class NeutronLoadBalancerNorthbound { } } } - loadBalancerPoolInterface.addNeutronLoadBalancer(singleton); + loadBalancerInterface.addNeutronLoadBalancer(singleton); if (instances != null) { for (Object instance : instances) { INeutronLoadBalancerAware service = (INeutronLoadBalancerAware) instance; @@ -221,7 +219,7 @@ public class NeutronLoadBalancerNorthbound { * Verify that the firewall policy doesn't already exist */ - if (loadBalancerPoolInterface.neutronLoadBalancerExists(test.getLoadBalancerID())) { + if (loadBalancerInterface.neutronLoadBalancerExists(test.getLoadBalancerID())) { throw new BadRequestException("Load Balancer Pool UUID already is already created"); } if (testMap.containsKey(test.getLoadBalancerID())) { @@ -243,7 +241,7 @@ public class NeutronLoadBalancerNorthbound { i = bulk.iterator(); while (i.hasNext()) { NeutronLoadBalancer test = i.next(); - loadBalancerPoolInterface.addNeutronLoadBalancer(test); + loadBalancerInterface.addNeutronLoadBalancer(test); if (instances != null) { for (Object instance : instances) { INeutronLoadBalancerAware service = (INeutronLoadBalancerAware) instance; @@ -258,7 +256,7 @@ public class NeutronLoadBalancerNorthbound { /** * Updates a LoadBalancer Policy */ - @Path("{loadBalancerPoolID}") + @Path("{loadBalancerID}") @PUT @Produces({ MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_JSON }) @@ -271,10 +269,10 @@ public class NeutronLoadBalancerNorthbound { @ResponseCode(code = 404, condition = "Not Found"), @ResponseCode(code = 501, condition = "Not Implemented") }) public Response updateLoadBalancer( - @PathParam("loadBalancerPoolID") String loadBalancerPoolID, final NeutronLoadBalancerRequest input) { - INeutronLoadBalancerCRUD loadBalancerPoolInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( + @PathParam("loadBalancerID") String loadBalancerID, final NeutronLoadBalancerRequest input) { + INeutronLoadBalancerCRUD loadBalancerInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( this); - if (loadBalancerPoolInterface == null) { + if (loadBalancerInterface == null) { throw new ServiceUnavailableException("LoadBalancer CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } @@ -282,14 +280,14 @@ public class NeutronLoadBalancerNorthbound { /* * verify the LoadBalancer exists and there is only one delta provided */ - if (!loadBalancerPoolInterface.neutronLoadBalancerExists(loadBalancerPoolID)) { + if (!loadBalancerInterface.neutronLoadBalancerExists(loadBalancerID)) { throw new ResourceNotFoundException("LoadBalancer UUID does not exist."); } if (!input.isSingleton()) { throw new BadRequestException("Only singleton edit supported"); } NeutronLoadBalancer delta = input.getSingleton(); - NeutronLoadBalancer original = loadBalancerPoolInterface.getNeutronLoadBalancer(loadBalancerPoolID); + NeutronLoadBalancer original = loadBalancerInterface.getNeutronLoadBalancer(loadBalancerID); /* * updates restricted by Neutron @@ -318,23 +316,23 @@ public class NeutronLoadBalancerNorthbound { /* * update the object and return it */ - loadBalancerPoolInterface.updateNeutronLoadBalancer(loadBalancerPoolID, delta); - NeutronLoadBalancer updatedLoadBalancer = loadBalancerPoolInterface.getNeutronLoadBalancer( - loadBalancerPoolID); + loadBalancerInterface.updateNeutronLoadBalancer(loadBalancerID, delta); + NeutronLoadBalancer updatedLoadBalancer = loadBalancerInterface.getNeutronLoadBalancer( + loadBalancerID); if (instances != null) { for (Object instance : instances) { INeutronLoadBalancerAware service = (INeutronLoadBalancerAware) instance; service.neutronLoadBalancerUpdated(updatedLoadBalancer); } } - return Response.status(200).entity(new NeutronLoadBalancerRequest(loadBalancerPoolInterface.getNeutronLoadBalancer( - loadBalancerPoolID))).build(); + return Response.status(200).entity(new NeutronLoadBalancerRequest(loadBalancerInterface.getNeutronLoadBalancer( + loadBalancerID))).build(); } /** * Deletes a LoadBalancer */ - @Path("{loadBalancerPoolID}") + @Path("{loadBalancerID}") @DELETE @StatusCodes({ @ResponseCode(code = 204, condition = "No Content"), @@ -343,10 +341,10 @@ public class NeutronLoadBalancerNorthbound { @ResponseCode(code = 409, condition = "Conflict"), @ResponseCode(code = 501, condition = "Not Implemented") }) public Response deleteLoadBalancer( - @PathParam("loadBalancerPoolID") String loadBalancerPoolID) { - INeutronLoadBalancerCRUD loadBalancerPoolInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( + @PathParam("loadBalancerID") String loadBalancerID) { + INeutronLoadBalancerCRUD loadBalancerInterface = NeutronCRUDInterfaces.getINeutronLoadBalancerCRUD( this); - if (loadBalancerPoolInterface == null) { + if (loadBalancerInterface == null) { throw new ServiceUnavailableException("LoadBalancer CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } @@ -354,13 +352,13 @@ public class NeutronLoadBalancerNorthbound { /* * verify the LoadBalancer exists and it isn't currently in use */ - if (!loadBalancerPoolInterface.neutronLoadBalancerExists(loadBalancerPoolID)) { + if (!loadBalancerInterface.neutronLoadBalancerExists(loadBalancerID)) { throw new ResourceNotFoundException("LoadBalancer UUID does not exist."); } - if (loadBalancerPoolInterface.neutronLoadBalancerInUse(loadBalancerPoolID)) { + if (loadBalancerInterface.neutronLoadBalancerInUse(loadBalancerID)) { return Response.status(409).build(); } - NeutronLoadBalancer singleton = loadBalancerPoolInterface.getNeutronLoadBalancer(loadBalancerPoolID); + NeutronLoadBalancer singleton = loadBalancerInterface.getNeutronLoadBalancer(loadBalancerID); Object[] instances = ServiceHelper.getGlobalInstances(INeutronLoadBalancerAware.class, this, null); if (instances != null) { for (Object instance : instances) { @@ -372,7 +370,7 @@ public class NeutronLoadBalancerNorthbound { } } - loadBalancerPoolInterface.removeNeutronLoadBalancer(loadBalancerPoolID); + loadBalancerInterface.removeNeutronLoadBalancer(loadBalancerID); if (instances != null) { for (Object instance : instances) { INeutronLoadBalancerAware service = (INeutronLoadBalancerAware) instance;