From 6a99c4c8a394721da119fd23944f1d3171a1c8f4 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Tue, 2 Aug 2011 01:14:09 +0100 Subject: [PATCH] WIP. Still need to align APIs for interface plug/unplug --- quantum/api/networks.py | 4 ++-- quantum/api/ports.py | 19 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/quantum/api/networks.py b/quantum/api/networks.py index eecff05d1..2078583c3 100644 --- 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 042ea673c..feb5f960b 100644 --- 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: -- 2.45.2