Merge pull request #446 from openstack-charmers/bug/1896729

octavia: Disable check for member operational status

zaza/openstack/charm_tests/nova/setup.py

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Code for configureing nova."""
+"""Code for configuring nova."""
+
+import tenacity
 
 import zaza.openstack.utilities.openstack as openstack_utils
 from zaza.openstack.utilities import (
@@ -21,6 +23,9 @@ from zaza.openstack.utilities import (
 import zaza.openstack.charm_tests.nova.utils as nova_utils
 
 
+@tenacity.retry(stop=tenacity.stop_after_attempt(3),
+                wait=tenacity.wait_exponential(
+                multiplier=1, min=2, max=10))
 def create_flavors(nova_client=None):
     """Create basic flavors.
 
@@ -43,6 +48,9 @@ def create_flavors(nova_client=None):
                 flavorid=nova_utils.FLAVORS[flavor]['flavorid'])
 
 
+@tenacity.retry(stop=tenacity.stop_after_attempt(3),
+                wait=tenacity.wait_exponential(
+                multiplier=1, min=2, max=10))
 def manage_ssh_key(nova_client=None):
     """Create basic flavors.
 

zaza/openstack/charm_tests/octavia/tests.py

@@ -280,7 +280,13 @@ class LBAASv2Test(test_utils.OpenStackBaseTest):
                 lambda x: octavia_client.member_show(
                     pool_id=pool_id, member_id=x),
                 member_id,
-                operating_status='ONLINE' if monitor else '')
+                operating_status='')
+            # Temporarily disable this check until we figure out why
+            # operational_status sometimes does not become 'ONLINE'
+            # while the member does indeed work and the subsequent
+            # retrieval of payload through loadbalancer is successful
+            # ref LP: #1896729.
+            #    operating_status='ONLINE' if monitor else '')
             logging.info(resp)
         return lb