Fix cleanup calls in scenario tests
There were cases where addClassResourceCleanup was being used inside test cases instead of addCleanup. This patch corrects those to use addCleanup. Change-Id: Ia29541d1c89f3559a3ce22b1a27c6bcf079ce2cc
This commit is contained in:
parent
0a0f9b342a
commit
6e677eff5a
@ -103,7 +103,7 @@ class HealthMonitorScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
}
|
||||
|
||||
hm = self.mem_healthmonitor_client.create_healthmonitor(**hm_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_healthmonitor_client.cleanup_healthmonitor,
|
||||
hm[const.ID], lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
||||
|
@ -115,7 +115,7 @@ class L7PolicyScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
}
|
||||
|
||||
l7policy = self.mem_l7policy_client.create_l7policy(**l7policy_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_l7policy_client.cleanup_l7policy,
|
||||
l7policy[const.ID],
|
||||
lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
@ -112,7 +112,7 @@ class L7RuleScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
}
|
||||
|
||||
l7rule = self.mem_l7rule_client.create_l7rule(**l7rule_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_l7rule_client.cleanup_l7rule,
|
||||
l7rule[const.ID], l7policy_id=self.l7policy_id,
|
||||
lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
@ -132,7 +132,7 @@ class ListenerScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
})
|
||||
|
||||
listener = self.mem_listener_client.create_listener(**listener_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_listener_client.cleanup_listener,
|
||||
listener[const.ID],
|
||||
lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
@ -59,7 +59,7 @@ class LoadBalancerScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
self._setup_lb_network_kwargs(lb_kwargs, ip_version)
|
||||
|
||||
lb = self.mem_lb_client.create_loadbalancer(**lb_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_lb_client.cleanup_loadbalancer,
|
||||
lb[const.ID])
|
||||
|
||||
|
@ -123,7 +123,7 @@ class MemberScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
const.ID]
|
||||
|
||||
member = self.mem_member_client.create_member(**member_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_member_client.cleanup_member,
|
||||
member[const.ID], pool_id=self.pool_id,
|
||||
lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
@ -108,7 +108,7 @@ class PoolScenarioTest(test_base.LoadBalancerBaseTest):
|
||||
pool_kwargs[const.LOADBALANCER_ID] = self.lb_id
|
||||
|
||||
pool = self.mem_pool_client.create_pool(**pool_kwargs)
|
||||
self.addClassResourceCleanup(
|
||||
self.addCleanup(
|
||||
self.mem_pool_client.cleanup_pool,
|
||||
pool[const.ID],
|
||||
lb_client=self.mem_lb_client, lb_id=self.lb_id)
|
||||
|
Loading…
Reference in New Issue
Block a user