openstack
/
octavia-tempest-plugin
Code Issues Proposed changes

Merge "Fix tests not honoring the provider setting."

This commit is contained in:
Zuul 2019-06-15 11:27:03 +00:00 committed by Gerrit Code Review
parent 735c71d509 0f6c647e60
commit 2ab07918a1
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
octavia_tempest_plugin/tests/api/v2/test_listener.py
View File

@ -178,7 +178,7 @@ class ListenerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb2_listener-list")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name,
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
lb_id = lb[const.ID]
self.addCleanup(

17
octavia_tempest_plugin/tests/api/v2/test_load_balancer.py
View File

@ -149,7 +149,8 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb1-delete")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name, vip_network_id=self.lb_member_vip_net[const.ID])
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addClassResourceCleanup(
self.mem_lb_client.cleanup_loadbalancer,
lb[const.ID])
@ -195,7 +196,8 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb1-cascade_delete")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name, vip_network_id=self.lb_member_vip_net[const.ID])
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addClassResourceCleanup(
self.mem_lb_client.cleanup_loadbalancer,
lb[const.ID])
@ -299,6 +301,7 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
lb = self.mem_lb_client.create_loadbalancer(
admin_state_up=True,
description=lb_description,
provider=CONF.load_balancer.provider,
name=lb_name,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addCleanup(
@ -329,6 +332,7 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
lb = self.mem_lb_client.create_loadbalancer(
admin_state_up=False,
description=lb_description,
provider=CONF.load_balancer.provider,
name=lb_name,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addCleanup(
@ -663,7 +667,8 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb1-show_stats")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name, vip_network_id=self.lb_member_vip_net[const.ID])
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addClassResourceCleanup(
self.mem_lb_client.cleanup_loadbalancer,
lb[const.ID])
@ -724,7 +729,8 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb1-status")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name, vip_network_id=self.lb_member_vip_net[const.ID])
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addClassResourceCleanup(
self.mem_lb_client.cleanup_loadbalancer,
lb[const.ID])
@ -797,7 +803,8 @@ class LoadBalancerAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb1-failover")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name, vip_network_id=self.lb_member_vip_net[const.ID])
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
self.addClassResourceCleanup(
self.mem_lb_client.cleanup_loadbalancer,
lb[const.ID])

2
octavia_tempest_plugin/tests/api/v2/test_pool.py
View File

@ -193,7 +193,7 @@ class PoolAPITest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb2_pool-list")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name,
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
lb_id = lb[const.ID]
self.addCleanup(

2
octavia_tempest_plugin/tests/scenario/v2/test_amphora.py
View File

@ -78,7 +78,7 @@ class AmphoraScenarioTest(test_base.LoadBalancerBaseTest):
"""
lb_name = data_utils.rand_name("lb_member_lb2_amphora-list")
lb = self.mem_lb_client.create_loadbalancer(
name=lb_name,
name=lb_name, provider=CONF.load_balancer.provider,
vip_network_id=self.lb_member_vip_net[const.ID])
lb_id = lb[const.ID]
self.addCleanup(