Refactor tests to use create_network convenience params.
Use create_network method instead of
- create_network_keystone_v3
- create_shared_network
Change-Id: I3c494ccb9e5749a346621db9b3813b4dc7921db0
diff --git a/neutron_tempest_plugin/api/admin/test_extension_driver_port_security_admin.py b/neutron_tempest_plugin/api/admin/test_extension_driver_port_security_admin.py
index 60af89e..d449ead 100644
--- a/neutron_tempest_plugin/api/admin/test_extension_driver_port_security_admin.py
+++ b/neutron_tempest_plugin/api/admin/test_extension_driver_port_security_admin.py
@@ -28,7 +28,7 @@
@decorators.attr(type='negative')
@decorators.idempotent_id('d39a96e2-2dea-4feb-8093-e7ac991ce6f8')
def test_create_port_security_false_on_shared_network(self):
- network = self.create_shared_network()
+ network = self.create_network(shared=True)
self.assertTrue(network['shared'])
self.create_subnet(network, client=self.admin_client)
self.assertRaises(lib_exc.Forbidden, self.create_port,
diff --git a/neutron_tempest_plugin/api/admin/test_networks.py b/neutron_tempest_plugin/api/admin/test_networks.py
index bb7ac24..74e72ef 100644
--- a/neutron_tempest_plugin/api/admin/test_networks.py
+++ b/neutron_tempest_plugin/api/admin/test_networks.py
@@ -24,50 +24,51 @@
@decorators.idempotent_id('d3c76044-d067-4cb0-ae47-8cdd875c7f67')
@utils.requires_ext(extension="project-id", service="network")
- def test_admin_create_network_keystone_v3(self):
+ def test_create_network_with_project(self):
project_id = self.client.tenant_id # non-admin
name = 'admin-created-with-project_id'
- new_net = self.create_network_keystone_v3(name, project_id,
- client=self.admin_client)
- self.assertEqual(name, new_net['name'])
- self.assertEqual(project_id, new_net['project_id'])
- self.assertEqual(project_id, new_net['tenant_id'])
+ network = self.create_network(name, project_id=project_id,
+ client=self.admin_client)
+ self.assertEqual(name, network['name'])
+ self.assertEqual(project_id, network['project_id'])
+ self.assertEqual(project_id, network['tenant_id'])
- body = self.client.list_networks(id=new_net['id'])
- lookup_net = body['networks'][0]
- self.assertEqual(name, lookup_net['name'])
- self.assertEqual(project_id, lookup_net['project_id'])
- self.assertEqual(project_id, lookup_net['tenant_id'])
+ observed_network = self.client.list_networks(
+ id=network['id'])['networks'][0]
+ self.assertEqual(name, observed_network['name'])
+ self.assertEqual(project_id, observed_network['project_id'])
+ self.assertEqual(project_id, observed_network['tenant_id'])
@decorators.idempotent_id('8d21aaca-4364-4eb9-8b79-44b4fff6373b')
@utils.requires_ext(extension="project-id", service="network")
- def test_admin_create_network_keystone_v3_and_tenant(self):
+ def test_create_network_with_project_and_tenant(self):
project_id = self.client.tenant_id # non-admin
name = 'created-with-project-and-tenant'
- new_net = self.create_network_keystone_v3(
- name, project_id, tenant_id=project_id, client=self.admin_client)
- self.assertEqual(name, new_net['name'])
- self.assertEqual(project_id, new_net['project_id'])
- self.assertEqual(project_id, new_net['tenant_id'])
+ network = self.create_network(name, project_id=project_id,
+ tenant_id=project_id,
+ client=self.admin_client)
+ self.assertEqual(name, network['name'])
+ self.assertEqual(project_id, network['project_id'])
+ self.assertEqual(project_id, network['tenant_id'])
- body = self.client.list_networks(id=new_net['id'])
- lookup_net = body['networks'][0]
- self.assertEqual(name, lookup_net['name'])
- self.assertEqual(project_id, lookup_net['project_id'])
- self.assertEqual(project_id, lookup_net['tenant_id'])
+ observed_network = self.client.list_networks(
+ id=network['id'])['networks'][0]
+ self.assertEqual(name, observed_network['name'])
+ self.assertEqual(project_id, observed_network['project_id'])
+ self.assertEqual(project_id, observed_network['tenant_id'])
@decorators.idempotent_id('08b92179-669d-45ee-8233-ef6611190809')
@utils.requires_ext(extension="project-id", service="network")
- def test_admin_create_network_keystone_v3_and_other_tenant(self):
+ def test_create_network_with_project_and_other_tenant(self):
project_id = self.client.tenant_id # non-admin
other_tenant = uuidutils.generate_uuid()
name = 'created-with-project-and-other-tenant'
e = self.assertRaises(lib_exc.BadRequest,
- self.create_network_keystone_v3, name,
- project_id, tenant_id=other_tenant,
+ self.create_network, name,
+ project_id=project_id, tenant_id=other_tenant,
client=self.admin_client)
expected_message = "'project_id' and 'tenant_id' do not match"
self.assertEqual(expected_message, e.resp_body['message'])
diff --git a/neutron_tempest_plugin/api/admin/test_shared_network_extension.py b/neutron_tempest_plugin/api/admin/test_shared_network_extension.py
index 16375ec..cef0ffc 100644
--- a/neutron_tempest_plugin/api/admin/test_shared_network_extension.py
+++ b/neutron_tempest_plugin/api/admin/test_shared_network_extension.py
@@ -29,7 +29,7 @@
@classmethod
def resource_setup(cls):
super(SharedNetworksTest, cls).resource_setup()
- cls.shared_network = cls.create_shared_network()
+ cls.shared_network = cls.create_network(shared=True)
@decorators.idempotent_id('6661d219-b96d-4597-ad10-55766123421a')
def test_filtering_shared_networks(self):
@@ -84,7 +84,7 @@
@decorators.idempotent_id('6661d219-b96d-4597-ad10-55766ce4abf7')
def test_create_update_shared_network(self):
- shared_network = self.create_shared_network()
+ shared_network = self.create_network(shared=True)
net_id = shared_network['id']
self.assertEqual('ACTIVE', shared_network['status'])
self.assertIsNotNone(shared_network['id'])
@@ -156,7 +156,7 @@
@classmethod
def resource_setup(cls):
super(AllowedAddressPairSharedNetworkTest, cls).resource_setup()
- cls.network = cls.create_shared_network()
+ cls.network = cls.create_network(shared=True)
cls.create_subnet(cls.network, client=cls.admin_client)
@decorators.idempotent_id('86c3529b-1231-40de-803c-ffffffff1fff')
diff --git a/neutron_tempest_plugin/api/test_networks.py b/neutron_tempest_plugin/api/test_networks.py
index 19f4fcb..7e9943d 100644
--- a/neutron_tempest_plugin/api/test_networks.py
+++ b/neutron_tempest_plugin/api/test_networks.py
@@ -75,28 +75,29 @@
@decorators.idempotent_id('0cc0552f-afaf-4231-b7a7-c2a1774616da')
@utils.requires_ext(extension="project-id", service="network")
- def test_create_network_keystone_v3(self):
+ def test_create_network_with_project(self):
project_id = self.client.tenant_id
name = 'created-with-project_id'
- new_net = self.create_network_keystone_v3(name, project_id)
- self.assertEqual(name, new_net['name'])
- self.assertEqual(project_id, new_net['project_id'])
- self.assertEqual(project_id, new_net['tenant_id'])
+ network = self.create_network(name, project_id=project_id)
+ self.assertEqual(name, network['name'])
+ self.assertEqual(project_id, network['project_id'])
+ self.assertEqual(project_id, network['tenant_id'])
- body = self.client.list_networks(id=new_net['id'])['networks'][0]
- self.assertEqual(name, body['name'])
+ observed_network = self.client.list_networks(
+ id=network['id'])['networks'][0]
+ self.assertEqual(name, observed_network['name'])
new_name = 'create-with-project_id-2'
- body = self.client.update_network(new_net['id'], name=new_name)
- new_net = body['network']
- self.assertEqual(new_name, new_net['name'])
- self.assertEqual(project_id, new_net['project_id'])
- self.assertEqual(project_id, new_net['tenant_id'])
+ updated_network = self.client.update_network(
+ network['id'], name=new_name)['network']
+ self.assertEqual(new_name, updated_network['name'])
+ self.assertEqual(project_id, updated_network['project_id'])
+ self.assertEqual(project_id, updated_network['tenant_id'])
@decorators.idempotent_id('94e2a44c-3367-4253-8c2a-22deaf59e96c')
@utils.requires_ext(extension="dns-integration",
- service="network")
+ service="network")
def test_create_update_network_dns_domain(self):
domain1 = 'test.org.'
body = self.create_network(dns_domain=domain1)
diff --git a/neutron_tempest_plugin/api/test_qos.py b/neutron_tempest_plugin/api/test_qos.py
index d31eab8..2bf99bf 100644
--- a/neutron_tempest_plugin/api/test_qos.py
+++ b/neutron_tempest_plugin/api/test_qos.py
@@ -209,8 +209,8 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=False)
- network = self.create_shared_network('test network',
- qos_policy_id=policy['id'])
+ network = self.create_network('test network', shared=True,
+ qos_policy_id=policy['id'])
retrieved_network = self.admin_client.show_network(network['id'])
self.assertEqual(
@@ -251,7 +251,7 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=False)
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
retrieved_network = self.admin_client.show_network(network['id'])
self.assertIsNone(retrieved_network['network']['qos_policy_id'])
@@ -266,7 +266,7 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=True)
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
port = self.create_port(network, qos_policy_id=policy['id'])
retrieved_port = self.admin_client.show_port(port['id'])
@@ -275,7 +275,7 @@
@decorators.idempotent_id('49e02f5a-e1dd-41d5-9855-cfa37f2d195e')
def test_policy_association_with_port_nonexistent_policy(self):
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
self.assertRaises(
exceptions.NotFound,
self.create_port,
@@ -287,7 +287,7 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=False)
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
self.assertRaises(
exceptions.NotFound,
self.create_port,
@@ -298,7 +298,7 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=True)
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
port = self.create_port(network)
retrieved_port = self.admin_client.show_port(port['id'])
self.assertIsNone(retrieved_port['port']['qos_policy_id'])
@@ -313,7 +313,8 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=True)
- self.create_shared_network('test network', qos_policy_id=policy['id'])
+ self.create_network('test network', qos_policy_id=policy['id'],
+ shared=True)
self.assertRaises(
exceptions.Conflict,
self.admin_client.delete_qos_policy, policy['id'])
@@ -323,7 +324,7 @@
policy = self.create_qos_policy(name='test-policy',
description='test policy',
shared=True)
- network = self.create_shared_network('test network')
+ network = self.create_network('test network', shared=True)
self.create_port(network, qos_policy_id=policy['id'])
self.assertRaises(
exceptions.Conflict,
diff --git a/neutron_tempest_plugin/api/test_trunk.py b/neutron_tempest_plugin/api/test_trunk.py
index e02cf92..1a000fd 100644
--- a/neutron_tempest_plugin/api/test_trunk.py
+++ b/neutron_tempest_plugin/api/test_trunk.py
@@ -240,10 +240,9 @@
def create_provider_network(self):
foo_net = config.CONF.neutron_plugin_options.provider_vlans[0]
- post_body = {'network_name': data_utils.rand_name('vlan-net'),
- 'provider:network_type': 'vlan',
- 'provider:physical_network': foo_net}
- return self.create_shared_network(**post_body)
+ return self.create_network(name=data_utils.rand_name('vlan-net'),
+ provider_network_type='vlan',
+ provider_physical_network=foo_net)
@decorators.idempotent_id('0f05d98e-41f5-4629-dada-9aee269c9602')
def test_add_subport(self):
@@ -286,13 +285,13 @@
super(TrunkTestMtusJSONBase, self).setUp()
# VXLAN autocomputed MTU (1450) is smaller than that of GRE (1458)
- vxlan_kwargs = {'network_name': data_utils.rand_name('vxlan-net'),
- 'provider:network_type': 'vxlan'}
- self.smaller_mtu_net = self.create_shared_network(**vxlan_kwargs)
+ self.smaller_mtu_net = self.create_network(
+ name=data_utils.rand_name('vxlan-net'),
+ provider_network_type='vxlan')
- gre_kwargs = {'network_name': data_utils.rand_name('gre-net'),
- 'provider:network_type': 'gre'}
- self.larger_mtu_net = self.create_shared_network(**gre_kwargs)
+ self.larger_mtu_net = self.create_network(
+ name=data_utils.rand_name('gre-net'),
+ provider_network_type='gre')
self.smaller_mtu_port = self.create_port(self.smaller_mtu_net)
self.smaller_mtu_port_2 = self.create_port(self.smaller_mtu_net)