X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fnetworkconfiguration%2Fneutron%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetworkconfig%2Fneutron%2Fnorthbound%2FNeutronNetworksNorthbound.java;h=c08ee80e24c44f3551d949e0ff607c7264be9167;hp=e8690aa889aee1d449601a3156757d298de9dd72;hb=9f90f4db6c2848999d8b637a3c19b93982b26ee2;hpb=a1b55fb491e235c028e1d451aff4b1d261d5a86c diff --git a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java index e8690aa889..c08ee80e24 100644 --- a/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java +++ b/opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; + import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.GET; @@ -67,8 +68,8 @@ public class NeutronNetworksNorthbound { @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @StatusCodes({ - @ResponseCode(code = 200, condition = "Operation successful"), - @ResponseCode(code = 401, condition = "Unauthorized") }) + @ResponseCode(code = 200, condition = "Operation successful"), + @ResponseCode(code = 401, condition = "Unauthorized") }) public Response listNetworks( // return fields @QueryParam("fields") List fields, @@ -88,7 +89,7 @@ public class NeutronNetworksNorthbound { @QueryParam("marker") String marker, @QueryParam("page_reverse") String pageReverse // sorting not supported - ) { + ) { INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this); if (networkInterface == null) { throw new ServiceUnavailableException("Network CRUD Interface " @@ -103,12 +104,15 @@ public class NeutronNetworksNorthbound { Boolean bAdminStateUp = null; Boolean bShared = null; Boolean bRouterExternal = null; - if (queryAdminStateUp != null) + if (queryAdminStateUp != null) { bAdminStateUp = Boolean.valueOf(queryAdminStateUp); - if (queryShared != null) + } + if (queryShared != null) { bShared = Boolean.valueOf(queryShared); - if (queryRouterExternal != null) + } + if (queryRouterExternal != null) { bRouterExternal = Boolean.valueOf(queryRouterExternal); + } if ((queryID == null || queryID.equals(oSN.getID())) && (queryName == null || queryName.equals(oSN.getNetworkName())) && (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp()) && @@ -116,10 +120,11 @@ public class NeutronNetworksNorthbound { (bShared == null || bShared.booleanValue() == oSN.isShared()) && (bRouterExternal == null || bRouterExternal.booleanValue() == oSN.isRouterExternal()) && (queryTenantID == null || queryTenantID.equals(oSN.getTenantID()))) { - if (fields.size() > 0) + if (fields.size() > 0) { ans.add(extractFields(oSN,fields)); - else + } else { ans.add(oSN); + } } } //TODO: apply pagination to results @@ -135,9 +140,9 @@ public class NeutronNetworksNorthbound { @Produces({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @StatusCodes({ - @ResponseCode(code = 200, condition = "Operation successful"), - @ResponseCode(code = 401, condition = "Unauthorized"), - @ResponseCode(code = 404, condition = "Not Found") }) + @ResponseCode(code = 200, condition = "Operation successful"), + @ResponseCode(code = 401, condition = "Unauthorized"), + @ResponseCode(code = 404, condition = "Not Found") }) public Response showNetwork( @PathParam("netUUID") String netUUID, // return fields @@ -148,15 +153,17 @@ public class NeutronNetworksNorthbound { throw new ServiceUnavailableException("Network CRUD Interface " + RestMessages.SERVICEUNAVAILABLE.toString()); } - if (!networkInterface.networkExists(netUUID)) + if (!networkInterface.networkExists(netUUID)) { return Response.status(404).build(); + } if (fields.size() > 0) { NeutronNetwork ans = networkInterface.getNetwork(netUUID); return Response.status(200).entity( new NeutronNetworkRequest(extractFields(ans, fields))).build(); - } else + } else { return Response.status(200).entity( new NeutronNetworkRequest(networkInterface.getNetwork(netUUID))).build(); + } } /** @@ -166,9 +173,9 @@ public class NeutronNetworksNorthbound { @Consumes({ MediaType.APPLICATION_JSON }) @TypeHint(NeutronNetwork.class) @StatusCodes({ - @ResponseCode(code = 201, condition = "Created"), - @ResponseCode(code = 400, condition = "Bad Request"), - @ResponseCode(code = 401, condition = "Unauthorized") }) + @ResponseCode(code = 201, condition = "Created"), + @ResponseCode(code = 400, condition = "Bad Request"), + @ResponseCode(code = 401, condition = "Unauthorized") }) public Response createNetworks(final NeutronNetworkRequest input) { INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this); if (networkInterface == null) { @@ -181,20 +188,23 @@ public class NeutronNetworksNorthbound { /* * network ID can't already exist */ - if (networkInterface.networkExists(singleton.getID())) + if (networkInterface.networkExists(singleton.getID())) { return Response.status(400).build(); + } Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null); if (instances != null) { for (Object instance : instances) { INeutronNetworkAware service = (INeutronNetworkAware) instance; int status = service.canCreateNetwork(singleton); - if (status < 200 || status > 299) + if (status < 200 || status > 299) { return Response.status(status).build(); + } } } // add network to cache + singleton.initDefaults(); networkInterface.addNetwork(singleton); if (instances != null) { for (Object instance : instances) { @@ -215,16 +225,19 @@ public class NeutronNetworksNorthbound { * network ID can't already exist, nor can there be an entry for this UUID * already in this bulk request */ - if (networkInterface.networkExists(test.getID())) + if (networkInterface.networkExists(test.getID())) { return Response.status(400).build(); - if (testMap.containsKey(test.getID())) + } + if (testMap.containsKey(test.getID())) { return Response.status(400).build(); + } if (instances != null) { for (Object instance: instances) { INeutronNetworkAware service = (INeutronNetworkAware) instance; int status = service.canCreateNetwork(test); - if (status < 200 || status > 299) + if (status < 200 || status > 299) { return Response.status(status).build(); + } } } testMap.put(test.getID(),test); @@ -255,10 +268,10 @@ public class NeutronNetworksNorthbound { @Consumes({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackNetworks.class) @StatusCodes({ - @ResponseCode(code = 200, condition = "Operation successful"), - @ResponseCode(code = 400, condition = "Bad Request"), - @ResponseCode(code = 403, condition = "Forbidden"), - @ResponseCode(code = 404, condition = "Not Found"), }) + @ResponseCode(code = 200, condition = "Operation successful"), + @ResponseCode(code = 400, condition = "Bad Request"), + @ResponseCode(code = 403, condition = "Forbidden"), + @ResponseCode(code = 404, condition = "Not Found"), }) public Response updateNetwork( @PathParam("netUUID") String netUUID, final NeutronNetworkRequest input ) { @@ -271,18 +284,21 @@ public class NeutronNetworksNorthbound { /* * network has to exist and only a single delta is supported */ - if (!networkInterface.networkExists(netUUID)) + if (!networkInterface.networkExists(netUUID)) { return Response.status(404).build(); - if (!input.isSingleton()) + } + if (!input.isSingleton()) { return Response.status(400).build(); + } NeutronNetwork delta = input.getSingleton(); /* * transitions forbidden by Neutron */ if (delta.getID() != null || delta.getTenantID() != null || - delta.getStatus() != null) + delta.getStatus() != null) { return Response.status(400).build(); + } Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null); if (instances != null) { @@ -290,22 +306,23 @@ public class NeutronNetworksNorthbound { INeutronNetworkAware service = (INeutronNetworkAware) instance; NeutronNetwork original = networkInterface.getNetwork(netUUID); int status = service.canUpdateNetwork(delta, original); - if (status < 200 || status > 299) + if (status < 200 || status > 299) { return Response.status(status).build(); + } } } // update network object and return the modified object - networkInterface.updateNetwork(netUUID, delta); - NeutronNetwork updatedSingleton = networkInterface.getNetwork(netUUID); - if (instances != null) { - for (Object instance : instances) { - INeutronNetworkAware service = (INeutronNetworkAware) instance; - service.neutronNetworkUpdated(updatedSingleton); - } - } - return Response.status(200).entity( - new NeutronNetworkRequest(networkInterface.getNetwork(netUUID))).build(); + networkInterface.updateNetwork(netUUID, delta); + NeutronNetwork updatedSingleton = networkInterface.getNetwork(netUUID); + if (instances != null) { + for (Object instance : instances) { + INeutronNetworkAware service = (INeutronNetworkAware) instance; + service.neutronNetworkUpdated(updatedSingleton); + } + } + return Response.status(200).entity( + new NeutronNetworkRequest(networkInterface.getNetwork(netUUID))).build(); } /** @@ -314,10 +331,10 @@ public class NeutronNetworksNorthbound { @Path("{netUUID}") @DELETE @StatusCodes({ - @ResponseCode(code = 204, condition = "No Content"), - @ResponseCode(code = 401, condition = "Unauthorized"), - @ResponseCode(code = 404, condition = "Not Found"), - @ResponseCode(code = 409, condition = "Network In Use") }) + @ResponseCode(code = 204, condition = "No Content"), + @ResponseCode(code = 401, condition = "Unauthorized"), + @ResponseCode(code = 404, condition = "Not Found"), + @ResponseCode(code = 409, condition = "Network In Use") }) public Response deleteNetwork( @PathParam("netUUID") String netUUID) { INeutronNetworkCRUD networkInterface = NeutronCRUDInterfaces.getINeutronNetworkCRUD( this); @@ -329,10 +346,12 @@ public class NeutronNetworksNorthbound { /* * network has to exist and not be in use before it can be removed */ - if (!networkInterface.networkExists(netUUID)) + if (!networkInterface.networkExists(netUUID)) { return Response.status(404).build(); - if (networkInterface.networkInUse(netUUID)) + } + if (networkInterface.networkInUse(netUUID)) { return Response.status(409).build(); + } NeutronNetwork singleton = networkInterface.getNetwork(netUUID); Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null); @@ -340,8 +359,9 @@ public class NeutronNetworksNorthbound { for (Object instance : instances) { INeutronNetworkAware service = (INeutronNetworkAware) instance; int status = service.canDeleteNetwork(singleton); - if (status < 200 || status > 299) + if (status < 200 || status > 299) { return Response.status(status).build(); + } } } networkInterface.removeNetwork(netUUID);