Fix pool creation with single LB create call

So far, creating a populated LB (or an LB tree) with non attached pools,
left the pools on PENDING_CREATE provisioning_state.

This patch adds the option of marking non attached pools to be active on
the MarkLBActiveInDB task.

Story 2010426
Task 46823

Conflicts:
	octavia/controller/worker/v1/flows/load_balancer_flows.py
	octavia/controller/worker/v2/flows/load_balancer_flows.py
	octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py
	octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py

Change-Id: Ie5fb25e292461baca38499091e8f9b9a53e3ddcd
(cherry picked from commit 3a157c0216)
(cherry picked from commit 1f2aaaa737)
(cherry picked from commit 396785dadd)
(cherry picked from commit 9a40fa7e3c)
(cherry picked from commit f0df69df73)

octavia/controller/worker/v1/flows/load_balancer_flows.py

@@ -86,12 +86,17 @@ class LoadBalancerFlows(object):
 
         post_amp_prefix = constants.POST_LB_AMP_ASSOCIATION_SUBFLOW
         lb_create_flow.add(
-            self.get_post_lb_amp_association_flow(
-                post_amp_prefix, topology, mark_active=(not listeners)))
+            self.get_post_lb_amp_association_flow(post_amp_prefix, topology))
 
         if listeners:
             lb_create_flow.add(*self._create_listeners_flow())
 
+        lb_create_flow.add(
+            database_tasks.MarkLBActiveInDB(
+                mark_subobjects=True,
+                requires=constants.LOADBALANCER
+            )
+        )
         return lb_create_flow
 
     def _create_single_topology(self):
@@ -221,16 +226,9 @@ class LoadBalancerFlows(object):
         flows.append(
             self.listener_flows.get_create_all_listeners_flow()
         )
-        flows.append(
-            database_tasks.MarkLBActiveInDB(
-                mark_subobjects=True,
-                requires=constants.LOADBALANCER
-            )
-        )
         return flows
 
-    def get_post_lb_amp_association_flow(self, prefix, topology,
-                                         mark_active=True):
+    def get_post_lb_amp_association_flow(self, prefix, topology):
         """Reload the loadbalancer and create networking subflows for
 
         created/allocated amphorae.
@@ -254,10 +252,6 @@ class LoadBalancerFlows(object):
 
         post_create_LB_flow.add(database_tasks.UpdateLoadbalancerInDB(
             requires=[constants.LOADBALANCER, constants.UPDATE_DICT]))
-        if mark_active:
-            post_create_LB_flow.add(database_tasks.MarkLBActiveInDB(
-                name=sf_name + '-' + constants.MARK_LB_ACTIVE_INDB,
-                requires=constants.LOADBALANCER))
         return post_create_LB_flow
 
     def _get_delete_listeners_flow(self, lb):

octavia/controller/worker/v1/tasks/database_tasks.py

@@ -982,6 +982,8 @@ class MarkLBActiveInDB(BaseDatabaseTask):
                       loadbalancer.id)
             for listener in loadbalancer.listeners:
                 self._mark_listener_status(listener, constants.ACTIVE)
+            for pool in loadbalancer.pools:
+                self._mark_pool_status(pool, constants.ACTIVE)
 
         LOG.info("Mark ACTIVE in DB for load balancer id: %s",
                  loadbalancer.id)
@@ -1056,14 +1058,20 @@ class MarkLBActiveInDB(BaseDatabaseTask):
         """
 
         if self.mark_subobjects:
-            LOG.debug("Marking all listeners of loadbalancer %s ERROR",
-                      loadbalancer.id)
+            LOG.debug("Marking all listeners and pools of loadbalancer %s"
+                      " ERROR", loadbalancer.id)
             for listener in loadbalancer.listeners:
                 try:
                     self._mark_listener_status(listener, constants.ERROR)
                 except Exception:
                     LOG.warning("Error updating listener %s provisioning "
                                 "status", listener.id)
+            for pool in loadbalancer.pools:
+                try:
+                    self._mark_pool_status(pool, constants.ERROR)
+                except Exception:
+                    LOG.warning("Error updating pool %s provisioning "
+                                "status", pool.id)
 
 
 class UpdateLBServerGroupInDB(BaseDatabaseTask):

octavia/controller/worker/v2/flows/load_balancer_flows.py

