WIP.

Still need to align APIs for interface plug/unplug

diff --git a/quantum/api/networks.py b/quantum/api/networks.py
index eecff05d12e9f8de840d498a3de4312c71213c21..2078583c3cc15804a7cad29bcdf6f4e42e2cb2bf 100644 (file)
--- a/quantum/api/networks.py
+++ b/quantum/api/networks.py
@@ -111,7 +111,7 @@ class Controller(common.QuantumController):
                                       request_params['name'])
         builder = networks_view.get_view_builder(request)
         result = builder.build(network)['network']
-        #MUST RETURN 202
+        #MUST RETURN 202???
         return dict(network=result)
 
     def update(self, request, tenant_id, id):
@@ -124,7 +124,7 @@ class Controller(common.QuantumController):
             return faults.Fault(e)
         try:
             self._plugin.rename_network(tenant_id, id,
-                                        request_params['net-name'])
+                                        request_params['name'])
             return exc.HTTPNoContent()
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))

diff --git a/quantum/api/ports.py b/quantum/api/ports.py
index 042ea673c3a6ac0aee6498e803dc4499db6aec4d..feb5f960b10c7293deee7ddb477dc9036138daa0 100644 (file)
--- a/quantum/api/ports.py
+++ b/quantum/api/ports.py
@@ -29,7 +29,7 @@ class Controller(common.QuantumController):
     """ Port API controller for Quantum API """
 
     _port_ops_param_list = [{
-        'param-name': 'port-state',
+        'param-name': 'state',
         'default-value': 'DOWN',
         'required': False}, ]
 
@@ -89,10 +89,10 @@ class Controller(common.QuantumController):
         try:
             port = self._plugin.create_port(tenant_id,
                                             network_id,
-                                            request_params['port-state'])
+                                            request_params['state'])
             builder = ports_view.get_view_builder(request)
-            result = builder.build(port)
-            return dict(ports=result)
+            result = builder.build(port)['port']
+            return dict(port=result)
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))
         except exception.StateInvalid as e:
@@ -107,11 +107,9 @@ class Controller(common.QuantumController):
         except exc.HTTPError as e:
             return faults.Fault(e)
         try:
-            port = self._plugin.update_port(tenant_id, network_id, id,
-                                            request_params['port-state'])
-            builder = ports_view.get_view_builder(request)
-            result = builder.build(port, True)
-            return dict(ports=result)
+            self._plugin.update_port(tenant_id, network_id, id,
+                                     request_params['state'])
+            return exc.HTTPNoContent()
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))
         except exception.PortNotFound as e:
@@ -124,8 +122,7 @@ class Controller(common.QuantumController):
         #look for port state in request
         try:
             self._plugin.delete_port(tenant_id, network_id, id)
-            return exc.HTTPAccepted()
-            # TODO(salvatore-orlando): Handle portInUse error
+            return exc.HTTPNoContent()
         except exception.NetworkNotFound as e:
             return faults.Fault(faults.NetworkNotFound(e))
         except exception.PortNotFound as e: