Fix two neutron service defects
[controller.git] / opendaylight / northbound / networkconfiguration / neutron / src / main / java / org / opendaylight / controller / networkconfig / neutron / northbound / NeutronPortsNorthbound.java
index 08e5dfb..d3c262f 100644 (file)
@@ -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;
@@ -71,9 +72,9 @@ public class NeutronPortsNorthbound {
     @Produces({ MediaType.APPLICATION_JSON })
     //@TypeHint(OpenStackPorts.class)
     @StatusCodes({
-            @ResponseCode(code = 200, condition = "Operation successful"),
-            @ResponseCode(code = 401, condition = "Unauthorized"),
-            @ResponseCode(code = 501, condition = "Not Implemented") })
+        @ResponseCode(code = 200, condition = "Operation successful"),
+        @ResponseCode(code = 401, condition = "Unauthorized"),
+        @ResponseCode(code = 501, condition = "Not Implemented") })
     public Response listPorts(
             // return fields
             @QueryParam("fields") List<String> fields,
@@ -112,10 +113,11 @@ public class NeutronPortsNorthbound {
                     (queryDeviceID == null || queryDeviceID.equals(oSS.getDeviceID())) &&
                     (queryDeviceOwner == null || queryDeviceOwner.equals(oSS.getDeviceOwner())) &&
                     (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
-                if (fields.size() > 0)
+                if (fields.size() > 0) {
                     ans.add(extractFields(oSS,fields));
-                else
+                } else {
                     ans.add(oSS);
+                }
             }
         }
         //TODO: apply pagination to results
@@ -131,10 +133,10 @@ public class NeutronPortsNorthbound {
     @Produces({ MediaType.APPLICATION_JSON })
     //@TypeHint(OpenStackPorts.class)
     @StatusCodes({
-            @ResponseCode(code = 200, condition = "Operation successful"),
-            @ResponseCode(code = 401, condition = "Unauthorized"),
-            @ResponseCode(code = 404, condition = "Not Found"),
-            @ResponseCode(code = 501, condition = "Not Implemented") })
+        @ResponseCode(code = 200, condition = "Operation successful"),
+        @ResponseCode(code = 401, condition = "Unauthorized"),
+        @ResponseCode(code = 404, condition = "Not Found"),
+        @ResponseCode(code = 501, condition = "Not Implemented") })
     public Response showPort(
             @PathParam("portUUID") String portUUID,
             // return fields
@@ -144,15 +146,17 @@ public class NeutronPortsNorthbound {
             throw new ServiceUnavailableException("Port CRUD Interface "
                     + RestMessages.SERVICEUNAVAILABLE.toString());
         }
-        if (!portInterface.portExists(portUUID))
+        if (!portInterface.portExists(portUUID)) {
             return Response.status(404).build();
+        }
         if (fields.size() > 0) {
             NeutronPort ans = portInterface.getPort(portUUID);
             return Response.status(200).entity(
                     new NeutronPortRequest(extractFields(ans, fields))).build();
-        } else
+        } else {
             return Response.status(200).entity(
                     new NeutronPortRequest(portInterface.getPort(portUUID))).build();
+        }
     }
 
     /**
@@ -163,14 +167,14 @@ public class NeutronPortsNorthbound {
     @Consumes({ MediaType.APPLICATION_JSON })
     //@TypeHint(OpenStackPorts.class)
     @StatusCodes({
-            @ResponseCode(code = 201, condition = "Created"),
-            @ResponseCode(code = 400, condition = "Bad Request"),
-            @ResponseCode(code = 401, condition = "Unauthorized"),
-            @ResponseCode(code = 403, condition = "Forbidden"),
-            @ResponseCode(code = 404, condition = "Not Found"),
-            @ResponseCode(code = 409, condition = "Conflict"),
-            @ResponseCode(code = 501, condition = "Not Implemented"),
-            @ResponseCode(code = 503, condition = "MAC generation failure") })
+        @ResponseCode(code = 201, condition = "Created"),
+        @ResponseCode(code = 400, condition = "Bad Request"),
+        @ResponseCode(code = 401, condition = "Unauthorized"),
+        @ResponseCode(code = 403, condition = "Forbidden"),
+        @ResponseCode(code = 404, condition = "Not Found"),
+        @ResponseCode(code = 409, condition = "Conflict"),
+        @ResponseCode(code = 501, condition = "Not Implemented"),
+        @ResponseCode(code = 503, condition = "MAC generation failure") })
     public Response createPorts(final NeutronPortRequest input) {
         INeutronPortCRUD portInterface = NeutronCRUDInterfaces.getINeutronPortCRUD(this);
         if (portInterface == null) {
@@ -194,24 +198,30 @@ public class NeutronPortsNorthbound {
              * the port must be part of an existing network, must not already exist,
              * have a valid MAC and the MAC not be in use
              */
