BASIS/decort-ansible
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 16 Wiki Activity

Fix logic of LB deleting from Recycle Bin and LB list getting

Browse Source
This commit is contained in:
Dmitriy Smirnov
2024-06-04 16:30:00 +03:00
parent 421d19bfa8
commit 90ae212d0c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/decort_lb.py
View File

@@ -322,7 +322,8 @@ def main():
elif decon.lb_facts['status'] == "DELETED": elif decon.lb_facts['status'] == "DELETED":
if amodule.params['state'] in ['present', 'enabled']: if amodule.params['state'] in ['present', 'enabled']:
decon.action(restore=True) decon.action(restore=True)
elif amodule.params['state'] == 'absent': elif (amodule.params['state'] == 'absent' and
amodule.params['permanently']):
decon.delete() decon.delete()
elif amodule.params['state'] == 'disabled': elif amodule.params['state'] == 'disabled':
decon.error() decon.error()

6
module_utils/decort_utils.py
View File

@@ -4056,8 +4056,8 @@ class DecortController(object):
self.result['msg'] = "_rg_listlb(): zero RG ID specified." self.result['msg'] = "_rg_listlb(): zero RG ID specified."
self.amodule.fail_json(**self.result) self.amodule.fail_json(**self.result)
api_params = dict(rgId=rg_id) api_params = dict(rgId=rg_id, includedeleted=True)
api_resp = self.decort_api_call(requests.post, "/restmachine/cloudapi/rg/listLb", api_params) api_resp = self.decort_api_call(requests.post, "/restmachine/cloudapi/lb/list", api_params)
if api_resp.status_code == 200: if api_resp.status_code == 200:
ret_rg_vins_list = json.loads(api_resp.content.decode('utf8')) ret_rg_vins_list = json.loads(api_resp.content.decode('utf8'))
else: else:
@@ -4071,7 +4071,7 @@ class DecortController(object):
@returns: LB ID and dictionary with LB facts. @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_id = 0
ret_lb_facts = None ret_lb_facts = None