From 90ae212d0c3ff514b84d853587c28d45acdd8ff4 Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Tue, 4 Jun 2024 16:30:00 +0300 Subject: [PATCH] Fix logic of LB deleting from Recycle Bin and LB list getting --- library/decort_lb.py | 3 ++- module_utils/decort_utils.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/library/decort_lb.py b/library/decort_lb.py index 976f345..3015d13 100644 --- a/library/decort_lb.py +++ b/library/decort_lb.py @@ -322,7 +322,8 @@ def main(): elif decon.lb_facts['status'] == "DELETED": if amodule.params['state'] in ['present', 'enabled']: decon.action(restore=True) - elif amodule.params['state'] == 'absent': + elif (amodule.params['state'] == 'absent' and + amodule.params['permanently']): decon.delete() elif amodule.params['state'] == 'disabled': decon.error() diff --git a/module_utils/decort_utils.py b/module_utils/decort_utils.py index 32d8934..129f7e5 100644 --- a/module_utils/decort_utils.py +++ b/module_utils/decort_utils.py @@ -4056,8 +4056,8 @@ class DecortController(object): self.result['msg'] = "_rg_listlb(): zero RG ID specified." self.amodule.fail_json(**self.result) - api_params = dict(rgId=rg_id) - api_resp = self.decort_api_call(requests.post, "/restmachine/cloudapi/rg/listLb", api_params) + api_params = dict(rgId=rg_id, includedeleted=True) + api_resp = self.decort_api_call(requests.post, "/restmachine/cloudapi/lb/list", api_params) if api_resp.status_code == 200: ret_rg_vins_list = json.loads(api_resp.content.decode('utf8')) else: @@ -4071,7 +4071,7 @@ class DecortController(object): @returns: LB ID and dictionary with LB facts. """ - LB_INVALID_STATES = ["ENABLING", "DISABLING", "DELETING", "DELETED", "DESTROYING", "DESTROYED"] + LB_INVALID_STATES = ["ENABLING", "DISABLING", "DELETING", "DESTROYING", "DESTROYED"] ret_lb_id = 0 ret_lb_facts = None