-            if (singleton.getNetworkUUID() == null)
+            if (singleton.getNetworkUUID() == null) {
                 return Response.status(400).build();
-            if (portInterface.portExists(singleton.getID()))
+            }
+            if (portInterface.portExists(singleton.getID())) {
                 return Response.status(400).build();
-            if (!networkInterface.networkExists(singleton.getNetworkUUID()))
+            }
+            if (!networkInterface.networkExists(singleton.getNetworkUUID())) {
                 return Response.status(404).build();
+            }
             if (singleton.getMacAddress() == null ||
-                    !singleton.getMacAddress().matches("^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$"))
+                    !singleton.getMacAddress().matches("^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$")) {
                 return Response.status(400).build();
-            if (portInterface.macInUse(singleton.getMacAddress()))
+            }
+            if (portInterface.macInUse(singleton.getMacAddress())) {
                 return Response.status(409).build();
+            }
             Object[] instances = ServiceHelper.getGlobalInstances(INeutronPortAware.class, this, null);
             if (instances != null) {
                 for (Object instance : instances) {
                     INeutronPortAware service = (INeutronPortAware) instance;
                     int status = service.canCreatePort(singleton);
-                    if (status < 200 || status > 299)
+                    if (status < 200 || status > 299) {
                         return Response.status(status).build();
+                    }
                 }
             }
             /*
@@ -225,18 +235,23 @@ public class NeutronPortsNorthbound {
                 Iterator<Neutron_IPs> fixedIPIterator = fixedIPs.iterator();
                 while (fixedIPIterator.hasNext()) {
                     Neutron_IPs ip = fixedIPIterator.next();
-                    if (ip.getSubnetUUID() == null)
+                    if (ip.getSubnetUUID() == null) {
                         return Response.status(400).build();
-                    if (!subnetInterface.subnetExists(ip.getSubnetUUID()))
+                    }
+                    if (!subnetInterface.subnetExists(ip.getSubnetUUID())) {
                         return Response.status(400).build();
+                    }
                     NeutronSubnet subnet = subnetInterface.getSubnet(ip.getSubnetUUID());
-                    if (!singleton.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID()))
+                    if (!singleton.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID())) {
                         return Response.status(400).build();
+                    }
                     if (ip.getIpAddress() != null) {
-                        if (!subnet.isValidIP(ip.getIpAddress()))
+                        if (!subnet.isValidIP(ip.getIpAddress())) {
                             return Response.status(400).build();
-                        if (subnet.isIPInUse(ip.getIpAddress()))
+                        }
+                        if (subnet.isIPInUse(ip.getIpAddress())) {
                             return Response.status(409).build();
+                        }
                     }
                 }
             }
@@ -262,33 +277,41 @@ public class NeutronPortsNorthbound {
                  * have a valid MAC and the MAC not be in use.  Further the bulk request
                  * can't already contain a new port with the same UUID
                  */
