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

Merge branch 'dev_bs_rc-5.2.6' into 'rc-5.2.6'

Browse Source 
decort_bservice module bug fixes

See merge request rudecs/dev/decort-ansible!72
This commit is contained in:
Алексей Даньков
2024-06-14 07:44:13 +00:00
parent 5227e2be0b 06b4686e18
commit daa91bee95
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/decort_bservice.py
View File

@@ -43,8 +43,11 @@ class decort_bservice(DecortController):
self.fail_json(**self.result)
# fail the module -> exit
# now validate RG
validated_rg_id, validated_rg_facts = self.rg_find(validated_acc_id,
arg_amodule.params['rg_id'],)
validated_rg_id, validated_rg_facts = self.rg_find(
arg_account_id=validated_acc_id,
arg_rg_id=arg_amodule.params['rg_id'],
arg_rg_name=arg_amodule.params['rg_name']
)
if not validated_rg_id:
self.result['failed'] = True
self.result['changed'] = False
@@ -76,7 +79,7 @@ class decort_bservice(DecortController):
"""
self.result['failed'] = False
self.result['changed'] = False
if self.k8s_id:
if self.bservice_id:
self.result['msg'] = ("No state change required for B-service ID {} because of its "
"current status '{}'.").format(self.bservice_id, self.bservice_info['status'])
else:
@@ -109,7 +112,7 @@ class decort_bservice(DecortController):
)
if self.bservice_id:
_, self.bservice_info = self.bservice_get_by_id(self.bservice_id)
self.bservice_state(self.bservice_info,'enabled',self.amodule.params['started'])
self.bservice_state(self.bservice_info,'enabled',self.amodule.params['started'])
return
def action(self,d_state,started=False):
@@ -148,7 +151,9 @@ class decort_bservice(DecortController):
ret_dict['state'] = self.bservice_info['status']
ret_dict['rg_id'] = self.bservice_info['rgId']
ret_dict['account_id'] = self.acc_id
ret_dict['groupsName'] = self.bservice_info['groupsName']
bservice_info_groupsName = self.bservice_info.get('groupsName')
if bservice_info_groupsName:
ret_dict['groupsName'] = bservice_info_groupsName
ret_dict['groupsIds'] = self.bservice_info['groups']
return ret_dict
@staticmethod

8
module_utils/decort_utils.py
View File

@@ -3731,6 +3731,14 @@ class DecortController(object):
self.result['waypoints'] = "{} -> {}".format(self.result['waypoints'], "bservice_provision")
if self.amodule.check_mode:
result_msg = 'bservice_provision() in check mode: No changing.'
if self.result.get('msg'):
self.result['msg'] += f'\n{result_msg}'
else:
self.result['msg'] = result_msg
return 0
api_url = "/restmachine/cloudapi/bservice/create"
api_params = dict(
name = bs_name,