@@ -88,12 +88,18 @@ class LoadBalancerFlows(object):
 
         post_amp_prefix = constants.POST_LB_AMP_ASSOCIATION_SUBFLOW
         lb_create_flow.add(
-            self.get_post_lb_amp_association_flow(
-                post_amp_prefix, topology, mark_active=(not listeners)))
+            self.get_post_lb_amp_association_flow(post_amp_prefix, topology))
 
         if listeners:
             lb_create_flow.add(*self._create_listeners_flow())
 
+        lb_create_flow.add(
+            database_tasks.MarkLBActiveInDB(
+                mark_subobjects=True,
+                requires=constants.LOADBALANCER
+            )
+        )
+
         return lb_create_flow
 
     def _create_single_topology(self):
@@ -215,16 +221,9 @@ class LoadBalancerFlows(object):
         flows.append(
             self.listener_flows.get_create_all_listeners_flow()
         )
-        flows.append(
-            database_tasks.MarkLBActiveInDB(
-                mark_subobjects=True,
-                requires=constants.LOADBALANCER
-            )
-        )
         return flows
 
-    def get_post_lb_amp_association_flow(self, prefix, topology,
-                                         mark_active=True):
+    def get_post_lb_amp_association_flow(self, prefix, topology):
         """Reload the loadbalancer and create networking subflows for
 
         created/allocated amphorae.
@@ -247,10 +246,6 @@ class LoadBalancerFlows(object):
 
         post_create_LB_flow.add(database_tasks.UpdateLoadbalancerInDB(
             requires=[constants.LOADBALANCER, constants.UPDATE_DICT]))
-        if mark_active:
-            post_create_LB_flow.add(database_tasks.MarkLBActiveInDB(
-                name=sf_name + '-' + constants.MARK_LB_ACTIVE_INDB,
-                requires=constants.LOADBALANCER))
         return post_create_LB_flow
 
     def _get_delete_listeners_flow(self, listeners):

octavia/controller/worker/v2/tasks/database_tasks.py

@@ -1049,6 +1049,8 @@ class MarkLBActiveInDB(BaseDatabaseTask):
                 id=loadbalancer[constants.LOADBALANCER_ID])
             for listener in db_lb.listeners:
                 self._mark_listener_status(listener, constants.ACTIVE)
+            for pool in db_lb.pools:
+                self._mark_pool_status(pool, constants.ACTIVE)
 
         LOG.info("Mark ACTIVE in DB for load balancer id: %s",
                  loadbalancer[constants.LOADBALANCER_ID])
@@ -1123,8 +1125,8 @@ class MarkLBActiveInDB(BaseDatabaseTask):
         """
 
         if self.mark_subobjects:
-            LOG.debug("Marking all listeners of loadbalancer %s ERROR",
-                      loadbalancer[constants.LOADBALANCER_ID])
+            LOG.debug("Marking all listeners and pools of loadbalancer %s"
+                      " ERROR", loadbalancer[constants.LOADBALANCER_ID])
             db_lb = self.loadbalancer_repo.get(
                 db_apis.get_session(),
                 id=loadbalancer[constants.LOADBALANCER_ID])
@@ -1134,6 +1136,12 @@ class MarkLBActiveInDB(BaseDatabaseTask):
                 except Exception:
                     LOG.warning("Error updating listener %s provisioning "
                                 "status", listener.id)
+            for pool in db_lb.pools:
+                try:
+                    self._mark_pool_status(pool, constants.ERROR)
+                except Exception:
+                    LOG.warning("Error updating POOL %s provisioning "
+                                "status", pool.id)
 
 
 class MarkLBActiveInDBByListener(BaseDatabaseTask):

octavia/tests/unit/controller/worker/v1/flows/test_load_balancer_flows.py

@@ -160,7 +160,6 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertEqual(4, len(amp_flow.provides))
         self.assertEqual(2, len(amp_flow.requires))
 
-        # Test mark_active=False
         amp_flow = self.LBFlow.get_post_lb_amp_association_flow(
             '123', constants.TOPOLOGY_ACTIVE_STANDBY)
 

octavia/tests/unit/controller/worker/v1/tasks/test_database_tasks.py

@@ -1195,13 +1195,15 @@ class TestDatabaseTasks(base.TestCase):
                        provisioning_status=constants.ACTIVE),
              mock.call('TEST', listeners[1].id,
                        provisioning_status=constants.ACTIVE)])
