From df86d8f39e47e3ed4561e3f63e0bfdf582bc5687 Mon Sep 17 00:00:00 2001 From: Tim Rupp Date: Sat, 2 Dec 2017 21:26:23 -0800 Subject: [PATCH] Fixes ordered dict import (#33499) Make it try to fallback to a pypi package if its not found in what ships with python --- lib/ansible/modules/network/f5/bigip_ucs.py | 5 ++++- test/units/modules/network/f5/test_bigip_ucs.py | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/network/f5/bigip_ucs.py b/lib/ansible/modules/network/f5/bigip_ucs.py index 2c5ffe5df8..ee6919b531 100644 --- a/lib/ansible/modules/network/f5/bigip_ucs.py +++ b/lib/ansible/modules/network/f5/bigip_ucs.py @@ -195,7 +195,10 @@ from ansible.module_utils.six import iteritems try: from collections import OrderedDict except ImportError: - pass + try: + from ordereddict import OrderedDict + except ImportError: + pass try: from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError diff --git a/test/units/modules/network/f5/test_bigip_ucs.py b/test/units/modules/network/f5/test_bigip_ucs.py index e819ca28c2..374b46c70e 100644 --- a/test/units/modules/network/f5/test_bigip_ucs.py +++ b/test/units/modules/network/f5/test_bigip_ucs.py @@ -16,10 +16,10 @@ if sys.version_info < (2, 7): raise SkipTest("F5 Ansible modules require Python >= 2.7") from ansible.compat.tests import unittest -from ansible.compat.tests.mock import patch, Mock +from ansible.compat.tests.mock import Mock +from ansible.compat.tests.mock import patch from ansible.module_utils.f5_utils import AnsibleF5Client from ansible.module_utils.f5_utils import F5ModuleError -from units.modules.utils import set_module_args try: from library.bigip_ucs import Parameters @@ -28,6 +28,7 @@ try: from library.bigip_ucs import V1Manager from library.bigip_ucs import V2Manager from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + from test.unit.modules.utils import set_module_args except ImportError: try: from ansible.modules.network.f5.bigip_ucs import Parameters @@ -36,6 +37,7 @@ except ImportError: from ansible.modules.network.f5.bigip_ucs import V1Manager from ansible.modules.network.f5.bigip_ucs import V2Manager from ansible.module_utils.f5_utils import iControlUnexpectedHTTPError + from units.modules.utils import set_module_args except ImportError: raise SkipTest("F5 Ansible modules require the f5-sdk Python library")