From 7f3af5e414fc7c717b796e6c8dea918b7b08cc07 Mon Sep 17 00:00:00 2001
From: Brandon Logan <brandon.logan@rackspace.com>
Date: Sat, 16 Jan 2016 14:21:19 -0600
Subject: [PATCH] Fix timing bug that causes false negative tests

All drivers call (or at least should) the helper method
successful_completion method when they're driver action has
completed succesfully.  Some tempest tests exposed an issue where
the load balancer statuses would get updated before children were,
causing an inconsistent behavior.  The load balancer should always
have its status updated last.

Change-Id: I4e422b7feaec5110ee856994631785e6e55a467e
Closes-Bug: 1534886
---
 neutron_lbaas/drivers/driver_mixins.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/neutron_lbaas/drivers/driver_mixins.py b/neutron_lbaas/drivers/driver_mixins.py
index be357d6f3..ed79d1439 100644
--- a/neutron_lbaas/drivers/driver_mixins.py
+++ b/neutron_lbaas/drivers/driver_mixins.py
@@ -98,14 +98,15 @@ class BaseManagerMixin(object):
             self.driver.plugin.db.update_loadbalancer(
                 context, obj.id, {'vip_address': obj.vip_address,
                                   'vip_port_id': obj.vip_port_id})
-        self.driver.plugin.db.update_status(
-            context, models.LoadBalancer, obj.root_loadbalancer.id,
-            provisioning_status=lb_p_status,
-            operating_status=lb_op_status)
-        if obj == obj.root_loadbalancer or delete:
-            # Do not want to update the status of the load balancer again
-            # Or the obj was deleted from the db so no need to update the
-            # statuses
+        if delete:
+            # We cannot update the status of obj if it was deleted but if the
+            # obj is not a load balancer, the root load balancer should be
+            # updated
+            if not isinstance(obj, data_models.LoadBalancer):
+                self.driver.plugin.db.update_status(
+                    context, models.LoadBalancer, obj.root_loadbalancer.id,
+                    provisioning_status=lb_p_status,
+                    operating_status=lb_op_status)
             return
         obj_op_status = lb_const.ONLINE
         if isinstance(obj, data_models.HealthMonitor):
@@ -118,6 +119,14 @@ class BaseManagerMixin(object):
             context, obj_sa_cls, obj.id,
             provisioning_status=constants.ACTIVE,
             operating_status=obj_op_status)
+        if not isinstance(obj, data_models.LoadBalancer):
+            # Only update the status of the root_loadbalancer if the previous
+            # update was not the root load balancer so we are not updating
+            # it twice.
+            self.driver.plugin.db.update_status(
+                context, models.LoadBalancer, obj.root_loadbalancer.id,
+                provisioning_status=lb_p_status,
+                operating_status=lb_op_status)
 
     def failed_completion(self, context, obj):
         """