-        self.assertEqual(2, repo.PoolRepository.update.call_count)
-        repo.PoolRepository.update.has_calls(
+        self.assertEqual(5, repo.PoolRepository.update.call_count)
+        repo.PoolRepository.update.assert_has_calls(
             [mock.call('TEST', default_pool.id,
                        provisioning_status=constants.ACTIVE),
              mock.call('TEST', redirect_pool.id,
+                       provisioning_status=constants.ACTIVE),
+             mock.call('TEST', unused_pool.id,
                        provisioning_status=constants.ACTIVE)])
-        self.assertEqual(4, repo.MemberRepository.update.call_count)
+        self.assertEqual(8, repo.MemberRepository.update.call_count)
         repo.MemberRepository.update.has_calls(
             [mock.call('TEST', members1[0].id,
                        provisioning_status=constants.ACTIVE),
@@ -1211,7 +1213,7 @@ class TestDatabaseTasks(base.TestCase):
                        provisioning_status=constants.ACTIVE),
              mock.call('TEST', members2[1].id,
                        provisioning_status=constants.ACTIVE)])
-        self.assertEqual(1, repo.HealthMonitorRepository.update.call_count)
+        self.assertEqual(2, repo.HealthMonitorRepository.update.call_count)
         repo.HealthMonitorRepository.update.has_calls(
             [mock.call('TEST', health_monitor.id,
                        provisioning_status=constants.ACTIVE)])
@@ -1240,13 +1242,13 @@ class TestDatabaseTasks(base.TestCase):
                        provisioning_status=constants.ERROR),
              mock.call('TEST', listeners[1].id,
                        provisioning_status=constants.ERROR)])
-        self.assertEqual(2, repo.PoolRepository.update.call_count)
+        self.assertEqual(5, repo.PoolRepository.update.call_count)
         repo.PoolRepository.update.has_calls(
             [mock.call('TEST', default_pool.id,
                        provisioning_status=constants.ERROR),
              mock.call('TEST', redirect_pool.id,
                        provisioning_status=constants.ERROR)])
-        self.assertEqual(4, repo.MemberRepository.update.call_count)
+        self.assertEqual(8, repo.MemberRepository.update.call_count)
         repo.MemberRepository.update.has_calls(
             [mock.call('TEST', members1[0].id,
                        provisioning_status=constants.ERROR),
@@ -1256,7 +1258,7 @@ class TestDatabaseTasks(base.TestCase):
                        provisioning_status=constants.ERROR),
              mock.call('TEST', members2[1].id,
                        provisioning_status=constants.ERROR)])
-        self.assertEqual(1, repo.HealthMonitorRepository.update.call_count)
+        self.assertEqual(2, repo.HealthMonitorRepository.update.call_count)
         repo.HealthMonitorRepository.update.has_calls(
             [mock.call('TEST', health_monitor.id,
                        provisioning_status=constants.ERROR)])

octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py

@@ -183,7 +183,6 @@ class TestLoadBalancerFlows(base.TestCase):
         self.assertEqual(2, len(amp_flow.requires), amp_flow.requires)
         self.assertEqual(4, len(amp_flow.provides), amp_flow.provides)
 
-        # Test mark_active=False
         amp_flow = self.LBFlow.get_post_lb_amp_association_flow(
             '123', constants.TOPOLOGY_ACTIVE_STANDBY)
 

octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py

@@ -1330,6 +1330,8 @@ class TestDatabaseTasks(base.TestCase):
             [mock.call('TEST', default_pool.id,
                        provisioning_status=constants.ACTIVE),
              mock.call('TEST', redirect_pool.id,
+                       provisioning_status=constants.ACTIVE),
+             mock.call('TEST', unused_pool.id,
                        provisioning_status=constants.ACTIVE)])
         repo.HealthMonitorRepository.update.has_calls(
             [mock.call('TEST', health_monitor.id,
@@ -1362,8 +1364,11 @@ class TestDatabaseTasks(base.TestCase):
             [mock.call('TEST', default_pool.id,
                        provisioning_status=constants.ERROR),
              mock.call('TEST', redirect_pool.id,
-                       provisioning_status=constants.ERROR)])
-        self.assertEqual(1, repo.HealthMonitorRepository.update.call_count)
+                       provisioning_status=constants.ERROR),
+             mock.call('TEST', unused_pool.id,
+                       provisioning_status=constants.ERROR)
+             ])
+        self.assertEqual(2, repo.HealthMonitorRepository.update.call_count)
         repo.HealthMonitorRepository.update.has_calls(
             [mock.call('TEST', health_monitor.id,
                        provisioning_status=constants.ERROR)])

releasenotes/notes/fix-pool-prov-status-on-lb-single-create-897070aee0a42da6.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed a bug that didn't set the correct provisioning_status for unattached
+    pools when creating a fully-populated load balancer.