Removes f5-sdk from bigip_device_connectivity (#48460)

lib/ansible/modules/network/f5/bigip_device_connectivity.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
-# Copyright (c) 2017 F5 Networks Inc.
+# Copyright: (c) 2017, F5 Networks Inc.
 # GNU General Public License v3.0 (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 from __future__ import absolute_import, division, print_function
@@ -84,6 +84,7 @@ notes:
 extends_documentation_fragment: f5
 author:
   - Tim Rupp (@caphrim007)
+  - Wojciech Wypior (@wojtek0806)
 '''
 
 EXAMPLES = r'''
@@ -94,9 +95,10 @@ EXAMPLES = r'''
     unicast_failover:
       - address: management-ip
       - address: 10.1.30.1
-    server: lb.mydomain.com
+    provider:
-    user: admin
+      server: lb.mydomain.com
-    password: secret
+      user: admin
+      password: secret
   delegate_to: localhost
 '''
 
@@ -155,29 +157,25 @@ from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import iteritems
 
 try:
-    from library.module_utils.network.f5.bigip import HAS_F5SDK
+    from library.module_utils.network.f5.bigip import F5RestClient
-    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 transform_name
     from library.module_utils.network.f5.common import f5_argument_spec
+    from library.module_utils.network.f5.common import exit_json
+    from library.module_utils.network.f5.common import fail_json
     from library.module_utils.network.f5.ipaddress import is_valid_ip
-    try:
-        from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
-    except ImportError:
-        HAS_F5SDK = False
 except ImportError:
-    from ansible.module_utils.network.f5.bigip import HAS_F5SDK
+    from ansible.module_utils.network.f5.bigip import F5RestClient
-    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 transform_name
     from ansible.module_utils.network.f5.common import f5_argument_spec
+    from ansible.module_utils.network.f5.common import exit_json
+    from ansible.module_utils.network.f5.common import fail_json
     from ansible.module_utils.network.f5.ipaddress import is_valid_ip
-    try:
-        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
-    except ImportError:
-        HAS_F5SDK = False
 
 
 class Parameters(AnsibleF5Parameters):
@@ -189,7 +187,7 @@ class Parameters(AnsibleF5Parameters):
         'multicastPort': 'multicast_port',
         'mirrorIp': 'mirror_primary_address',
         'mirrorSecondaryIp': 'mirror_secondary_address',
-        'managementIp': 'management_ip'
+        'managementIp': 'management_ip',
     }
     api_attributes = [
         'configsyncIp',
@@ -344,10 +342,14 @@ class Changes(Parameters):
         result = {}
         try:
             for returnable in self.returnables:
-                result[returnable] = getattr(self, returnable)
+                change = getattr(self, returnable)
+                if isinstance(change, dict):
+                    result.update(change)
+                else:
+                    result[returnable] = change
+            result = self._filter_params(result)
         except Exception:
             pass
-        result = self._filter_params(result)
         return result
 
 
@@ -489,6 +491,7 @@ class ModuleManager(object):
         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()
 
     def _update_changed_options(self):
@@ -518,10 +521,7 @@ class ModuleManager(object):
     def exec_module(self):
         result = dict()
 
-        try:
+        changed = self.update()
-            changed = self.update()
-        except iControlUnexpectedHTTPError as e:
-            raise F5ModuleError(str(e))
 
         reportable = ReportableChanges(params=self.changes.to_return())
         changes = reportable.to_return()
@@ -544,33 +544,125 @@ class ModuleManager(object):
         params = self.changes.api_params()
         if not params:
             return
-        collection = self.client.api.tm.cm.devices.get_collection()
+        uri = "https://{0}:{1}/mgmt/tm/cm/device/".format(
-        for resource in collection:
+            self.client.provider['server'],
-            if resource.selfDevice == 'true':
+            self.client.provider['server_port'],
-                resource.modify(**params)
+        )
+        resp = self.client.api.get(uri)
+        try:
+            response = resp.json()
+        except ValueError as ex:
+            raise F5ModuleError(str(ex))
+
+        if 'code' in response and response['code'] == 400:
+            if 'message' in response:
+                raise F5ModuleError(response['message'])
+            else:
+                raise F5ModuleError(resp.content)
+
+        for item in response['items']:
+            if item['selfDevice'] == 'true':
+                uri = "https://{0}:{1}/mgmt/tm/cm/device/{2}".format(
+                    self.client.provider['server'],
+                    self.client.provider['server_port'],
+                    transform_name(item['partition'], item['name'])
+                )
+                resp = self.client.api.patch(uri, json=params)
+                try:
+                    response = resp.json()
+                except ValueError as ex:
+                    raise F5ModuleError(str(ex))
+
+                if 'code' in response and response['code'] == 400:
+                    if 'message' in response:
+                        raise F5ModuleError(response['message'])
+                    else:
+                        raise F5ModuleError(resp.content)
                 return
         raise F5ModuleError(
             "The host device was not found."
         )
 
     def update_cluster_mirroring_on_device(self):
-        resource = self.client.api.tm.sys.dbs.db.load(name='statemirror.clustermirroring')
+        uri = "https://{0}:{1}/mgmt/tm/sys/db/{2}".format(
-        resource.update(value=self.changes.cluster_mirroring)
+            self.client.provider['server'],
+            self.client.provider['server_port'],
+            'statemirror.clustermirroring'
+        )
+        payload = {"value": self.changes.cluster_mirroring}
+        resp = self.client.api.patch(uri, json=payload)
+        try:
+            response = resp.json()
+        except ValueError as ex:
+            raise F5ModuleError(str(ex))
+
+        if 'code' in response and response['code'] == 400:
+            if 'message' in response:
+                raise F5ModuleError(response['message'])
+            else:
+                raise F5ModuleError(resp.content)
 
     def read_current_from_device(self):
-        collection = self.client.api.tm.cm.devices.get_collection()
+        db = self.read_cluster_mirroring_from_device()
-        for resource in collection:
+        uri = "https://{0}:{1}/mgmt/tm/cm/device/".format(
-            if resource.selfDevice == 'true':
+            self.client.provider['server'],
-                result = resource.attrs
+            self.client.provider['server_port'],
-                result['cluster_mirroring'] = self.read_cluster_mirroring_from_device()
+        )
-                return ApiParameters(params=result)
+        resp = self.client.api.get(uri)
+        try:
+            response = resp.json()
+        except ValueError as ex:
+            raise F5ModuleError(str(ex))
+
+        if 'code' in response and response['code'] == 400:
+            if 'message' in response:
+                raise F5ModuleError(response['message'])
+            else:
+                raise F5ModuleError(resp.content)
+
+        for item in response['items']:
+            if item['selfDevice'] == 'true':
+                uri = "https://{0}:{1}/mgmt/tm/cm/device/{2}".format(
+                    self.client.provider['server'],
+                    self.client.provider['server_port'],
+                    transform_name(item['partition'], item['name'])
+                )
+                resp = self.client.api.get(uri)
+                try:
+                    response = resp.json()
+                except ValueError as ex:
+                    raise F5ModuleError(str(ex))
+
+                if 'code' in response and response['code'] == 400:
+                    if 'message' in response:
+                        raise F5ModuleError(response['message'])
+                    else:
+                        raise F5ModuleError(resp.content)
+                if db:
+                    response['cluster_mirroring'] = db['value']
+                return ApiParameters(params=response)
         raise F5ModuleError(
             "The host device was not found."
         )
 
     def read_cluster_mirroring_from_device(self):
-        resource = self.client.api.tm.sys.dbs.db.load(name='statemirror.clustermirroring')
+        uri = "https://{0}:{1}/mgmt/tm/sys/db/{2}".format(
-        return resource.value
+            self.client.provider['server'],
+            self.client.provider['server_port'],
+            'statemirror.clustermirroring'
+        )
+        resp = self.client.api.get(uri)
+        try:
+            response = resp.json()
+        except ValueError as ex:
+            raise F5ModuleError(str(ex))
+
+        if 'code' in response and response['code'] == 400:
+            if 'message' in response:
+                raise F5ModuleError(response['message'])
+            else:
+                raise F5ModuleError(resp.content)
+        return response
 
 
 class ArgumentSpec(object):
@@ -611,18 +703,17 @@ def main():
         supports_check_mode=spec.supports_check_mode,
         required_together=spec.required_together
     )
