openstack
/
neutron-lbaas
Code Issues Proposed changes

Merge "fixed health monitor setting during tempest test,"

This commit is contained in:
Jenkins 2017-07-20 23:04:46 +00:00 committed by Gerrit Code Review
parent 8b5af4d4b5 679ee2414f
commit f32a0ec5bd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron_lbaas/tests/tempest/v2/ddt/base_ddt.py
View File

@ -100,15 +100,14 @@ class AdminStateTests(testscenarios.TestWithScenarios,
cls.member_id = cls.member['id']
@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,
'delay': 3,
'max_retries': 10,
'timeout': 5,
'pool_id': cls.pool_id,
'admin_state_up': admin_state_up_flag}
cls.health_monitor = cls._create_health_monitor(
**cls.create_hm_kwargs)
cls.health_monitor = creator(**cls.create_hm_kwargs)
cls.health_monitor_id = cls.health_monitor['id']
@classmethod

4
neutron_lbaas/tests/tempest/v2/ddt/test_health_monitor_admin_state_up.py
View File

@ -74,8 +74,8 @@ class BaseHealthMonitorAdminStateTest(base_ddt.AdminStateTests):
self.resource_setup_pool(self.pool_flag)
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)
@classmethod