openstack
/
neutron
Code Issues Proposed changes

Merge "Fix tempest test failing with segments extension" into stable/ocata

This commit is contained in:
Jenkins 2017-06-21 03:06:05 +00:00 committed by Gerrit Code Review
parent 7a0fee7c59 0b0ab09e7a
commit c01c39d8f4
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/tests/tempest/api/admin/test_shared_network_extension.py
View File

@ -49,6 +49,10 @@ class SharedNetworksTest(base.BaseAdminNetworkTest):
self.assertNotEmpty(items)
self.assertTrue(all(n['shared'] == shared for n in items))
def _list_subnets_ids(self, client, shared):
body = client.list_subnets(shared=shared)
return [subnet['id'] for subnet in body['subnets']]
@test.idempotent_id('6661d219-b96d-4597-ad10-51672353421a')
def test_filtering_shared_subnets(self):
# shared subnets need to be tested because their shared status isn't
@ -58,7 +62,8 @@ class SharedNetworksTest(base.BaseAdminNetworkTest):
priv = self.create_subnet(reg, client=self.client)
shared = self.create_subnet(self.shared_network,
client=self.admin_client)
self.assertIn(shared, self.client.list_subnets(shared=True)['subnets'])
self.assertIn(shared['id'],
self._list_subnets_ids(self.client, shared=True))
self.assertIn(shared,
self.admin_client.list_subnets(shared=True)['subnets'])
self.assertNotIn(priv,
@ -66,8 +71,8 @@ class SharedNetworksTest(base.BaseAdminNetworkTest):
self.assertNotIn(priv,
self.admin_client.list_subnets(shared=True)['subnets'])
self.assertIn(priv, self.client.list_subnets(shared=False)['subnets'])
self.assertIn(priv,
self.admin_client.list_subnets(shared=False)['subnets'])
self.assertIn(priv['id'],
self._list_subnets_ids(self.admin_client, shared=False))
self.assertNotIn(shared,
self.client.list_subnets(shared=False)['subnets'])
self.assertNotIn(shared,