From 5c3194b94dd8ef017620a350f44455bb4b68a7ff Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jun 2024 12:39:29 +0300 Subject: [PATCH 1/5] Fix variable name for if-condition in decort_bservice.nop method --- library/decort_bservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/decort_bservice.py b/library/decort_bservice.py index 5e1270e..1b771db 100644 --- a/library/decort_bservice.py +++ b/library/decort_bservice.py @@ -76,7 +76,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: From 3dc9cbcbd8897bfef487638a69c8d8262c99125f Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jun 2024 12:56:04 +0300 Subject: [PATCH 2/5] Add rg_name param value to call of DecortController.rg_find method in decort_bservice.__init__ method --- library/decort_bservice.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/library/decort_bservice.py b/library/decort_bservice.py index 1b771db..87b3310 100644 --- a/library/decort_bservice.py +++ b/library/decort_bservice.py @@ -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 From 3fec6f014b8266336986523ae8a57b798f0717b0 Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jun 2024 14:12:45 +0300 Subject: [PATCH 3/5] Add existing check for 'groupsName' key of self.bservice_info dict in decort_bservice.package_facts method --- library/decort_bservice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/decort_bservice.py b/library/decort_bservice.py index 87b3310..a23c979 100644 --- a/library/decort_bservice.py +++ b/library/decort_bservice.py @@ -151,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 From 7e372511bcd046ede8bb022b762463dc1f528828 Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jun 2024 14:53:28 +0300 Subject: [PATCH 4/5] Add check mode simple logic in DecortController.bservice_provision method --- module_utils/decort_utils.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/module_utils/decort_utils.py b/module_utils/decort_utils.py index 0be52ea..073c2c8 100644 --- a/module_utils/decort_utils.py +++ b/module_utils/decort_utils.py @@ -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, From cb13649586138d7b5120257333617cc0362b44f5 Mon Sep 17 00:00:00 2001 From: Dmitriy Smirnov Date: Fri, 7 Jun 2024 14:54:30 +0300 Subject: [PATCH 5/5] Fix executing logic of DecortController.bservice_state method call in decort_bservice.create method --- library/decort_bservice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/decort_bservice.py b/library/decort_bservice.py index a23c979..da52fef 100644 --- a/library/decort_bservice.py +++ b/library/decort_bservice.py @@ -112,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):