From a795ae6ffcf2c95b58dfb43d8cf51d97d570f0f1 Mon Sep 17 00:00:00 2001
From: Adam Harwell <flux.adam@gmail.com>
Date: Mon, 23 Apr 2018 12:11:19 -0700
Subject: [PATCH] Fix tests for Octavia API compat changes

Change-Id: I524c5a3534914e6c130dd4c5bed2be77d7e38c74
Depends-On: https://review.openstack.org/#/c/563341/
---
 .gitignore                                 | 3 +++
 octavia_tempest_plugin/common/constants.py | 4 ++--
 octavia_tempest_plugin/tests/waiters.py    | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 890fe27c..59928214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,6 @@ releasenotes/build
 
 # Oslo config generator
 etc/octavia.tempest.conf.sample
+
+# PyCharm IDE
+.idea
diff --git a/octavia_tempest_plugin/common/constants.py b/octavia_tempest_plugin/common/constants.py
index 1d63d0de..c7bb82bc 100644
--- a/octavia_tempest_plugin/common/constants.py
+++ b/octavia_tempest_plugin/common/constants.py
@@ -19,7 +19,7 @@ BYTES_IN = 'bytes_in'
 BYTES_OUT = 'bytes_out'
 CREATED_AT = 'created_at'
 DESCRIPTION = 'description'
-FLAVOR = 'flavor'
+FLAVOR_ID = 'flavor_id'
 ID = 'id'
 LISTENERS = 'listeners'
 LOADBALANCER = 'loadbalancer'
@@ -40,7 +40,7 @@ VIP_QOS_POLICY_ID = 'vip_qos_policy_id'
 
 # API valid fields
 SHOW_LOAD_BALANCER_RESPONSE_FIELDS = (
-    ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR, ID, LISTENERS, NAME,
+    ADMIN_STATE_UP, CREATED_AT, DESCRIPTION, FLAVOR_ID, ID, LISTENERS, NAME,
     OPERATING_STATUS, POOLS, PROJECT_ID, PROVIDER, PROVISIONING_STATUS,
     UPDATED_AT, VIP_ADDRESS, VIP_NETWORK_ID, VIP_PORT_ID, VIP_SUBNET_ID,
     VIP_QOS_POLICY_ID)
diff --git a/octavia_tempest_plugin/tests/waiters.py b/octavia_tempest_plugin/tests/waiters.py
index 7825782d..44138a44 100644
--- a/octavia_tempest_plugin/tests/waiters.py
+++ b/octavia_tempest_plugin/tests/waiters.py
@@ -49,7 +49,14 @@ def wait_for_status(show_client, id, status_key, status,
     LOG.info('Waiting for {name} status to update to {status}'.format(
         name=show_client.__name__, status=status))
     while True:
-        response = show_client(id)
+        if status == const.DELETED:
+            try:
+                response = show_client(id)
+            except exceptions.NotFound:
+                return
+        else:
+            response = show_client(id)
+
         if root_tag:
             object_details = response[root_tag]
         else: