Do not make lb stay at pending_delete state

Author: zhaoqin-github

f5lbaasdriver/v2/bigip/plugin_rpc.py

@@ -257,14 +257,6 @@ def update_loadbalancer_status(self, context, loadbalancer_id=None,
         """Agent confirmation hook to update loadbalancer status."""
         with context.session.begin(subtransactions=True):
             try:
-                lb_db = self.driver.plugin.db.get_loadbalancer(
-                    context,
-                    loadbalancer_id
-                )
-                if (lb_db.provisioning_status ==
-                        plugin_constants.PENDING_DELETE):
-                    status = plugin_constants.PENDING_DELETE
-
                 self.driver.plugin.db.update_status(
                     context,
                     models.LoadBalancer,
@@ -288,13 +280,6 @@ def update_listener_status(self, context, listener_id=None,
         """Agent confirmation hook to update listener status."""
         with context.session.begin(subtransactions=True):
             try:
-                listener_db = self.driver.plugin.db.get_listener(
-                    context,
-                    listener_id
-                )
-                if (listener_db.provisioning_status ==
-                        plugin_constants.PENDING_DELETE):
-                    provisioning_status = plugin_constants.PENDING_DELETE
                 self.driver.plugin.db.update_status(
                     context,
                     models.Listener,
@@ -318,19 +303,13 @@ def update_pool_status(self, context, pool_id=None,
         """Agent confirmations hook to update pool status."""
         with context.session.begin(subtransactions=True):
             try:
-                pool = self.driver.plugin.db.get_pool(
+                self.driver.plugin.db.update_status(
                     context,
-                    pool_id
+                    models.PoolV2,
+                    pool_id,
+                    provisioning_status,
+                    operating_status
                 )
-                if (pool.provisioning_status !=
-                        plugin_constants.PENDING_DELETE):
-                    self.driver.plugin.db.update_status(
-                        context,
-                        models.PoolV2,
-                        pool_id,
-                        provisioning_status,
-                        operating_status
-                    )
             except Exception as e:
                 LOG.error('Exception: update_pool_status: %s',
                           e.message)
@@ -347,19 +326,13 @@ def update_member_status(self, context, member_id=None,
         """Agent confirmations hook to update member status."""
         with context.session.begin(subtransactions=True):
             try:
-                member = self.driver.plugin.db.get_pool_member(
+                self.driver.plugin.db.update_status(
                     context,
-                    member_id
+                    models.MemberV2,
+                    member_id,
+                    provisioning_status,
+                    operating_status
                 )
-                if (member.provisioning_status !=
-                        plugin_constants.PENDING_DELETE):
-                    self.driver.plugin.db.update_status(
-                        context,
-                        models.MemberV2,
-                        member_id,
-                        provisioning_status,
-                        operating_status
-                    )
             except Exception as e:
                 LOG.error('Exception: update_member_status: %s',
                           e.message)
@@ -376,19 +349,13 @@ def update_health_monitor_status(
         """Agent confirmation hook to update health monitor status."""
         with context.session.begin(subtransactions=True):
             try:
-                health_monitor = self.driver.plugin.db.get_healthmonitor(
+                self.driver.plugin.db.update_status(
                     context,
-                    health_monitor_id
+                    models.HealthMonitorV2,
+                    health_monitor_id,
+                    provisioning_status,
+                    operating_status
                 )
-                if (health_monitor.provisioning_status !=
-                        plugin_constants.PENDING_DELETE):
-                    self.driver.plugin.db.update_status(
-                        context,
-                        models.HealthMonitorV2,
-                        health_monitor_id,
-                        provisioning_status,
-                        operating_status
-                    )
             except Exception as e:
                 LOG.error('Exception: update_health_monitor_status: %s',
                           e.message)
@@ -405,13 +372,6 @@ def update_l7policy_status(self, context, l7policy_id=None,
         """Agent confirmation hook to update l7 policy status."""
         with context.session.begin(subtransactions=True):
             try:
-                l7policy_db = self.driver.plugin.db.get_l7policy(
-                    context,
-                    l7policy_id
-                )
-                if (l7policy_db.provisioning_status ==
-                        plugin_constants.PENDING_DELETE):
-                    provisioning_status = plugin_constants.PENDING_DELETE
                 self.driver.plugin.db.update_status(
                     context,
                     models.L7Policy,
@@ -436,14 +396,6 @@ def update_l7rule_status(self, context, l7rule_id=None, l7policy_id=None,
         """Agent confirmation hook to update l7 policy status."""
         with context.session.begin(subtransactions=True):
             try:
-                l7rule_db = self.driver.plugin.db.get_l7policy_rule(
-                    context,
-                    l7rule_id,
-                    l7policy_id
-                )
-                if (l7rule_db.provisioning_status ==
-                        plugin_constants.PENDING_DELETE):
-                    provisioning_status = plugin_constants.PENDING_DELETE
                 self.driver.plugin.db.update_status(
                     context,
                     models.L7Rule,