@@ -30,7 +30,6 @@ options:

         that an existing variable is set to C(value). When C(reset) sets the

         variable back to the default value. At least one of value and state

         C(reset) are required.

-    required: False

     default: present

     choices:

       - present

@@ -39,14 +38,9 @@ options:

     description:

       - The value to set the key to. At least one of value and state C(reset)

         are required.

-    required: False

 notes:

-  - Requires the f5-sdk Python package on the host. This is as easy as pip

-    install f5-sdk.

   - Requires BIG-IP version 12.0.0 or greater

 extends_documentation_fragment: f5

-requirements:

-  - f5-sdk

 author:

   - Tim Rupp (@caphrim007)

 '''

@@ -98,15 +92,37 @@ value:

   sample: false

 '''

-from ansible.module_utils.f5_utils import AnsibleF5Client

-from ansible.module_utils.f5_utils import AnsibleF5Parameters

-from ansible.module_utils.f5_utils import HAS_F5SDK

-from ansible.module_utils.f5_utils import F5ModuleError

+from ansible.module_utils.basic import AnsibleModule

+

+HAS_DEVEL_IMPORTS = False

 try:

-    from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError

+    # Sideband repository used for dev

+    from library.module_utils.network.f5.bigip import HAS_F5SDK

+    from library.module_utils.network.f5.bigip import F5Client

+    from library.module_utils.network.f5.common import F5ModuleError

+    from library.module_utils.network.f5.common import AnsibleF5Parameters

+    from library.module_utils.network.f5.common import cleanup_tokens

+    from library.module_utils.network.f5.common import fqdn_name

+    from library.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from library.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

+    HAS_DEVEL_IMPORTS = True

 except ImportError:

-    HAS_F5SDK = False

+    # Upstream Ansible

+    from ansible.module_utils.network.f5.bigip import HAS_F5SDK

+    from ansible.module_utils.network.f5.bigip import F5Client

+    from ansible.module_utils.network.f5.common import F5ModuleError

+    from ansible.module_utils.network.f5.common import AnsibleF5Parameters

+    from ansible.module_utils.network.f5.common import cleanup_tokens

+    from ansible.module_utils.network.f5.common import fqdn_name

+    from ansible.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

 class Parameters(AnsibleF5Parameters):

@@ -124,16 +140,6 @@ class Parameters(AnsibleF5Parameters):

         result = self._filter_params(result)

         return result

-    def api_params(self):

-        result = {}

-        for api_attribute in self.api_attributes:

-            if self.api_map is not None and api_attribute in self.api_map:

-                result[api_attribute] = getattr(self, self.api_map[api_attribute])

-            else:

-                result[api_attribute] = getattr(self, api_attribute)

-        result = self._filter_params(result)

-        return result

-

     @property

     def name(self):

         return self._values['key']

@@ -143,12 +149,17 @@ class Parameters(AnsibleF5Parameters):

         self._values['key'] = value

+class Changes(Parameters):

+    pass

+

+

 class ModuleManager(object):

-    def __init__(self, client):

-        self.client = client

+    def __init__(self, *args, **kwargs):

+        self.module = kwargs.get('module', None)

+        self.client = kwargs.get('client', None)

         self.have = None

-        self.want = Parameters(self.client.module.params)

-        self.changes = Parameters()

+        self.want = Parameters(params=self.module.params)

+        self.changes = Changes()

     def _update_changed_options(self):

         changed = {}

@@ -159,10 +170,10 @@ class ModuleManager(object):

                 if attr1 != attr2:

                     changed[key] = attr1

         if self.want.state == 'reset':

-            if str(self.want.value) == str(self.want.default_value):

-                changed[self.want.key] = self.want.value

+            if str(self.have.value) != str(self.have.default_value):

+                changed[self.want.key] = self.have.default_value

         if changed:

-            self.changes = Parameters(changed)

+            self.changes = Changes(params=changed)

             return True

         return False

@@ -189,7 +200,7 @@ class ModuleManager(object):

             name=self.want.key

         )

         result = resource.attrs