-    if not HAS_F5SDK:
+
-        module.fail_json(msg="The python f5-sdk module is required")
+    client = F5RestClient(**module.params)
 
     try:
-        client = F5Client(**module.params)
         mm = ModuleManager(module=module, client=client)
         results = mm.exec_module()
         cleanup_tokens(client)
-        module.exit_json(**results)
+        exit_json(module, results, client)
     except F5ModuleError as ex:
         cleanup_tokens(client)
-        module.fail_json(msg=str(ex))
+        fail_json(module, ex, client)
 
 
 if __name__ == '__main__':

test/units/modules/network/f5/test_bigip_device_connectivity.py

@@ -15,9 +15,6 @@ from nose.plugins.skip import SkipTest
 if sys.version_info < (2, 7):
     raise SkipTest("F5 Ansible modules require Python >= 2.7")
 
-from units.compat import unittest
-from units.compat.mock import Mock
-from units.compat.mock import patch
 from ansible.module_utils.basic import AnsibleModule
 
 try:
@@ -25,17 +22,29 @@ try:
     from library.modules.bigip_device_connectivity import ModuleParameters
     from library.modules.bigip_device_connectivity import ModuleManager
     from library.modules.bigip_device_connectivity import ArgumentSpec
+
     from library.module_utils.network.f5.common import F5ModuleError
-    from library.module_utils.network.f5.common import iControlUnexpectedHTTPError
+
-    from test.unit.modules.utils import set_module_args
+    # In Ansible 2.8, Ansible changed import paths.
+    from test.units.compat import unittest
+    from test.units.compat.mock import Mock
+    from test.units.compat.mock import patch
+
+    from test.units.modules.utils import set_module_args
 except ImportError:
     try:
         from ansible.modules.network.f5.bigip_device_connectivity import ApiParameters
         from ansible.modules.network.f5.bigip_device_connectivity import ModuleParameters
         from ansible.modules.network.f5.bigip_device_connectivity import ModuleManager
         from ansible.modules.network.f5.bigip_device_connectivity import ArgumentSpec
+
         from ansible.module_utils.network.f5.common import F5ModuleError
-        from ansible.module_utils.network.f5.common import iControlUnexpectedHTTPError
+
+        # Ansible 2.8 imports
+        from units.compat import unittest
+        from units.compat.mock import Mock
+        from units.compat.mock import patch
+
         from units.modules.utils import set_module_args
     except ImportError:
         raise SkipTest("F5 Ansible modules require the f5-sdk Python library")