commit 3e795008d57fcb67b9da243bb9dea67a982d03b2
author Reedip <rbanerje@redhat.com> Tue Feb 05 09:16:27 2019 +0000
committer Reedip <rbanerje@redhat.com> Mon Feb 18 09:44:47 2019 +0000
tree faa3c10b010fa5f7af146f6dffe2c81c6291f294
parent c4ccd81154959ca0dba6b7796a866fb82f8ba36b

Check Monitor in Member Scenario Tests

Currently the Member scenario tests are not checking
if Monitor is enabled in the Tempest conf or not. This patch adds
the fix.

Change-Id: Id74ea9b232ac44e7f13c44035856bbb84eabeb63

octavia_tempest_plugin/tests/scenario/v2/test_member.py

diff --git a/octavia_tempest_plugin/tests/scenario/v2/test_member.py b/octavia_tempest_plugin/tests/scenario/v2/test_member.py
index d5c1b1b..488a7fd 100644
--- a/octavia_tempest_plugin/tests/scenario/v2/test_member.py
+++ b/octavia_tempest_plugin/tests/scenario/v2/test_member.py
@@ -53,7 +53,7 @@
         protocol = const.HTTP
         lb_feature_enabled = CONF.loadbalancer_feature_enabled
         if not lb_feature_enabled.l7_protocol_enabled:
-            cls.protocol = lb_feature_enabled.l4_protocol
+            protocol = lb_feature_enabled.l4_protocol
 
         listener_name = data_utils.rand_name("lb_member_listener1_member")
         listener_kwargs = {
@@ -125,7 +125,10 @@
         if self.lb_member_vip_subnet:
             member_kwargs[const.SUBNET_ID] = self.lb_member_vip_subnet[
                 const.ID]
-
+        hm_enabled = CONF.loadbalancer_feature_enabled.health_monitor_enabled
+        if not hm_enabled:
+            del member_kwargs[const.MONITOR_ADDRESS]
+            del member_kwargs[const.MONITOR_PORT]
         member = self.mem_member_client.create_member(**member_kwargs)
         self.addCleanup(
             self.mem_member_client.cleanup_member,
@@ -161,8 +164,9 @@
             pool_id=self.pool_id)
 
         equal_items = [const.NAME, const.ADMIN_STATE_UP, const.ADDRESS,
-                       const.PROTOCOL_PORT, const.WEIGHT,
-                       const.MONITOR_ADDRESS, const.MONITOR_PORT]
+                       const.PROTOCOL_PORT, const.WEIGHT]
+        if hm_enabled:
+            equal_items += [const.MONITOR_ADDRESS, const.MONITOR_PORT]
         if self.mem_member_client.is_version_supported(
                 self.api_version, '2.1'):
             equal_items.append(const.BACKUP)
@@ -182,8 +186,6 @@
             const.NAME: new_name,
             const.ADMIN_STATE_UP: not member[const.ADMIN_STATE_UP],
             const.WEIGHT: member[const.WEIGHT] + 1,
-            const.MONITOR_ADDRESS: '192.0.2.3',
-            const.MONITOR_PORT: member[const.MONITOR_PORT] + 1,
         }
         if self.mem_member_client.is_version_supported(
                 self.api_version, '2.1'):
@@ -191,6 +193,10 @@
                 const.BACKUP: not member[const.BACKUP],
             })
 
+        if hm_enabled:
+            member_update_kwargs[const.MONITOR_ADDRESS] = '192.0.2.3'
+            member_update_kwargs[const.MONITOR_PORT] = member[
+                const.MONITOR_PORT] + 1
         member = self.mem_member_client.update_member(
             member[const.ID], **member_update_kwargs)
 
@@ -208,8 +214,9 @@
             pool_id=self.pool_id)
 
         # Test changed items
-        equal_items = [const.NAME, const.ADMIN_STATE_UP, const.WEIGHT,
-                       const.MONITOR_ADDRESS, const.MONITOR_PORT]
+        equal_items = [const.NAME, const.ADMIN_STATE_UP, const.WEIGHT]
+        if hm_enabled:
+            equal_items += [const.MONITOR_ADDRESS, const.MONITOR_PORT]
         if self.mem_member_client.is_version_supported(
                 self.api_version, '2.1'):
             equal_items.append(const.BACKUP)