11.0.0

library/decort_group.py

@@ -81,24 +81,13 @@ class decort_group(DecortController):
     def create(self):
         chipset = self.aparams['chipset']
         if chipset is None:
-            chipset = 'i440fx'
+            chipset = 'Q35'
             self.message(
                 msg=f'Chipset not specified, '
                     f'default value "{chipset}" will be used.',
                 warning=True,
             )
 
-        driver = self.aparams['driver']
-        if driver is None:
-            driver = 'KVM_X86'
-            self.message(
-                msg=self.MESSAGES.default_value_used(
-                    param_name='driver',
-                    default_value=driver,
-                ),
-                warning=True,
-            )
-
         self.group_id=self.group_provision(
            bs_id=self.bservice_id,
            arg_name=self.amodule.params['name'],
@@ -112,7 +101,6 @@ class decort_group(DecortController):
            arg_timeout=self.amodule.params['timeoutStart'],
            chipset=chipset,
            storage_policy_id=self.aparams['storage_policy_id'],
-           driver=driver,
         )
 
         if self.amodule.params['state'] in ('started','present'):
@@ -296,9 +284,6 @@ class decort_group(DecortController):
                 storage_policy_id=dict(
                     type='int',
                 ),
-                driver=dict(
-                    type='str',
-                ),
             ),
             supports_check_mode=True,
             required_one_of=[
@@ -354,17 +339,6 @@ class decort_group(DecortController):
                                 f'disk ID {disk['id']}'
                         )
 
-        aparam_driver = self.aparams['driver']
-        if (
-            aparam_driver is not None
-            and aparam_driver != self.group_info['driver']
-        ):
-            check_errors = True
-            self.message(
-                msg='Check for parameter "driver" failed: '
-                    'driver can not be changed'
-            )
-
         if check_errors:
             self.exit(fail=True)
 
@@ -405,54 +379,59 @@ class decort_group(DecortController):
             self.exit(fail=True)
 
 
-def main():
-    subj = decort_group()
-    amodule = subj.amodule
-    
-    if amodule.params['state'] == 'check':
-        subj.result['changed'] = False
-        if subj.group_id:
-            # cluster is found - package facts and report success to Ansible
-            subj.result['failed'] = False
-            subj.result['facts'] = subj.package_facts(amodule.check_mode)
-            amodule.exit_json(**subj.result)
-            # we exit the module at this point
-        else:
-            subj.result['failed'] = True
-            subj.result['msg'] = ("Cannot locate Group name '{}'. "
-                                  "B-service ID {}").format(amodule.params['name'],
-                                                     amodule.params['bservice_id'],)
-            amodule.fail_json(**subj.result)       
-
-    if subj.group_id:
-        if subj.group_info['status'] in ("DELETING","DESTROYNG","CREATING","DESTROYING",
-                                         "ENABLING","DISABLING","RESTORING","MODELED","DESTROYED"):
-            subj.error()
-        elif subj.group_info['status'] in ("DELETED","DESTROYED"):
-            if amodule.params['state'] == 'absent':
-                subj.nop()
-            if amodule.params['state'] in ('present','started','stopped'):
-                subj.create()
-        elif subj.group_info['techStatus'] in ("STARTED","STOPPED"):
-            if amodule.params['state'] == 'absent':
-                subj.destroy()
+    @DecortController.handle_sdk_exceptions
+    def run(self):
+        amodule = self.amodule
+        
+        if amodule.params['state'] == 'check':
+            self.result['changed'] = False
+            if self.group_id:
+                # cluster is found - package facts and report success to Ansible
+                self.result['failed'] = False
+                self.result['facts'] = self.package_facts(amodule.check_mode)
+                amodule.exit_json(**self.result)
+                # we exit the module at this point
             else:
-                subj.action()
+                self.result['failed'] = True
+                self.result['msg'] = ("Cannot locate Group name '{}'. "
+                                    "B-service ID {}").format(amodule.params['name'],
+                                                        amodule.params['bservice_id'],)
+                amodule.fail_json(**self.result)       
+
+        if self.group_id:
+            if self.group_info['status'] in ("DELETING","DESTROYNG","CREATING","DESTROYING",
+                                            "ENABLING","DISABLING","RESTORING","MODELED","DESTROYED"):
+                self.error()
+            elif self.group_info['status'] in ("DELETED","DESTROYED"):
+                if amodule.params['state'] == 'absent':
+                    self.nop()
+                if amodule.params['state'] in ('present','started','stopped'):
+                    self.create()
+            elif self.group_info['techStatus'] in ("STARTED","STOPPED"):
+                if amodule.params['state'] == 'absent':
+                    self.destroy()
+                else:
+                    self.action()
 
-    else:
-        if amodule.params['state'] == 'absent':
-            subj.nop()
-        if amodule.params['state'] in ('present','started','stopped'):
-            subj.create()
-    
-    if subj.result['failed']:
-        amodule.fail_json(**subj.result)
-    else:
-        if subj.group_should_exist:
-            subj.result['facts'] = subj.package_facts(amodule.check_mode)
-            amodule.exit_json(**subj.result)
         else:
-            amodule.exit_json(**subj.result)
+            if amodule.params['state'] == 'absent':
+                self.nop()
+            if amodule.params['state'] in ('present','started','stopped'):
+                self.create()
+        
+        if self.result['failed']:
+            amodule.fail_json(**self.result)
+        else:
+            if self.group_should_exist:
+                self.result['facts'] = self.package_facts(amodule.check_mode)
+                amodule.exit_json(**self.result)
+            else:
+                amodule.exit_json(**self.result)
 
-if __name__ == "__main__":
+
+def main():
+    decort_group().run()
+
+
+if __name__ == '__main__':
     main()