Auto Commit for: fmgr_device_group (#52784)

lib/ansible/modules/network/fortimanager/fmgr_device_group.py

@@ -29,6 +29,8 @@ DOCUMENTATION = '''
 ---
 module: fmgr_device_group
 version_added: "2.8"
+notes:
+    - Full Documentation at U(https://ftnt-ansible-docs.readthedocs.io/en/latest/).
 author:
     - Luke Weighall (@lweighall)
     - Andrew Welsh (@Ghilli3)
@@ -50,21 +52,6 @@ options:
     required: false
     default: root
 
-  host:
-    description:
-      - The FortiManager's address.
-    required: true
-
-  username:
-    description:
-      - The username to log into the FortiManager.
-    required: true
-
-  password:
-    description:
-      - The password associated with the username account.
-    required: false
-
   mode:
     description:
       - Sets one of three modes for managing the object.
@@ -96,9 +83,6 @@ options:
 EXAMPLES = '''
 - name: CREATE DEVICE GROUP
   fmgr_device_group:
-    host: "{{inventory_hostname}}"
-    username: "{{ username }}"
-    password: "{{ password }}"
     grp_name: "TestGroup"
     grp_desc: "CreatedbyAnsible"
     adom: "ansible"
@@ -106,9 +90,6 @@ EXAMPLES = '''
 
 - name: CREATE DEVICE GROUP 2
   fmgr_device_group:
-    host: "{{inventory_hostname}}"
-    username: "{{ username }}"
-    password: "{{ password }}"
     grp_name: "AnsibleGroup"
     grp_desc: "CreatedbyAnsible"
     adom: "ansible"
@@ -116,9 +97,6 @@ EXAMPLES = '''
 
 - name: ADD DEVICES TO DEVICE GROUP
   fmgr_device_group:
-    host: "{{inventory_hostname}}"
-    username: "{{ username }}"
-    password: "{{ password }}"
     mode: "add"
     grp_name: "TestGroup"
     grp_members: "FGT1,FGT2"
@@ -127,9 +105,6 @@ EXAMPLES = '''
 
 - name: REMOVE DEVICES TO DEVICE GROUP
   fmgr_device_group:
-    host: "{{inventory_hostname}}"
-    username: "{{ username }}"
-    password: "{{ password }}"
     mode: "delete"
     grp_name: "TestGroup"
     grp_members: "FGT1,FGT2"
@@ -137,9 +112,6 @@ EXAMPLES = '''
 
 - name: DELETE DEVICE GROUP
   fmgr_device_group:
-    host: "{{inventory_hostname}}"
-    username: "{{ username }}"
-    password: "{{ password }}"
     grp_name: "AnsibleGroup"
     grp_desc: "CreatedbyAnsible"
     mode: "delete"
@@ -154,20 +126,23 @@ api_result:
 """
 
 from ansible.module_utils.basic import AnsibleModule, env_fallback
-from ansible.module_utils.network.fortimanager.fortimanager import AnsibleFortiManager
+from ansible.module_utils.connection import Connection
+from ansible.module_utils.network.fortimanager.fortimanager import FortiManagerHandler
+from ansible.module_utils.network.fortimanager.common import FMGBaseException
+from ansible.module_utils.network.fortimanager.common import FMGRCommon
+from ansible.module_utils.network.fortimanager.common import FMGRMethods
+from ansible.module_utils.network.fortimanager.common import DEFAULT_RESULT_OBJ
+from ansible.module_utils.network.fortimanager.common import FAIL_SOCKET_MSG
 
 
-# check for pyFMG lib
+def get_groups(fmgr, paramgram):
-try:
-    from pyFMG.fortimgr import FortiManager
-    HAS_PYFMGR = True
-except ImportError:
-    HAS_PYFMGR = False
-
-
-def get_groups(fmg, paramgram):
     """
-    This method is used GET the HA PEERS of a FortiManager Node
+    :param fmgr: The fmgr object instance from fortimanager.py
+    :type fmgr: class object
+    :param paramgram: The formatted dictionary of options to process
+    :type paramgram: dict
+    :return: The response from the FortiManager
+    :rtype: dict
     """
 
     datagram = {
@@ -175,16 +150,21 @@ def get_groups(fmg, paramgram):
     }
 
     url = '/dvmdb/adom/{adom}/group'.format(adom=paramgram["adom"])
-    response = fmg.get(url, datagram)
+    response = fmgr.process_request(url, datagram, FMGRMethods.GET)
     return response
 
 
-def add_device_group(fmg, paramgram):
+def add_device_group(fmgr, paramgram):
     """
-    This method is used to add device groups
+    :param fmgr: The fmgr object instance from fortimanager.py
+    :type fmgr: class object
+    :param paramgram: The formatted dictionary of options to process
+    :type paramgram: dict
+    :return: The response from the FortiManager
+    :rtype: dict
     """
     # INIT A BASIC OBJECTS
-    response = (-100000, {"msg": "Illegal or malformed paramgram discovered. System Exception"})
+    response = DEFAULT_RESULT_OBJ
     url = ""
     mode = paramgram["mode"]
 
@@ -198,23 +178,28 @@ def add_device_group(fmg, paramgram):
 
     # IF MODE = SET -- USE THE 'SET' API CALL MODE
     if mode == "set":
-        response = fmg.set(url, datagram)
+        response = fmgr.process_request(url, datagram, FMGRMethods.SET)
     # IF MODE = UPDATE -- USER THE 'UPDATE' API CALL MODE
     elif mode == "update":
-        response = fmg.update(url, datagram)
+        response = fmgr.process_request(url, datagram, FMGRMethods.UPDATE)
     # IF MODE = ADD  -- USE THE 'ADD' API CALL MODE
     elif mode == "add":
-        response = fmg.add(url, datagram)
+        response = fmgr.process_request(url, datagram, FMGRMethods.ADD)
 
     return response
 
 
-def delete_device_group(fmg, paramgram):
+def delete_device_group(fmgr, paramgram):
     """
-    This method is used to add devices to the FMGR
+    :param fmgr: The fmgr object instance from fortimanager.py
+    :type fmgr: class object
+    :param paramgram: The formatted dictionary of options to process
+    :type paramgram: dict
+    :return: The response from the FortiManager
+    :rtype: dict
     """
     # INIT A BASIC OBJECTS
-    response = (-100000, {"msg": "Illegal or malformed paramgram discovered. System Exception"})
+    response = DEFAULT_RESULT_OBJ
     url = ""
 
     datagram = {
@@ -223,16 +208,21 @@ def delete_device_group(fmg, paramgram):
     }
 
     url = '/dvmdb/adom/{adom}/group/{grp_name}'.format(adom=paramgram["adom"], grp_name=paramgram["grp_name"])
-    response = fmg.delete(url, datagram)
+    response = fmgr.process_request(url, datagram, FMGRMethods.DELETE)
     return response
 
 
-def add_group_member(fmg, paramgram):
+def add_group_member(fmgr, paramgram):
     """
-    This method is used to update device groups add members
+    :param fmgr: The fmgr object instance from fortimanager.py
+    :type fmgr: class object
+    :param paramgram: The formatted dictionary of options to process
+    :type paramgram: dict
+    :return: The response from the FortiManager
+    :rtype: dict
     """
     # INIT A BASIC OBJECTS
-    response = (-100000, {"msg": "Illegal or malformed paramgram discovered. System Exception"})
+    response = DEFAULT_RESULT_OBJ
     url = ""
     device_member_list = paramgram["grp_members"].replace(' ', '')
     device_member_list = device_member_list.split(',')
@@ -242,17 +232,22 @@ def add_group_member(fmg, paramgram):
 
         url = '/dvmdb/adom/{adom}/group/{grp_name}/object member'.format(adom=paramgram["adom"],
                                                                          grp_name=paramgram["grp_name"])
-        response = fmg.add(url, datagram)
+        response = fmgr.process_request(url, datagram, FMGRMethods.ADD)
 
     return response
 
 
-def delete_group_member(fmg, paramgram):
+def delete_group_member(fmgr, paramgram):
     """
-    This method is used to update device groups add members
+    :param fmgr: The fmgr object instance from fortimanager.py
+    :type fmgr: class object
+    :param paramgram: The formatted dictionary of options to process
+    :type paramgram: dict
+    :return: The response from the FortiManager
+    :rtype: dict
     """
     # INIT A BASIC OBJECTS
-    response = (-100000, {"msg": "Illegal or malformed paramgram discovered. System Exception"})
+    response = DEFAULT_RESULT_OBJ
     url = ""
     device_member_list = paramgram["grp_members"].replace(' ', '')
     device_member_list = device_member_list.split(',')
@@ -262,65 +257,22 @@ def delete_group_member(fmg, paramgram):
 
         url = '/dvmdb/adom/{adom}/group/{grp_name}/object member'.format(adom=paramgram["adom"],
                                                                          grp_name=paramgram["grp_name"])
-        response = fmg.delete(url, datagram)
+        response = fmgr.process_request(url, datagram, FMGRMethods.DELETE)
 
     return response
 
 
-# FUNCTION/METHOD FOR LOGGING OUT AND ANALYZING ERROR CODES
-def fmgr_logout(fmg, module, msg="NULL", results=(), good_codes=(0,), logout_on_fail=True, logout_on_success=False):
-    """
-    THIS METHOD CONTROLS THE LOGOUT AND ERROR REPORTING AFTER AN METHOD OR FUNCTION RUNS
-    """
-
-    # VALIDATION ERROR (NO RESULTS, JUST AN EXIT)
-    if msg != "NULL" and len(results) == 0:
-        try:
-            fmg.logout()
-        except Exception:
-            pass
-        module.fail_json(msg=msg)
-
-    # SUBMISSION ERROR
-    if len(results) > 0:
-        if msg == "NULL":
-            try:
-                msg = results[1]['status']['message']
-            except Exception:
-                msg = "No status message returned from pyFMG. Possible that this was a GET with a tuple result."
-
-            if results[0] not in good_codes:
-                if logout_on_fail:
-                    fmg.logout()
-                    module.fail_json(msg=msg, **results[1])
-                else:
-                    return_msg = msg + " -- LOGOUT ON FAIL IS OFF, MOVING ON"
-                    return return_msg
-            else:
-                if logout_on_success:
-                    fmg.logout()
-                    module.exit_json(msg=msg, **results[1])
-                else:
-                    return_msg = msg + " -- LOGOUT ON SUCCESS IS OFF, MOVING ON TO REST OF CODE"
-                    return return_msg
-
-
 def main():
     argument_spec = dict(
         adom=dict(required=False, type="str", default="root"),
         vdom=dict(required=False, type="str", default="root"),
-        host=dict(required=True, type="str"),
-        username=dict(fallback=(env_fallback, ["ANSIBLE_NET_USERNAME"])),
-        password=dict(fallback=(env_fallback, ["ANSIBLE_NET_PASSWORD"]), no_log=True),
         mode=dict(choices=["add", "set", "delete", "update"], type="str", default="add"),
         grp_desc=dict(required=False, type="str"),
         grp_name=dict(required=True, type="str"),
         grp_members=dict(required=False, type="str"),
     )
 
-    module = AnsibleModule(argument_spec, supports_check_mode=True, )
+    module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=False, )
-
-    # handle params passed via provider and insure they are represented as the data type expected by fortimanager
     paramgram = {
         "mode": module.params["mode"],
         "grp_name": module.params["grp_name"],
@@ -329,49 +281,48 @@ def main():
         "adom": module.params["adom"],
         "vdom": module.params["vdom"]
     }
-
+    module.paramgram = paramgram
-    # validate required arguments are passed; not used in argument_spec to allow params to be called from provider
+    fmgr = None
-    # check if params are set
+    if module._socket_path:
-    if module.params["host"] is None or module.params["username"] is None or module.params["password"] is None:
+        connection = Connection(module._socket_path)
-        module.fail_json(msg="Host and username are required for connection")
+        fmgr = FortiManagerHandler(connection, module)
-
+        fmgr.tools = FMGRCommon()
-    # CHECK IF LOGIN FAILED
-    fmg = AnsibleFortiManager(module, module.params["host"], module.params["username"], module.params["password"])
-    response = fmg.login()
-    if response[1]['status']['code'] != 0:
-        module.fail_json(msg="Connection to FortiManager Failed")
     else:
-        # START SESSION LOGIC
+        module.fail_json(**FAIL_SOCKET_MSG)
 
+    # BEGIN MODULE-SPECIFIC LOGIC -- THINGS NEED TO HAPPEN DEPENDING ON THE ENDPOINT AND OPERATION
+    results = DEFAULT_RESULT_OBJ
+    try:
         # PROCESS THE GROUP ADDS FIRST
         if paramgram["grp_name"] is not None and paramgram["mode"] in ["add", "set", "update"]:
             # add device group
-            results = add_device_group(fmg, paramgram)
+            results = add_device_group(fmgr, paramgram)
-            if results[0] != 0 and results[0] != -2:
+            fmgr.govern_response(module=module, results=results,
-                fmgr_logout(fmg, module, msg="Failed to Add Device Group", results=results, good_codes=[0])
+                                 ansible_facts=fmgr.construct_ansible_facts(results, module.params, paramgram))
 
         # PROCESS THE GROUP MEMBER ADDS
         if paramgram["grp_members"] is not None and paramgram["mode"] in ["add", "set", "update"]:
             # assign devices to device group
-            results = add_group_member(fmg, paramgram)
+            results = add_group_member(fmgr, paramgram)
-            if results[0] != 0 and results[0] != -2:
+            fmgr.govern_response(module=module, results=results,
-                fmgr_logout(fmg, module, msg="Failed to Add Group Member(s)", results=results, good_codes=[0])
+                                 ansible_facts=fmgr.construct_ansible_facts(results, module.params, paramgram))
 
         # PROCESS THE GROUP MEMBER DELETES
         if paramgram["grp_members"] is not None and paramgram["mode"] == "delete":
             # remove devices grom a group
-            results = delete_group_member(fmg, paramgram)
+            results = delete_group_member(fmgr, paramgram)
-            if results[0] != 0:
+            fmgr.govern_response(module=module, results=results,
-                fmgr_logout(fmg, module, msg="Failed to Delete Group Member(s)", results=results, good_codes=[0])
+                                 ansible_facts=fmgr.construct_ansible_facts(results, module.params, paramgram))
 
         # PROCESS THE GROUP DELETES, ONLY IF GRP_MEMBERS IS NOT NULL TOO
         if paramgram["grp_name"] is not None and paramgram["mode"] == "delete" and paramgram["grp_members"] is None:
             # delete device group
-            results = delete_device_group(fmg, paramgram)
+            results = delete_device_group(fmgr, paramgram)
-            if results[0] != 0:
+            fmgr.govern_response(module=module, results=results,
-                fmgr_logout(fmg, module, msg="Failed to Delete Device Group", results=results, good_codes=[0])
+                                 ansible_facts=fmgr.construct_ansible_facts(results, module.params, paramgram))
+    except Exception as err:
+        raise FMGBaseException(err)
 
-    # RETURN THE RESULTS
     return module.exit_json(**results[1])
 
 

test/units/modules/network/fortimanager/fixtures/test_fmgr_device_group.json

@@ -8,43 +8,21 @@
                 },
                 "url": "/dvmdb/adom/ansible/group/TestGroup/object member"
             },
+            "datagram_sent": {
+                "name": "FGT1",
+                "vdom": "root"
+            },
             "paramgram_used": {
                 "grp_desc": null,
                 "adom": "ansible",
-            "grp_members": "FGT1,FGT2", 
+                "grp_members": "FGT1",
-            "state": "present", 
+                "mode": "add",
                 "grp_name": "TestGroup",
                 "vdom": "root"
             },
             "post_method": "add"
         },
         {
-         "paramgram_used": {
-            "grp_desc": null, 
-            "adom": "ansible", 
-            "grp_members": "FGT1,FGT2", 
-            "state": "present", 
-            "grp_name": "TestGroup", 
-            "vdom": "root"
-         }, 
-         "raw_response": {
-            "status": {
-               "message": "OK", 
-               "code": 0
-            }, 
-            "url": "/dvmdb/adom/ansible/group/TestGroup/object member"
-         }, 
-         "post_method": "add"
-      }, 
-      {
-         "paramgram_used": {
-            "grp_desc": null, 
-            "adom": "ansible", 
-            "grp_members": "FGT3", 
-            "state": "present", 
-            "grp_name": "testtest", 
-            "vdom": "root"
-         }, 
             "raw_response": {
                 "status": {
                     "message": "OK",
@@ -52,6 +30,18 @@
                 },
                 "url": "/dvmdb/adom/ansible/group/testtest/object member"
             },
+            "datagram_sent": {
+                "name": "FGT3",
+                "vdom": "root"
+            },
+            "paramgram_used": {
+                "grp_desc": null,
+                "adom": "ansible",
+                "grp_members": "FGT3",
+                "mode": "add",
+                "grp_name": "testtest",
+                "vdom": "root"
+            },
             "post_method": "add"
         }
     ],
@@ -61,10 +51,14 @@
                 "grp_desc": "CreatedbyAnsible",
                 "adom": "ansible",
                 "grp_members": null,
-            "state": "absent", 
+                "mode": "delete",
                 "grp_name": "TestGroup",
                 "vdom": "root"
             },
+            "datagram_sent": {
+                "name": "TestGroup",
+                "adom": "ansible"
+            },
             "raw_response": {
                 "status": {
                     "message": "OK",
@@ -82,11 +76,15 @@
                 },
                 "url": "/dvmdb/adom/ansible/group/testtest"
             },
+            "datagram_sent": {
+                "name": "testtest",
+                "adom": "ansible"
+            },
             "paramgram_used": {
                 "grp_desc": "CreatedbyAnsible",
                 "adom": "ansible",
                 "grp_members": null,
-            "state": "absent", 
+                "mode": "delete",
                 "grp_name": "testtest",
                 "vdom": "root"
             },
@@ -99,14 +97,19 @@
                 "grp_desc": "CreatedbyAnsible",
                 "adom": "ansible",
                 "grp_members": null,
-            "state": "present", 
+                "mode": "add",
                 "grp_name": "TestGroup",
                 "vdom": "root"
             },
+            "datagram_sent": {
+                "os_type": "fos",
+                "name": "TestGroup",
+                "desc": "CreatedbyAnsible"
+            },
             "raw_response": {
                 "status": {
-               "message": "OK", 
+                    "message": "Object already exists",
-               "code": 0
+                    "code": -2
                 },
                 "url": "/dvmdb/adom/ansible/group"
             },
@@ -120,11 +123,16 @@
                 },
                 "url": "/dvmdb/adom/ansible/group"
             },
+            "datagram_sent": {
+                "os_type": "fos",
+                "name": "testtest",
+                "desc": "CreatedbyAnsible"
+            },
             "paramgram_used": {
                 "grp_desc": "CreatedbyAnsible",
                 "adom": "ansible",
                 "grp_members": null,
-            "state": "present", 
+                "mode": "add",
                 "grp_name": "testtest",
                 "vdom": "root"
             },
@@ -134,11 +142,16 @@
             "paramgram_used": {
                 "grp_desc": null,
                 "adom": "ansible",
-            "grp_members": "FGT1,FGT2", 
+                "grp_members": "FGT1",
-            "state": "present", 
+                "mode": "add",
                 "grp_name": "TestGroup",
                 "vdom": "root"
             },
+            "datagram_sent": {
+                "os_type": "fos",
+                "name": "TestGroup",
+                "desc": null
+            },
             "raw_response": {
                 "status": {
                     "message": "Object already exists",
@@ -149,26 +162,43 @@
             "post_method": "add"
         },
         {
-         "raw_response": {
-            "status": {
-               "message": "Object already exists", 
-               "code": -2
-            }, 
-            "url": "/dvmdb/adom/ansible/group"
-         }, 
             "paramgram_used": {
                 "grp_desc": null,
                 "adom": "ansible",
                 "grp_members": "FGT3",
-            "state": "present", 
+                "mode": "add",
                 "grp_name": "testtest",
                 "vdom": "root"
             },
+            "datagram_sent": {
+                "os_type": "fos",
+                "name": "testtest",
+                "desc": null
+            },
+            "raw_response": {
+                "status": {
+                    "message": "Object already exists",
+                    "code": -2
+                },
+                "url": "/dvmdb/adom/ansible/group"
+            },
             "post_method": "add"
         }
     ],
     "delete_group_member": [
         {
+            "paramgram_used": {
+                "grp_desc": null,
+                "adom": "ansible",
+                "grp_members": "FGT3",
+                "mode": "delete",
+                "grp_name": "testtest",
+                "vdom": "root"
+            },
+            "datagram_sent": {
+                "name": "FGT3",
+                "vdom": "root"
+            },
             "raw_response": {
                 "status": {
                     "message": "OK",
@@ -176,32 +206,6 @@
                 },
                 "url": "/dvmdb/adom/ansible/group/testtest/object member"
             },
-         "paramgram_used": {
-            "grp_desc": null, 
-            "adom": "ansible", 
-            "grp_members": "FGT3", 
-            "state": "absent", 
-            "grp_name": "testtest", 
-            "vdom": "root"
-         }, 
-         "post_method": "delete"
-      }, 
-      {
-         "paramgram_used": {
-            "grp_desc": null, 
-            "adom": "ansible", 
-            "grp_members": "FGT1,FGT2", 
-            "state": "absent", 
-            "grp_name": "TestGroup", 
-            "vdom": "root"
-         }, 
-         "raw_response": {
-            "status": {
-               "message": "OK", 
-               "code": 0
-            }, 
-            "url": "/dvmdb/adom/ansible/group/TestGroup/object member"
-         }, 
             "post_method": "delete"
         },
         {
@@ -212,11 +216,15 @@
                 },
                 "url": "/dvmdb/adom/ansible/group/TestGroup/object member"
             },
+            "datagram_sent": {
+                "name": "FGT1",
+                "vdom": "root"
+            },
             "paramgram_used": {
                 "grp_desc": null,
                 "adom": "ansible",
-            "grp_members": "FGT1,FGT2", 
+                "grp_members": "FGT1",
-            "state": "absent", 
+                "mode": "delete",
                 "grp_name": "TestGroup",
                 "vdom": "root"
             },

test/units/modules/network/fortimanager/test_fmgr_device_group.py

@@ -19,17 +19,13 @@ __metaclass__ = type
 
 import os
 import json
-from pyFMG.fortimgr import FortiManager
+from ansible.module_utils.network.fortimanager.fortimanager import FortiManagerHandler
 import pytest
 
 try:
     from ansible.modules.network.fortimanager import fmgr_device_group
 except ImportError:
-    pytest.skip(
+    pytest.skip("Could not load required modules for testing", allow_module_level=True)
-        "Could not load required modules for testing",
-        allow_module_level=True)
-
-fmg_instance = FortiManager("1.1.1.1", "admin", "")
 
 
 def load_fixtures():
@@ -43,229 +39,164 @@ def load_fixtures():
     return [fixture_data]
 
 
+@pytest.fixture(autouse=True)
+def module_mock(mocker):
+    connection_class_mock = mocker.patch('ansible.module_utils.basic.AnsibleModule')
+    return connection_class_mock
+
+
+@pytest.fixture(autouse=True)
+def connection_mock(mocker):
+    connection_class_mock = mocker.patch('ansible.modules.network.fortimanager.fmgr_device_group.Connection')
+    return connection_class_mock
+
+
 @pytest.fixture(scope="function", params=load_fixtures())
 def fixture_data(request):
     func_name = request.function.__name__.replace("test_", "")
     return request.param.get(func_name, None)
 
 
-def test_add_device_group(fixture_data, mocker):
+fmg_instance = FortiManagerHandler(connection_mock, module_mock)
-    mocker.patch(
-        "pyFMG.fortimgr.FortiManager._post_request",
-        side_effect=fixture_data)
 
-    paramgram_used = {
+
-        'grp_desc': 'CreatedbyAnsible',
+def test_add_device_group(fixture_data, mocker):
-        'adom': 'ansible',
+    mocker.patch("ansible.module_utils.network.fortimanager.fortimanager.FortiManagerHandler.process_request",
-        'grp_members': None,
+                 side_effect=fixture_data)
-        'state': 'present',
+    #  Fixture sets used:###########################
-        'grp_name': 'TestGroup',
+
-        'vdom': 'root',
+    ##################################################
-        'mode': 'add'}
-    output = fmgr_device_group.add_device_group(fmg_instance, paramgram_used)
-    #
     # grp_desc: CreatedbyAnsible
     # adom: ansible
     # grp_members: None
-    # state: present
+    # mode: add
     # grp_name: TestGroup
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+    ##################################################
-    assert output['raw_response']['status']['code'] == 0
-    paramgram_used = {
-        'grp_desc': 'CreatedbyAnsible',
-        'adom': 'ansible',
-        'grp_members': None,
-        'state': 'present',
-        'grp_name': 'testtest',
-        'vdom': 'root',
-        'mode': 'add'}
-    output = fmgr_device_group.add_device_group(fmg_instance, paramgram_used)
-    #
     # grp_desc: CreatedbyAnsible
     # adom: ansible
     # grp_members: None
-    # state: present
+    # mode: add
     # grp_name: testtest
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+    ##################################################
-    assert output['raw_response']['status']['code'] == 0
-    paramgram_used = {
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT1,FGT2',
-        'state': 'present',
-        'grp_name': 'TestGroup',
-        'vdom': 'root',
-        'mode': 'add'}
-    output = fmgr_device_group.add_device_group(fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
-    # grp_members: FGT1,FGT2
+    # grp_members: FGT1
-    # state: present
+    # mode: add
     # grp_name: TestGroup
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+    ##################################################
-    assert output['raw_response']['status']['code'] == -2
-    paramgram_used = {
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT3',
-        'state': 'present',
-        'grp_name': 'testtest',
-        'vdom': 'root',
-        'mode': 'add'}
-    output = fmgr_device_group.add_device_group(fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
     # grp_members: FGT3
-    # state: present
+    # mode: add
     # grp_name: testtest
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+
+    # Test using fixture 1 #
+    output = fmgr_device_group.add_device_group(fmg_instance, fixture_data[0]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == -2
+    # Test using fixture 2 #
+    output = fmgr_device_group.add_device_group(fmg_instance, fixture_data[1]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == 0
+    # Test using fixture 3 #
+    output = fmgr_device_group.add_device_group(fmg_instance, fixture_data[2]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == -2
+    # Test using fixture 4 #
+    output = fmgr_device_group.add_device_group(fmg_instance, fixture_data[3]['paramgram_used'])
     assert output['raw_response']['status']['code'] == -2
 
 
 def test_delete_device_group(fixture_data, mocker):
-    mocker.patch(
+    mocker.patch("ansible.module_utils.network.fortimanager.fortimanager.FortiManagerHandler.process_request",
-        "pyFMG.fortimgr.FortiManager._post_request",
                  side_effect=fixture_data)
+    #  Fixture sets used:###########################
 
-    paramgram_used = {
+    ##################################################
-        'grp_desc': 'CreatedbyAnsible',
-        'adom': 'ansible',
-        'grp_members': None,
-        'state': 'absent',
-        'grp_name': 'TestGroup',
-        'vdom': 'root',
-        'mode': 'delete'}
-    output = fmgr_device_group.delete_device_group(
-        fmg_instance, paramgram_used)
-    #
     # grp_desc: CreatedbyAnsible
     # adom: ansible
     # grp_members: None
-    # state: absent
+    # mode: delete
     # grp_name: TestGroup
     # vdom: root
-    # mode: delete
+    ##################################################
-    #
+    ##################################################
-    assert output['raw_response']['status']['code'] == 0
-    paramgram_used = {
-        'grp_desc': 'CreatedbyAnsible',
-        'adom': 'ansible',
-        'grp_members': None,
-        'state': 'absent',
-        'grp_name': 'testtest',
-        'vdom': 'root',
-        'mode': 'delete'}
-    output = fmgr_device_group.delete_device_group(
-        fmg_instance, paramgram_used)
-    #
     # grp_desc: CreatedbyAnsible
     # adom: ansible
     # grp_members: None
-    # state: absent
+    # mode: delete
     # grp_name: testtest
     # vdom: root
-    # mode: delete
+    ##################################################
-    #
+
+    # Test using fixture 1 #
+    output = fmgr_device_group.delete_device_group(fmg_instance, fixture_data[0]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == 0
+    # Test using fixture 2 #
+    output = fmgr_device_group.delete_device_group(fmg_instance, fixture_data[1]['paramgram_used'])
     assert output['raw_response']['status']['code'] == 0
 
 
 def test_add_group_member(fixture_data, mocker):
-    mocker.patch(
+    mocker.patch("ansible.module_utils.network.fortimanager.fortimanager.FortiManagerHandler.process_request",
-        "pyFMG.fortimgr.FortiManager._post_request",
                  side_effect=fixture_data)
+    #  Fixture sets used:###########################
 
-    paramgram_used = {
+    ##################################################
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT1,FGT2',
-        'state': 'present',
-        'grp_name': 'TestGroup',
-        'vdom': 'root',
-        'mode': 'add'}
-    output = fmgr_device_group.add_group_member(fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
-    # grp_members: FGT1,FGT2
+    # grp_members: FGT1
-    # state: present
+    # mode: add
     # grp_name: TestGroup
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+    ##################################################
-
-    assert output['raw_response']['status']['code'] == 0
-    paramgram_used = {
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT3',
-        'state': 'present',
-        'grp_name': 'testtest',
-        'vdom': 'root',
-        'mode': 'add'}
-    output = fmgr_device_group.add_group_member(fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
     # grp_members: FGT3
-    # state: present
+    # mode: add
     # grp_name: testtest
     # vdom: root
-    # mode: add
+    ##################################################
-    #
+
+    # Test using fixture 1 #
+    output = fmgr_device_group.add_group_member(fmg_instance, fixture_data[0]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == 0
+    # Test using fixture 2 #
+    output = fmgr_device_group.add_group_member(fmg_instance, fixture_data[1]['paramgram_used'])
     assert output['raw_response']['status']['code'] == 0
 
 
 def test_delete_group_member(fixture_data, mocker):
-    mocker.patch(
+    mocker.patch("ansible.module_utils.network.fortimanager.fortimanager.FortiManagerHandler.process_request",
-        "pyFMG.fortimgr.FortiManager._post_request",
                  side_effect=fixture_data)
+    #  Fixture sets used:###########################
 
-    paramgram_used = {
+    ##################################################
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT3',
-        'state': 'absent',
-        'grp_name': 'testtest',
-        'vdom': 'root',
-        'mode': 'delete'}
-    output = fmgr_device_group.delete_group_member(
-        fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
     # grp_members: FGT3
-    # state: absent
+    # mode: delete
     # grp_name: testtest
     # vdom: root
-    # mode: delete
+    ##################################################
-    #
+    ##################################################
-    assert output['raw_response']['status']['code'] == 0
-    paramgram_used = {
-        'grp_desc': None,
-        'adom': 'ansible',
-        'grp_members': 'FGT1,FGT2',
-        'state': 'absent',
-        'grp_name': 'TestGroup',
-        'vdom': 'root',
-        'mode': 'delete'}
-    output = fmgr_device_group.delete_group_member(
-        fmg_instance, paramgram_used)
-    #
     # grp_desc: None
     # adom: ansible
-    # grp_members: FGT1,FGT2
+    # grp_members: FGT1
-    # state: absent
+    # mode: delete
     # grp_name: TestGroup
     # vdom: root
-    # mode: delete
+    ##################################################
-    #
+
+    # Test using fixture 1 #
+    output = fmgr_device_group.delete_group_member(fmg_instance, fixture_data[0]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == 0
+    # Test using fixture 2 #
+    output = fmgr_device_group.delete_group_member(fmg_instance, fixture_data[1]['paramgram_used'])
+    assert output['raw_response']['status']['code'] == 0