Fix for bugs 446 and 456

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

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 c08ee80e24c44f3551d949e0ff607c7264be9167..d7437c831d4eb38a248c72bbe4050114a358e32e 100644 (file)
--- 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
@@ -33,12 +33,15 @@ import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
 import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
 import org.opendaylight.controller.northbound.commons.RestMessages;
 import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
 import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
 import org.opendaylight.controller.northbound.commons.RestMessages;

+import org.opendaylight.controller.northbound.commons.exception.BadRequestException;
+import org.opendaylight.controller.northbound.commons.exception.ResourceConflictException;
+import org.opendaylight.controller.northbound.commons.exception.ResourceNotFoundException;

 import org.opendaylight.controller.northbound.commons.exception.ServiceUnavailableException;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 
 /**
 import org.opendaylight.controller.northbound.commons.exception.ServiceUnavailableException;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 
 /**

- * Open DOVE Northbound REST APIs for Network.<br>
- * This class provides REST APIs for managing open DOVE internals related to Networks
+ * Neutron Northbound REST APIs for Network.<br>
+ * This class provides REST APIs for managing neutron Networks

  *
  * <br>
  * <br>
  *
  * <br>
  * <br>


@@ -154,7 +157,7 @@ public class NeutronNetworksNorthbound {
                     + RestMessages.SERVICEUNAVAILABLE.toString());
         }
         if (!networkInterface.networkExists(netUUID)) {
                     + RestMessages.SERVICEUNAVAILABLE.toString());
         }
         if (!networkInterface.networkExists(netUUID)) {

-            return Response.status(404).build();
+            throw new ResourceNotFoundException("network UUID does not exist.");

         }
         if (fields.size() > 0) {
             NeutronNetwork ans = networkInterface.getNetwork(netUUID);
         }
         if (fields.size() > 0) {
             NeutronNetwork ans = networkInterface.getNetwork(netUUID);


@@ -189,7 +192,7 @@ public class NeutronNetworksNorthbound {
              * network ID can't already exist
              */
             if (networkInterface.networkExists(singleton.getID())) {
              * network ID can't already exist
              */
             if (networkInterface.networkExists(singleton.getID())) {

-                return Response.status(400).build();
+                throw new BadRequestException("network UUID already exists");

             }
 
             Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null);
             }
 
             Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null);


@@ -226,10 +229,10 @@ public class NeutronNetworksNorthbound {
                  * already in this bulk request
                  */
                 if (networkInterface.networkExists(test.getID())) {
                  * already in this bulk request
                  */
                 if (networkInterface.networkExists(test.getID())) {

-                    return Response.status(400).build();
+                    throw new BadRequestException("network UUID already exists");

                 }
                 if (testMap.containsKey(test.getID())) {
                 }
                 if (testMap.containsKey(test.getID())) {

-                    return Response.status(400).build();
+                    throw new BadRequestException("network UUID already exists");

                 }
                 if (instances != null) {
                     for (Object instance: instances) {
                 }
                 if (instances != null) {
                     for (Object instance: instances) {


@@ -285,10 +288,10 @@ public class NeutronNetworksNorthbound {
          * network has to exist and only a single delta is supported
          */
         if (!networkInterface.networkExists(netUUID)) {
          * network has to exist and only a single delta is supported
          */
         if (!networkInterface.networkExists(netUUID)) {

-            return Response.status(404).build();
+            throw new ResourceNotFoundException("network UUID does not exist.");

         }
         if (!input.isSingleton()) {
         }
         if (!input.isSingleton()) {

-            return Response.status(400).build();
+            throw new BadRequestException("only singleton edits supported");

         }
         NeutronNetwork delta = input.getSingleton();
 
         }
         NeutronNetwork delta = input.getSingleton();
 


@@ -297,7 +300,7 @@ public class NeutronNetworksNorthbound {
          */
         if (delta.getID() != null || delta.getTenantID() != null ||
                 delta.getStatus() != null) {
          */
         if (delta.getID() != null || delta.getTenantID() != null ||
                 delta.getStatus() != null) {

-            return Response.status(400).build();
+            throw new BadRequestException("attribute edit blocked by Neutron");

         }
 
         Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null);
         }
 
         Object[] instances = ServiceHelper.getGlobalInstances(INeutronNetworkAware.class, this, null);


@@ -347,10 +350,10 @@ public class NeutronNetworksNorthbound {
          * network has to exist and not be in use before it can be removed
          */
         if (!networkInterface.networkExists(netUUID)) {
          * network has to exist and not be in use before it can be removed
          */
         if (!networkInterface.networkExists(netUUID)) {

-            return Response.status(404).build();
+            throw new ResourceNotFoundException("network UUID does not exist.");

         }
         if (networkInterface.networkInUse(netUUID)) {
         }
         if (networkInterface.networkInUse(netUUID)) {

-            return Response.status(409).build();
+            throw new ResourceConflictException("Network ID in use");

         }
 
         NeutronNetwork singleton = networkInterface.getNetwork(netUUID);
         }
 
         NeutronNetwork singleton = networkInterface.getNetwork(netUUID);