diff options
| author | Matt Clay <matt@mystile.com> | 2022-03-08 23:54:05 +0100 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2022-03-09 01:11:40 +0100 |
| commit | f68c66a3ef2390d21f5eeb10bb6b151058570206 (patch) | |
| tree | df891dfe8643a43865ce2d239820a356716ba009 /test/support | |
| parent | Fix yaml loader and compat. (diff) | |
| download | ansible-f68c66a3ef2390d21f5eeb10bb6b151058570206.tar.xz ansible-f68c66a3ef2390d21f5eeb10bb6b151058570206.zip | |
Remove collections compat from controller code.
Diffstat (limited to 'test/support')
4 files changed, 7 insertions, 4 deletions
diff --git a/test/support/integration/plugins/inventory/foreman.py b/test/support/integration/plugins/inventory/foreman.py index 39e0de338b..d026ebdb29 100644 --- a/test/support/integration/plugins/inventory/foreman.py +++ b/test/support/integration/plugins/inventory/foreman.py @@ -81,11 +81,12 @@ password: secure validate_certs: False ''' +from collections.abc import MutableMapping + from ansible.module_utils.compat.version import LooseVersion from ansible.errors import AnsibleError from ansible.module_utils._text import to_bytes, to_native, to_text -from ansible.module_utils.common._collections_compat import MutableMapping from ansible.plugins.inventory import BaseInventoryPlugin, Cacheable, to_safe_group_name, Constructable # 3rd party imports diff --git a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/filter/network.py b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/filter/network.py index f99e6e7609..72d6c8684c 100644 --- a/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/filter/network.py +++ b/test/support/network-integration/collections/ansible_collections/ansible/netcommon/plugins/filter/network.py @@ -26,6 +26,7 @@ import os import traceback import string +from collections.abc import Mapping from xml.etree.ElementTree import fromstring from ansible.module_utils._text import to_native, to_text @@ -33,7 +34,6 @@ from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.u Template, ) from ansible.module_utils.six import iteritems, string_types -from ansible.module_utils.common._collections_compat import Mapping from ansible.errors import AnsibleError, AnsibleFilterError from ansible.utils.display import Display from ansible.utils.encrypt import passlib_or_crypt, random_password diff --git a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py index 8a39003449..feba971ac8 100644 --- a/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py +++ b/test/support/network-integration/collections/ansible_collections/cisco/ios/plugins/cliconf/ios.py @@ -35,9 +35,10 @@ import re import time import json +from collections.abc import Mapping + from ansible.errors import AnsibleConnectionFailure from ansible.module_utils._text import to_text -from ansible.module_utils.common._collections_compat import Mapping from ansible.module_utils.six import iteritems from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.config import ( NetworkConfig, diff --git a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py index 3033603100..3212615f0c 100644 --- a/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py +++ b/test/support/network-integration/collections/ansible_collections/vyos/vyos/plugins/cliconf/vyos.py @@ -34,9 +34,10 @@ version_added: "2.4" import re import json +from collections.abc import Mapping + from ansible.errors import AnsibleConnectionFailure from ansible.module_utils._text import to_text -from ansible.module_utils.common._collections_compat import Mapping from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.config import ( NetworkConfig, ) |