x/vmware-nsx
Code Issues Proposed changes

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)

Browse Source
This commit is contained in:
Dan Wendlandt 2011-07-31 11:53:36 -07:00
parent 840d4f1417
commit 719eb42a97
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/api/views/networks.py
View File

@ -54,8 +54,7 @@ class ViewBuilder(object):
ports = network_data.get('net-ports', None) ports = network_data.get('net-ports', None)
portcount = ports and len(ports) or 0 portcount = ports and len(ports) or 0
return dict(network=dict(id=network_data['net-id'], return dict(network=dict(id=network_data['net-id'],
name=network_data['net-name'], name=network_data['net-name']))
PortCount=portcount))
def _build_port(self, port_data): def _build_port(self, port_data):
"""Return details about a specific logical port.""" """Return details about a specific logical port."""

6
tests/unit/test_api.py
View File

@ -114,8 +114,7 @@ class APITest(unittest.TestCase):
network_data = self._net_serializer.deserialize( network_data = self._net_serializer.deserialize(
show_network_res.body, content_type) show_network_res.body, content_type)
self.assertEqual({'id': network_id, self.assertEqual({'id': network_id,
'name': self.network_name, 'name': self.network_name},
'PortCount': 0},
network_data['network']) network_data['network'])
LOG.debug("_test_show_network - format:%s - END", format) LOG.debug("_test_show_network - format:%s - END", format)
@ -147,8 +146,7 @@ class APITest(unittest.TestCase):
network_data = self._net_serializer.deserialize( network_data = self._net_serializer.deserialize(
show_network_res.body, content_type) show_network_res.body, content_type)
self.assertEqual({'id': network_id, self.assertEqual({'id': network_id,
'name': new_name, 'name': new_name},
'PortCount': 0},
network_data['network']) network_data['network'])
LOG.debug("_test_rename_network - format:%s - END", format) LOG.debug("_test_rename_network - format:%s - END", format)