-        return Parameters(result)

+        return Parameters(params=result)

     def exists(self):

         resource = self.client.api.tm.sys.dbs.db.load(

@@ -213,7 +224,7 @@ class ModuleManager(object):

         self.have = self.read_current_from_device()

         if not self.should_update():

             return False

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

         self.update_on_device()

         return True

@@ -235,9 +246,11 @@ class ModuleManager(object):

         self.have = self.read_current_from_device()

         if not self.should_update():

             return False

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

-        self.update_on_device()

+        self.reset_on_device()

+        self.want.update({'key': self.want.key})

+        self.want.update({'value': self.have.default_value})

         if self.exists():

             return True

         else:

@@ -249,13 +262,13 @@ class ModuleManager(object):

         resource = self.client.api.tm.sys.dbs.db.load(

             name=self.want.key

         )

-        resource.update(value=self.want.default_value)

+        resource.update(value=self.have.default_value)

 class ArgumentSpec(object):

     def __init__(self):

         self.supports_check_mode = True

-        self.argument_spec = dict(

+        argument_spec = dict(

             key=dict(required=True),

             state=dict(

                 default='present',

@@ -263,27 +276,30 @@ class ArgumentSpec(object):

             ),

             value=dict()

         )

-        self.f5_product_name = 'bigip'

+        self.argument_spec = {}

+        self.argument_spec.update(f5_argument_spec)

+        self.argument_spec.update(argument_spec)

 def main():

-    if not HAS_F5SDK:

-        raise F5ModuleError("The python f5-sdk module is required")

-

     spec = ArgumentSpec()

-    client = AnsibleF5Client(

+    module = AnsibleModule(

         argument_spec=spec.argument_spec,

-        supports_check_mode=spec.supports_check_mode,

-        f5_product_name=spec.f5_product_name

+        supports_check_mode=spec.supports_check_mode

     )

+    if not HAS_F5SDK:

+        module.fail_json(msg="The python f5-sdk module is required")

     try:

-        mm = ModuleManager(client)

+        client = F5Client(**module.params)

+        mm = ModuleManager(module=module, client=client)

         results = mm.exec_module()

-        client.module.exit_json(**results)

-    except F5ModuleError as e:

-        client.module.fail_json(msg=str(e))

+        cleanup_tokens(client)

+        module.exit_json(**results)

+    except F5ModuleError as ex:

+        cleanup_tokens(client)

+        module.fail_json(msg=str(ex))

 if __name__ == '__main__':

@@ -30,48 +30,44 @@ options:

   gui_setup:

     description:

       - C(enable) or C(disabled) the Setup utility in the browser-based

-        Configuration utility

-    choices: ['yes', 'no']

+        Configuration utility.

+    type: bool

   lcd_display:

     description:

       - Specifies, when C(enabled), that the system menu displays on the

         LCD screen on the front of the unit. This setting has no effect

         when used on the VE platform.

-    choices: ['yes', 'no']

+    type: bool

   mgmt_dhcp:

     description:

       - Specifies whether or not to enable DHCP client on the management

         interface

-    choices: ['yes', 'no']

+    type: bool

   net_reboot:

     description:

       - Specifies, when C(enabled), that the next time you reboot the system,

         the system boots to an ISO image on the network, rather than an

         internal media drive.

-    choices: ['yes', 'no']

+    type: bool

   quiet_boot:

     description:

       - Specifies, when C(enabled), that the system suppresses informational

         text on the console during the boot cycle. When C(disabled), the

         system presents messages and informational text on the console during

         the boot cycle.

-    choices: ['yes', 'no']

+    type: bool

   security_banner:

     description:

       - Specifies whether the system displays an advisory message on the

         login screen.

-    choices: ['yes', 'no']

+    type: bool

   state:

     description:

       - The state of the variable on the system. When C(present), guarantees

         that an existing variable is set to C(value).

-    required: false

     default: present

     choices:

       - present

-notes:

-  - Requires the f5-sdk Python package on the host. This is as easy as pip

-    install f5-sdk.

 extends_documentation_fragment: f5

 requirements:

   - f5-sdk

@@ -139,20 +135,40 @@ security_banner:

   sample: enabled

 '''

-from ansible.module_utils.f5_utils import AnsibleF5Client

-from ansible.module_utils.f5_utils import AnsibleF5Parameters

-from ansible.module_utils.f5_utils import HAS_F5SDK

-from ansible.module_utils.f5_utils import F5ModuleError

+from ansible.module_utils.basic import AnsibleModule

 from ansible.module_utils.parsing.convert_bool import BOOLEANS

 from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE

 from ansible.module_utils.parsing.convert_bool import BOOLEANS_FALSE

-from ansible.module_utils.six import iteritems

-from collections import defaultdict

+

+HAS_DEVEL_IMPORTS = False

 try:

-    from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError

+    # Sideband repository used for dev

+    from library.module_utils.network.f5.bigip import HAS_F5SDK

+    from library.module_utils.network.f5.bigip import F5Client

+    from library.module_utils.network.f5.common import F5ModuleError

+    from library.module_utils.network.f5.common import AnsibleF5Parameters

+    from library.module_utils.network.f5.common import cleanup_tokens

+    from library.module_utils.network.f5.common import fqdn_name

+    from library.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from library.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

+    HAS_DEVEL_IMPORTS = True

 except ImportError:

-    HAS_F5SDK = False

+    # Upstream Ansible

+    from ansible.module_utils.network.f5.bigip import HAS_F5SDK

+    from ansible.module_utils.network.f5.bigip import F5Client

+    from ansible.module_utils.network.f5.common import F5ModuleError

+    from ansible.module_utils.network.f5.common import AnsibleF5Parameters

+    from ansible.module_utils.network.f5.common import cleanup_tokens

+    from ansible.module_utils.network.f5.common import fqdn_name

+    from ansible.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

 class Parameters(AnsibleF5Parameters):

@@ -182,46 +198,6 @@ class Parameters(AnsibleF5Parameters):

         'mgmt_dhcp', 'net_reboot', 'quiet_boot', 'console_timeout'

     ]

-    def __init__(self, params=None):

-        self._values = defaultdict(lambda: None)

-        self._values['__warnings'] = []

-        if params:

-            self.update(params=params)

-

-    def update(self, params=None):

-        if params:

-            for k, v in iteritems(params):

-                if self.api_map is not None and k in self.api_map:

-                    map_key = self.api_map[k]

-                else:

-                    map_key = k

-

-                # Handle weird API parameters like `dns.proxy.__iter__` by

-                # using a map provided by the module developer

-                class_attr = getattr(type(self), map_key, None)

-                if isinstance(class_attr, property):

-                    # There is a mapped value for the api_map key

-                    if class_attr.fset is None:

-                        # If the mapped value does not have

-                        # an associated setter

-                        self._values[map_key] = v

-                    else:

-                        # The mapped value has a setter

-                        setattr(self, map_key, v)

-                else:

-                    # If the mapped value is not a @property

-                    self._values[map_key] = v

-

-    def api_params(self):

-        result = {}

-        for api_attribute in self.api_attributes:

-            if self.api_map is not None and api_attribute in self.api_map:

-                result[api_attribute] = getattr(self, self.api_map[api_attribute])

-            else:

-                result[api_attribute] = getattr(self, api_attribute)

-        result = self._filter_params(result)

-        return result

-

 class ApiParameters(Parameters):

     pass

@@ -323,9 +299,10 @@ class Difference(object):

 class ModuleManager(object):

-    def __init__(self, client):

-        self.client = client

-        self.want = ModuleParameters(params=self.client.module.params)

+    def __init__(self, *args, **kwargs):

+        self.module = kwargs.get('module', None)

+        self.client = kwargs.get('client', None)

+        self.want = ModuleParameters(params=self.module.params)

         self.have = ApiParameters()

         self.changes = UsableChanges()

@@ -335,7 +312,7 @@ class ModuleManager(object):

             if getattr(self.want, key) is not None:

                 changed[key] = getattr(self.want, key)

         if changed:

-            self.changes = UsableChanges(changed)

+            self.changes = UsableChanges(params=changed)

     def _update_changed_options(self):

         diff = Difference(self.want, self.have)

@@ -351,7 +328,7 @@ class ModuleManager(object):

                 else:

                     changed[k] = change

         if changed:

-            self.changes = UsableChanges(changed)

+            self.changes = UsableChanges(params=changed)

             return True

         return False

@@ -369,7 +346,7 @@ class ModuleManager(object):

         except iControlUnexpectedHTTPError as e:

             raise F5ModuleError(str(e))

-        reportable = ReportableChanges(self.changes.to_return())

+        reportable = ReportableChanges(params=self.changes.to_return())

         changes = reportable.to_return()

         result.update(**changes)

         result.update(dict(changed=changed))

@@ -379,7 +356,7 @@ class ModuleManager(object):

     def _announce_deprecations(self, result):

         warnings = result.pop('__warnings', [])

         for warning in warnings:

-            self.client.module.deprecate(

+            self.module.deprecate(

                 msg=warning['msg'],

                 version=warning['version']

             )

@@ -390,13 +367,13 @@ class ModuleManager(object):

     def read_current_from_device(self):

         resource = self.client.api.tm.sys.global_settings.load()

         result = resource.attrs

-        return ApiParameters(result)

+        return ApiParameters(params=result)

     def update(self):

         self.have = self.read_current_from_device()

         if not self.should_update():

             return False

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

         self.update_on_device()

         return True

@@ -412,7 +389,7 @@ class ArgumentSpec(object):

         self.supports_check_mode = True

         self.states = ['present']

         self.on_off_choices = ['enabled', 'disabled', 'True', 'False'] + list(BOOLEANS)

-        self.argument_spec = dict(

+        argument_spec = dict(

             security_banner=dict(

                 choices=self.on_off_choices

             ),

@@ -435,39 +412,30 @@ class ArgumentSpec(object):

             console_timeout=dict(required=False, type='int', default=None),

             state=dict(default='present', choices=['present'])

         )

-        self.f5_product_name = 'bigip'

-

-

-def cleanup_tokens(client):

-    try:

-        resource = client.api.shared.authz.tokens_s.token.load(

-            name=client.api.icrs.token

-        )

-        resource.delete()

-    except Exception:

-        pass

+        self.argument_spec = {}

+        self.argument_spec.update(f5_argument_spec)

+        self.argument_spec.update(argument_spec)

 def main():

-    if not HAS_F5SDK:

-        raise F5ModuleError("The python f5-sdk module is required")

-

     spec = ArgumentSpec()

-    client = AnsibleF5Client(

+    module = AnsibleModule(

         argument_spec=spec.argument_spec,

-        supports_check_mode=spec.supports_check_mode,

-        f5_product_name=spec.f5_product_name

+        supports_check_mode=spec.supports_check_mode

     )

+    if not HAS_F5SDK:

+        module.fail_json(msg="The python f5-sdk module is required")

     try:

-        mm = ModuleManager(client)

+        client = F5Client(**module.params)

+        mm = ModuleManager(module=module, client=client)

         results = mm.exec_module()

         cleanup_tokens(client)

-        client.module.exit_json(**results)

-    except F5ModuleError as e:

+        module.exit_json(**results)

+    except F5ModuleError as ex:

         cleanup_tokens(client)

-        client.module.fail_json(msg=str(e))

+        module.fail_json(msg=str(ex))

 if __name__ == '__main__':

@@ -24,11 +24,20 @@ options:

     description:

       - The name of the traffic group.

     required: True

-notes:

-  - Requires the f5-sdk Python package on the host. This is as easy as

-    C(pip install f5-sdk).

-requirements:

-  - f5-sdk >= 3.0.5

+  partition:

+    description:

+      - Device partition to manage resources on.

+    default: Common

+    version_added: 2.5

+  state:

+    description:

+      - When C(present), ensures that the traffic group exists.

+      - When C(absent), ensures the traffic group is removed.

+    default: present

+    choices:

+      - present

+      - absent

+    version_added: 2.5

 extends_documentation_fragment: f5

 author:

   - Tim Rupp (@caphrim007)

@@ -49,18 +58,38 @@ RETURN = r'''

 # only common fields returned

 '''

+from ansible.module_utils.basic import AnsibleModule

+from ansible.module_utils.basic import env_fallback

-from ansible.module_utils.f5_utils import AnsibleF5Client

-from ansible.module_utils.f5_utils import AnsibleF5Parameters

-from ansible.module_utils.f5_utils import HAS_F5SDK

-from ansible.module_utils.f5_utils import F5ModuleError

-from ansible.module_utils.six import iteritems

-from collections import defaultdict

+HAS_DEVEL_IMPORTS = False

 try:

-    from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError

+    # Sideband repository used for dev

+    from library.module_utils.network.f5.bigip import HAS_F5SDK

+    from library.module_utils.network.f5.bigip import F5Client

+    from library.module_utils.network.f5.common import F5ModuleError

+    from library.module_utils.network.f5.common import AnsibleF5Parameters

+    from library.module_utils.network.f5.common import cleanup_tokens

+    from library.module_utils.network.f5.common import fqdn_name

+    from library.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from library.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

+    HAS_DEVEL_IMPORTS = True

 except ImportError:

-    HAS_F5SDK = False

+    # Upstream Ansible

+    from ansible.module_utils.network.f5.bigip import HAS_F5SDK

+    from ansible.module_utils.network.f5.bigip import F5Client

+    from ansible.module_utils.network.f5.common import F5ModuleError

+    from ansible.module_utils.network.f5.common import AnsibleF5Parameters

+    from ansible.module_utils.network.f5.common import cleanup_tokens

+    from ansible.module_utils.network.f5.common import fqdn_name

+    from ansible.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

 class Parameters(AnsibleF5Parameters):

@@ -80,36 +109,6 @@ class Parameters(AnsibleF5Parameters):

     ]

-    def __init__(self, params=None):

-        self._values = defaultdict(lambda: None)

-        self._values['__warnings'] = []

-        if params:

-            self.update(params=params)

-

-    def update(self, params=None):

-        if params:

-            for k, v in iteritems(params):

-                if self.api_map is not None and k in self.api_map:

-                    map_key = self.api_map[k]

-                else:

-                    map_key = k

-

-                # Handle weird API parameters like `dns.proxy.__iter__` by

-                # using a map provided by the module developer

-                class_attr = getattr(type(self), map_key, None)

-                if isinstance(class_attr, property):

-                    # There is a mapped value for the api_map key

-                    if class_attr.fset is None:

-                        # If the mapped value does not have

-                        # an associated setter

-                        self._values[map_key] = v

-                    else:

-                        # The mapped value has a setter

-                        setattr(self, map_key, v)

-                else:

-                    # If the mapped value is not a @property

-                    self._values[map_key] = v

-

     def to_return(self):

         result = {}

         try:

@@ -120,16 +119,6 @@ class Parameters(AnsibleF5Parameters):

             pass

         return result

-    def api_params(self):

-        result = {}

-        for api_attribute in self.api_attributes:

-            if self.api_map is not None and api_attribute in self.api_map:

-                result[api_attribute] = getattr(self, self.api_map[api_attribute])

-            else:

-                result[api_attribute] = getattr(self, api_attribute)

-        result = self._filter_params(result)

-        return result

-

 class Changes(Parameters):

     pass

@@ -164,9 +153,10 @@ class Difference(object):

 class ModuleManager(object):

-    def __init__(self, client):

-        self.client = client

-        self.want = Parameters(self.client.module.params)

+    def __init__(self, *args, **kwargs):

+        self.module = kwargs.get('module', None)

+        self.client = kwargs.get('client', None)

+        self.want = Parameters(params=self.module.params)

         self.changes = Changes()

     def _set_changed_options(self):

@@ -175,38 +165,9 @@ class ModuleManager(object):

             if getattr(self.want, key) is not None:

                 changed[key] = getattr(self.want, key)

         if changed:

-            self.changes = Changes(changed)

+            self.changes = Changes(params=changed)

     def _update_changed_options(self):

-        """Sets the changed updatables when updating a resource

-

-        A module needs to know what changed to determine whether to update

-        a resource (or set of resources). This method accomplishes this by

-        invoking the Difference engine code.

-

-        Each parameter in the `Parameter` class' `updatables` array will be

-        given to the Difference engine's `compare` method. This is done in the

-        order the updatables are listed in the array.

-

-        The `compare` method updates the `changes` dictionary if the following

-        way,

-

-        * If `None` is returned, a change will not be registered.

-        * If a dictionary is returned, the `changes` dictionary will be updated

-          with the values in what was returned.

-        * Otherwise, the `changes` dictionary's key (the parameter being

-          compared) will be set to the value that is returned by `compare`

-

-        The dictionary behavior is in place to allow you to change the key

-        that is set in the `changes` dictionary. There are frequently cases

-        where there is not a clean API map that can be set, nor a way to

-        otherwise allow you to change the attribute name of the resource being

-        updated before it is sent off to the remote device. Using a dictionary

-        return value of `compare` allows you to do this.

-

-        Returns:

-            bool: True when changes are present. False otherwise.

-        """

         diff = Difference(self.want, self.have)

         updatables = Parameters.updatables

         changed = dict()

@@ -220,7 +181,7 @@ class ModuleManager(object):

                 else:

                     changed[k] = change

         if changed:

-            self.changes = Changes(changed)

+            self.changes = Changes(params=changed)

             return True

         return False

@@ -252,7 +213,7 @@ class ModuleManager(object):

     def _announce_deprecations(self, result):

         warnings = result.pop('__warnings', [])

         for warning in warnings:

-            self.client.module.deprecate(

+            self.module.deprecate(

                 msg=warning['msg'],

                 version=warning['version']

             )

@@ -274,13 +235,13 @@ class ModuleManager(object):

         self.have = self.read_current_from_device()

         if not self.should_update():

             return False

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

         self.update_on_device()

         return True

     def remove(self):

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

         self.remove_from_device()

         if self.exists():

@@ -293,7 +254,7 @@ class ModuleManager(object):

             raise F5ModuleError(

                 "Traffic groups can only be created in the /Common partition"

             )

-        if self.client.check_mode:

+        if self.module.check_mode:

             return True

         self.create_on_device()

         return True

@@ -333,49 +294,44 @@ class ModuleManager(object):

             partition=self.want.partition

         )

         result = resource.attrs

-        return Parameters(result)

+        return Parameters(params=result)

 class ArgumentSpec(object):

     def __init__(self):

         self.supports_check_mode = True

-        self.argument_spec = dict(

+        argument_spec = dict(

             name=dict(required=True),

-            state=dict(default='present', choices=['absent', 'present'])

-        )

-        self.f5_product_name = 'bigip'

-

-

-def cleanup_tokens(client):

-    try:

-        resource = client.api.shared.authz.tokens_s.token.load(

-            name=client.api.icrs.token

+            state=dict(default='present', choices=['absent', 'present']),

+            partition=dict(

+                default='Common',

+                fallback=(env_fallback, ['F5_PARTITION'])

+            )

         )

-        resource.delete()

-    except Exception:

-        pass

+        self.argument_spec = {}

+        self.argument_spec.update(f5_argument_spec)

+        self.argument_spec.update(argument_spec)

 def main():

-    if not HAS_F5SDK:

-        raise F5ModuleError("The python f5-sdk module is required")

-

     spec = ArgumentSpec()

-    client = AnsibleF5Client(

+    module = AnsibleModule(

         argument_spec=spec.argument_spec,

-        supports_check_mode=spec.supports_check_mode,

-        f5_product_name=spec.f5_product_name

+        supports_check_mode=spec.supports_check_mode

     )

+    if not HAS_F5SDK:

+        module.fail_json(msg="The python f5-sdk module is required")

     try:

-        mm = ModuleManager(client)

+        client = F5Client(**module.params)

+        mm = ModuleManager(module=module, client=client)

         results = mm.exec_module()

         cleanup_tokens(client)

-        client.module.exit_json(**results)

-    except F5ModuleError as e:

+        module.exit_json(**results)

+    except F5ModuleError as ex:

         cleanup_tokens(client)

-        client.module.fail_json(msg=str(e))

+        module.fail_json(msg=str(ex))

 if __name__ == '__main__':

@@ -87,8 +87,6 @@ options:

       - installed

       - present

 notes:

-   - Requires the f5-sdk Python package on the host. This is as easy as

-     pip install f5-sdk.

    - Only the most basic checks are performed by this module. Other checks and

      considerations need to be taken into account. See the following URL.

      https://support.f5.com/kb/en-us/solutions/public/11000/300/sol11318.html

@@ -110,8 +108,6 @@ notes:

    - This module does not support restoring encrypted archives on replacement

      RMA units.

 extends_documentation_fragment: f5

-requirements:

-  - f5-sdk

 author:

   - Tim Rupp (@caphrim007)

 '''

@@ -182,28 +178,49 @@ RETURN = r'''

 import os

 import re

-import sys

 import time

-from distutils.version import LooseVersion

-from ansible.module_utils.f5_utils import AnsibleF5Client

-from ansible.module_utils.f5_utils import AnsibleF5Parameters

-from ansible.module_utils.f5_utils import HAS_F5SDK

-from ansible.module_utils.f5_utils import F5ModuleError

+from ansible.module_utils.basic import AnsibleModule

 from ansible.module_utils.six import iteritems

+from distutils.version import LooseVersion

+

+HAS_DEVEL_IMPORTS = False

 try:

-    from collections import OrderedDict

+    # Sideband repository used for dev

+    from library.module_utils.network.f5.bigip import HAS_F5SDK

+    from library.module_utils.network.f5.bigip import F5Client

+    from library.module_utils.network.f5.common import F5ModuleError

+    from library.module_utils.network.f5.common import AnsibleF5Parameters

+    from library.module_utils.network.f5.common import cleanup_tokens

+    from library.module_utils.network.f5.common import fqdn_name

+    from library.module_utils.network.f5.common import f5_argument_spec

+    try:

+        from library.module_utils.network.f5.common import iControlUnexpectedHTTPError

+    except ImportError:

+        HAS_F5SDK = False

+    HAS_DEVEL_IMPORTS = True

 except ImportError:

+    # Upstream Ansible

+    from ansible.module_utils.network.f5.bigip import HAS_F5SDK

+    from ansible.module_utils.network.f5.bigip import F5Client

+    from ansible.module_utils.network.f5.common import F5ModuleError

+    from ansible.module_utils.network.f5.common import AnsibleF5Parameters

+    from ansible.module_utils.network.f5.common import cleanup_tokens

+    from ansible.module_utils.network.f5.common import fqdn_name

+    from ansible.module_utils.network.f5.common import f5_argument_spec

     try:

-        from ordereddict import OrderedDict

+        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError

     except ImportError:

-        pass

+        HAS_F5SDK = False

 try:

-    from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError

+    from collections import OrderedDict

 except ImportError:

-    HAS_F5SDK = False

+    try:

+        from ordereddict import OrderedDict

+    except ImportError:

+        pass

 class Parameters(AnsibleF5Parameters):

@@ -292,14 +309,15 @@ class Parameters(AnsibleF5Parameters):

 class ModuleManager(object):

-    def __init__(self, client):

-        self.client = client

+    def __init__(self, *args, **kwargs):

+        self.client = kwargs.get('client', None)

+        self.kwargs = kwargs

     def exec_module(self):

         if self.is_version_v1():

-            manager = V1Manager(self.client)

+            manager = V1Manager(**self.kwargs)

         else:

-            manager = V2Manager(self.client)

+            manager = V2Manager(**self.kwargs)

         return manager.exec_module()

@@ -321,10 +339,10 @@ class ModuleManager(object):