remove PortCount attribute of network object, as it is not in the spec and was causin...

diff --git a/quantum/api/views/networks.py b/quantum/api/views/networks.py
index 2242e00f7943464d0cbb72ed94194888655e4373..393725915a503818434335293ff7a92368ce66bf 100644 (file)
--- 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 d17e6ed87fad0c4add107a6b1c6adc959644e2a7..a442ad1df946cd0247b57475176e2be8fcab4ced 100644 (file)
--- 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)