-                if (portInterface.portExists(test.getID()))
+                if (portInterface.portExists(test.getID())) {
                     return Response.status(400).build();
-                if (testMap.containsKey(test.getID()))
+                }
+                if (testMap.containsKey(test.getID())) {
                     return Response.status(400).build();
+                }
                 for (NeutronPort check : testMap.values()) {
-                    if (test.getMacAddress().equalsIgnoreCase(check.getMacAddress()))
+                    if (test.getMacAddress().equalsIgnoreCase(check.getMacAddress())) {
                         return Response.status(409).build();
+                    }
                     for (Neutron_IPs test_fixedIP : test.getFixedIPs()) {
                         for (Neutron_IPs check_fixedIP : check.getFixedIPs()) {
-                            if (test_fixedIP.getIpAddress().equals(check_fixedIP.getIpAddress()))
+                            if (test_fixedIP.getIpAddress().equals(check_fixedIP.getIpAddress())) {
                                 return Response.status(409).build();
+                            }
                         }
                     }
                 }
                 testMap.put(test.getID(), test);
-                if (!networkInterface.networkExists(test.getNetworkUUID()))
+                if (!networkInterface.networkExists(test.getNetworkUUID())) {
                     return Response.status(404).build();
-                if (!test.getMacAddress().matches("^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$"))
+                }
+                if (!test.getMacAddress().matches("^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$")) {
                     return Response.status(400).build();
-                if (portInterface.macInUse(test.getMacAddress()))
+                }
+                if (portInterface.macInUse(test.getMacAddress())) {
                     return Response.status(409).build();
+                }
                 if (instances != null) {
                     for (Object instance : instances) {
                         INeutronPortAware service = (INeutronPortAware) instance;
                         int status = service.canCreatePort(test);
-                        if (status < 200 || status > 299)
+                        if (status < 200 || status > 299) {
                             return Response.status(status).build();
+                        }
                     }
                 }
                 /*
@@ -302,20 +325,25 @@ public class NeutronPortsNorthbound {
                     Iterator<Neutron_IPs> fixedIPIterator = fixedIPs.iterator();
                     while (fixedIPIterator.hasNext()) {
                         Neutron_IPs ip = fixedIPIterator.next();
-                        if (ip.getSubnetUUID() == null)
+                        if (ip.getSubnetUUID() == null) {
                             return Response.status(400).build();
-                        if (!subnetInterface.subnetExists(ip.getSubnetUUID()))
+                        }
+                        if (!subnetInterface.subnetExists(ip.getSubnetUUID())) {
                             return Response.status(400).build();
+                        }
                         NeutronSubnet subnet = subnetInterface.getSubnet(ip.getSubnetUUID());
-                        if (!test.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID()))
+                        if (!test.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID())) {
                             return Response.status(400).build();
+                        }
                         if (ip.getIpAddress() != null) {
-                            if (!subnet.isValidIP(ip.getIpAddress()))
+                            if (!subnet.isValidIP(ip.getIpAddress())) {
                                 return Response.status(400).build();
+                            }
                             //TODO: need to add consideration for a fixed IP being assigned the same address as a allocated IP in the
                             //same bulk create
-                            if (subnet.isIPInUse(ip.getIpAddress()))
+                            if (subnet.isIPInUse(ip.getIpAddress())) {
                                 return Response.status(409).build();
+                            }
                         }
                     }
                 }
@@ -346,13 +374,13 @@ public class NeutronPortsNorthbound {
     @Consumes({ MediaType.APPLICATION_JSON })
     //@TypeHint(OpenStackPorts.class)
     @StatusCodes({
-            @ResponseCode(code = 200, condition = "Operation successful"),
-            @ResponseCode(code = 400, condition = "Bad Request"),
-            @ResponseCode(code = 401, condition = "Unauthorized"),
-            @ResponseCode(code = 403, condition = "Forbidden"),
-            @ResponseCode(code = 404, condition = "Not Found"),
-            @ResponseCode(code = 409, condition = "Conflict"),
-            @ResponseCode(code = 501, condition = "Not Implemented") })
+        @ResponseCode(code = 200, condition = "Operation successful"),
+        @ResponseCode(code = 400, condition = "Bad Request"),
+        @ResponseCode(code = 401, condition = "Unauthorized"),
+        @ResponseCode(code = 403, condition = "Forbidden"),
+        @ResponseCode(code = 404, condition = "Not Found"),
+        @ResponseCode(code = 409, condition = "Conflict"),
+        @ResponseCode(code = 501, condition = "Not Implemented") })
     public Response updatePort(
             @PathParam("portUUID") String portUUID,
             NeutronPortRequest input
@@ -369,26 +397,30 @@ public class NeutronPortsNorthbound {
         }
 
         // port has to exist and only a single delta is supported
-        if (!portInterface.portExists(portUUID))
+        if (!portInterface.portExists(portUUID)) {
             return Response.status(404).build();
+        }
         NeutronPort target = portInterface.getPort(portUUID);
-        if (!input.isSingleton())
+        if (!input.isSingleton()) {
             return Response.status(400).build();
+        }
         NeutronPort singleton = input.getSingleton();
         NeutronPort original = portInterface.getPort(portUUID);
 
         // deltas restricted by Neutron
         if (singleton.getID() != null || singleton.getTenantID() != null ||
-                singleton.getStatus() != null)
+                singleton.getStatus() != null) {
             return Response.status(400).build();
+        }
 
         Object[] instances = ServiceHelper.getGlobalInstances(INeutronPortAware.class, this, null);
         if (instances != null) {
             for (Object instance : instances) {
                 INeutronPortAware service = (INeutronPortAware) instance;
                 int status = service.canUpdatePort(singleton, original);
-                if (status < 200 || status > 299)
+                if (status < 200 || status > 299) {
                     return Response.status(status).build();
+                }
             }
         }
 
@@ -398,25 +430,30 @@ public class NeutronPortsNorthbound {
             Iterator<Neutron_IPs> fixedIPIterator = fixedIPs.iterator();
             while (fixedIPIterator.hasNext()) {
                 Neutron_IPs ip = fixedIPIterator.next();
-                if (ip.getSubnetUUID() == null)
+                if (ip.getSubnetUUID() == null) {
                     return Response.status(400).build();
-                if (!subnetInterface.subnetExists(ip.getSubnetUUID()))
+                }
+                if (!subnetInterface.subnetExists(ip.getSubnetUUID())) {
                     return Response.status(400).build();
+                }
                 NeutronSubnet subnet = subnetInterface.getSubnet(ip.getSubnetUUID());
-                if (!target.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID()))
+                if (!target.getNetworkUUID().equalsIgnoreCase(subnet.getNetworkUUID())) {
                     return Response.status(400).build();
+                }
                 if (ip.getIpAddress() != null) {
-                    if (!subnet.isValidIP(ip.getIpAddress()))
+                    if (!subnet.isValidIP(ip.getIpAddress())) {
                         return Response.status(400).build();
-                    if (subnet.isIPInUse(ip.getIpAddress()))
+                    }
+                    if (subnet.isIPInUse(ip.getIpAddress())) {
                         return Response.status(409).build();
+                    }
                 }
             }
         }
 
-//        TODO: Support change of security groups
+        //        TODO: Support change of security groups
         // update the port and return the modified object
-        portInterface.updatePort(portUUID, singleton);
+                portInterface.updatePort(portUUID, singleton);
         NeutronPort updatedPort = portInterface.getPort(portUUID);
         if (instances != null) {
             for (Object instance : instances) {
@@ -449,20 +486,23 @@ public class NeutronPortsNorthbound {
         }
 
         // port has to exist and not be owned by anyone.  then it can be removed from the cache
-        if (!portInterface.portExists(portUUID))
+        if (!portInterface.portExists(portUUID)) {
             return Response.status(404).build();
+        }
         NeutronPort port = portInterface.getPort(portUUID);
         if (port.getDeviceID() != null ||
-                port.getDeviceOwner() != null)
+                port.getDeviceOwner() != null) {
             Response.status(403).build();
+        }
         NeutronPort singleton = portInterface.getPort(portUUID);
         Object[] instances = ServiceHelper.getGlobalInstances(INeutronPortAware.class, this, null);
         if (instances != null) {
             for (Object instance : instances) {
                 INeutronPortAware service = (INeutronPortAware) instance;
                 int status = service.canDeletePort(singleton);
-                if (status < 200 || status > 299)
+                if (status < 200 || status > 299) {
                     return Response.status(status).build();
+                }
             }
         }
         portInterface.removePort(portUUID);