From be377afcca7713a664fef03237a595992a0b197f Mon Sep 17 00:00:00 2001 From: Vadim Ponomarev Date: Mon, 22 Oct 2018 13:18:46 +0300 Subject: [PATCH] Remove unused methods. Remove unused methods _reset_lb_and_listener_statuses, _reset_lb_status, _reset_lb_listener_policy_statuses from controllers. Change-Id: I8e5980489bc905daa946ff4e2e7c3ae698d5b0b4 Story: 1655768 --- octavia/api/v2/controllers/l7policy.py | 10 ---------- octavia/api/v2/controllers/l7rule.py | 16 ---------------- octavia/api/v2/controllers/listener.py | 6 ------ octavia/api/v2/controllers/pool.py | 11 ----------- 4 files changed, 43 deletions(-) diff --git a/octavia/api/v2/controllers/l7policy.py b/octavia/api/v2/controllers/l7policy.py index d07cfe23d3..630d9bdbf9 100644 --- a/octavia/api/v2/controllers/l7policy.py +++ b/octavia/api/v2/controllers/l7policy.py @@ -93,16 +93,6 @@ class L7PolicyController(base.BaseController): raise exceptions.ImmutableObject(resource='Load Balancer', id=lb_id) - def _reset_lb_and_listener_statuses(self, session, lb_id, listener_id): - # Setting LB + listeners back to active because this should be a - # recoverable error - self.repositories.load_balancer.update( - session, lb_id, - provisioning_status=constants.ACTIVE) - self.repositories.listener.update( - session, listener_id, - provisioning_status=constants.ACTIVE) - def _validate_create_l7policy(self, lock_session, l7policy_dict): try: return self.repositories.l7policy.create(lock_session, diff --git a/octavia/api/v2/controllers/l7rule.py b/octavia/api/v2/controllers/l7rule.py index 82ed492279..722cfeb1e8 100644 --- a/octavia/api/v2/controllers/l7rule.py +++ b/octavia/api/v2/controllers/l7rule.py @@ -103,22 +103,6 @@ class L7RuleController(base.BaseController): if count >= constants.MAX_L7RULES_PER_L7POLICY: raise exceptions.TooManyL7RulesOnL7Policy(id=self.l7policy_id) - def _reset_lb_listener_policy_statuses(self, session): - # Setting LB + listeners back to active because this should be a - # recoverable error - l7policy = self._get_db_l7policy(session, self.l7policy_id) - listener_id = l7policy.listener_id - load_balancer_id = l7policy.listener.load_balancer_id - self.repositories.load_balancer.update( - session, load_balancer_id, - provisioning_status=constants.ACTIVE) - self.repositories.listener.update( - session, listener_id, - provisioning_status=constants.ACTIVE) - self.repositories.l7policy.update( - session, self.l7policy_id, - provisioning_status=constants.ACTIVE) - def _validate_create_l7rule(self, lock_session, l7rule_dict): try: return self.repositories.l7rule.create(lock_session, **l7rule_dict) diff --git a/octavia/api/v2/controllers/listener.py b/octavia/api/v2/controllers/listener.py index 676db82e41..c064670f0b 100644 --- a/octavia/api/v2/controllers/listener.py +++ b/octavia/api/v2/controllers/listener.py @@ -127,12 +127,6 @@ class ListenersController(base.BaseController): "type UDP.") % constants.PROTOCOL_UDP raise exceptions.ValidationException(detail=msg) - def _reset_lb_status(self, session, lb_id): - # Setting LB back to active because this should be a recoverable error - self.repositories.load_balancer.update( - session, lb_id, - provisioning_status=constants.ACTIVE) - def _validate_tls_refs(self, tls_refs): context = pecan.request.context.get('octavia_context') bad_refs = [] diff --git a/octavia/api/v2/controllers/pool.py b/octavia/api/v2/controllers/pool.py index ac5a50635a..2866046676 100644 --- a/octavia/api/v2/controllers/pool.py +++ b/octavia/api/v2/controllers/pool.py @@ -98,17 +98,6 @@ class PoolsController(base.BaseController): raise exceptions.ImmutableObject(resource=_('Load Balancer'), id=lb_id) - def _reset_lb_and_listener_statuses(self, session, lb_id, listener_ids): - # Setting LB + listeners back to active because this should be a - # recoverable error - self.repositories.load_balancer.update( - session, lb_id, - provisioning_status=constants.ACTIVE) - for listener in listener_ids: - self.repositories.listener.update( - session, listener, - provisioning_status=constants.ACTIVE) - def _validate_create_pool(self, lock_session, pool_dict, listener_id=None): """Validate creating pool on load balancer.