Fix import errors caused by ansible.netcommon 2.0.0 breaking changes (#…

…531) (#533)

* Fix import errors caused by ansible.netcommon 2.0.0 breaking changes

* Add changelog fragment

(cherry picked from commit 448b6f8)

Co-authored-by: Andrew Klychkov <aklychko@redhat.com>

changelogs/fragments/0-fix_imports.yml

@@ -0,0 +1,4 @@
+bugfixes:
+- cnos_l3_interface - fix import errors (https://github.com/ansible-collections/community.network/pull/531).
+- icx_l3_interface - fix import errors (https://github.com/ansible-collections/community.network/pull/531).
+- slxos_l3_interface - fix import errors (https://github.com/ansible-collections/community.network/pull/531).

plugins/modules/cnos_l3_interface.py

@@ -125,8 +125,10 @@
 from ansible_collections.community.network.plugins.module_utils.network.cnos.cnos import run_commands
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.config import NetworkConfig
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import remove_default_spec
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import to_netmask, to_masklen
+try:
+    from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+except ImportError:
+    from ansible.module_utils.common.network import is_netmask, is_masklen, to_netmask, to_masklen
 
 
 def validate_ipv4(value, module):

plugins/modules/icx_l3_interface.py

@@ -197,7 +197,10 @@
 from ansible_collections.community.network.plugins.module_utils.network.icx.icx import get_config, load_config
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.config import NetworkConfig
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import remove_default_spec
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+try:
+    from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+except ImportError:
+    from ansible.module_utils.common.network import is_netmask, is_masklen, to_netmask, to_masklen
 
 
 def validate_ipv4(value, module):

plugins/modules/slxos_l3_interface.py

@@ -107,7 +107,10 @@
 from ansible_collections.community.network.plugins.module_utils.network.slxos.slxos import get_config, load_config
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.config import NetworkConfig
 from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import conditional, remove_default_spec
-from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+try:
+    from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+except ImportError:
+    from ansible.module_utils.common.network import is_netmask, is_masklen, to_netmask, to_masklen
 
 
 def validate_ipv4(value, module):