Merge "fixed health monitor setting during tempest test,"
This commit is contained in:
commit
f32a0ec5bd
|
@ -100,15 +100,14 @@ class AdminStateTests(testscenarios.TestWithScenarios,
|
||||||
cls.member_id = cls.member['id']
|
cls.member_id = cls.member['id']
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def resource_set_health_monitor(cls, admin_state_up_flag):
|
def resource_set_health_monitor(cls, admin_state_up_flag, creator):
|
||||||
cls.create_hm_kwargs = {'type': cls.protocol,
|
cls.create_hm_kwargs = {'type': cls.protocol,
|
||||||
'delay': 3,
|
'delay': 3,
|
||||||
'max_retries': 10,
|
'max_retries': 10,
|
||||||
'timeout': 5,
|
'timeout': 5,
|
||||||
'pool_id': cls.pool_id,
|
'pool_id': cls.pool_id,
|
||||||
'admin_state_up': admin_state_up_flag}
|
'admin_state_up': admin_state_up_flag}
|
||||||
cls.health_monitor = cls._create_health_monitor(
|
cls.health_monitor = creator(**cls.create_hm_kwargs)
|
||||||
**cls.create_hm_kwargs)
|
|
||||||
cls.health_monitor_id = cls.health_monitor['id']
|
cls.health_monitor_id = cls.health_monitor['id']
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
|
@ -74,8 +74,8 @@ class BaseHealthMonitorAdminStateTest(base_ddt.AdminStateTests):
|
||||||
|
|
||||||
self.resource_setup_pool(self.pool_flag)
|
self.resource_setup_pool(self.pool_flag)
|
||||||
self.addCleanup(self._delete_pool, self.pool_id)
|
self.addCleanup(self._delete_pool, self.pool_id)
|
||||||
|
self.resource_set_health_monitor(self.healthmonitor_flag,
|
||||||
self.resource_set_health_monitor(self.healthmonitor_flag)
|
self._create_health_monitor)
|
||||||
self.addCleanup(self._delete_health_monitor, self.health_monitor_id)
|
self.addCleanup(self._delete_health_monitor, self.health_monitor_id)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
Loading…
Reference in New Issue