From 2ab7ae449b7d293011e991ae45c8899388946938 Mon Sep 17 00:00:00 2001 From: Dan Wendlandt Date: Sun, 31 Jul 2011 11:53:36 -0700 Subject: [PATCH 1/3] remove PortCount attribute of network object, as it is not in the spec and was causing us to hit bug 818321 (note: this commit does not fix the underlyingproblem with xml deserialization, it just makes sure we don't hit it with the existing API code) --- quantum/api/views/networks.py | 3 +-- tests/unit/test_api.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/quantum/api/views/networks.py b/quantum/api/views/networks.py index 2242e00f79..393725915a 100644 --- a/quantum/api/views/networks.py +++ b/quantum/api/views/networks.py @@ -54,8 +54,7 @@ class ViewBuilder(object): ports = network_data.get('net-ports', None) portcount = ports and len(ports) or 0 return dict(network=dict(id=network_data['net-id'], - name=network_data['net-name'], - PortCount=portcount)) + name=network_data['net-name'])) def _build_port(self, port_data): """Return details about a specific logical port.""" diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py index d17e6ed87f..a442ad1df9 100644 --- a/tests/unit/test_api.py +++ b/tests/unit/test_api.py @@ -114,8 +114,7 @@ class APITest(unittest.TestCase): network_data = self._net_serializer.deserialize( show_network_res.body, content_type) self.assertEqual({'id': network_id, - 'name': self.network_name, - 'PortCount': 0}, + 'name': self.network_name}, network_data['network']) LOG.debug("_test_show_network - format:%s - END", format) @@ -147,8 +146,7 @@ class APITest(unittest.TestCase): network_data = self._net_serializer.deserialize( show_network_res.body, content_type) self.assertEqual({'id': network_id, - 'name': new_name, - 'PortCount': 0}, + 'name': new_name}, network_data['network']) LOG.debug("_test_rename_network - format:%s - END", format) From 55ca7f0432ac9cfe749bef76e9ebb5b69f9bfed6 Mon Sep 17 00:00:00 2001 From: Dan Wendlandt Date: Sun, 31 Jul 2011 17:46:35 -0700 Subject: [PATCH 2/3] also remove line that computes portcount, as it is unneeded now that we don't return it --- quantum/api/views/networks.py | 1 - 1 file changed, 1 deletion(-) diff --git a/quantum/api/views/networks.py b/quantum/api/views/networks.py index 393725915a..688cbfc47b 100644 --- a/quantum/api/views/networks.py +++ b/quantum/api/views/networks.py @@ -52,7 +52,6 @@ class ViewBuilder(object): """Return a detailed model of a network.""" # net-ports might not be present in response from plugin ports = network_data.get('net-ports', None) - portcount = ports and len(ports) or 0 return dict(network=dict(id=network_data['net-id'], name=network_data['net-name'])) From 81c505c630ff55bf0691c6119e38f5dca41cb4b1 Mon Sep 17 00:00:00 2001 From: Dan Wendlandt Date: Sun, 31 Jul 2011 18:21:59 -0700 Subject: [PATCH 3/3] removing a few additional lines that aren't needed once we don't calculate port count --- quantum/api/views/networks.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/quantum/api/views/networks.py b/quantum/api/views/networks.py index 688cbfc47b..eaa9901ff9 100644 --- a/quantum/api/views/networks.py +++ b/quantum/api/views/networks.py @@ -50,8 +50,6 @@ class ViewBuilder(object): def _build_detail(self, network_data): """Return a detailed model of a network.""" - # net-ports might not be present in response from plugin - ports = network_data.get('net-ports', None) return dict(network=dict(id=network_data['net-id'], name=network_data['net-name']))