nxos integration fix part 1 (#27069)

* Assorted Python 3 fixes

* Fix `testcase` definition in integration tests

* Fix nxos_acl_interface

* clean up nxapi after nxos_nxapi

lib/ansible/module_utils/nxos.py

@@ -27,7 +27,7 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
 # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-import re
+
 import collections
 
 from ansible.module_utils._text import to_text

lib/ansible/modules/network/nxos/nxos_acl_interface.py

@@ -88,7 +88,10 @@ from ansible.module_utils.basic import AnsibleModule
 def check_for_acl_int_present(module, name, intf, direction):
     # Need to Captitalize the interface name as the nxos
     # output has capitalization
-    command = ['show running-config aclmgr | section {0}'.format(intf.title())]
+    command = [{
+        'command': 'show running-config aclmgr | section {0}'.format(intf.title()),
+        'output': 'text',
+    }]
     body = run_commands(module, command)
 
     if direction == 'ingress':

lib/ansible/plugins/action/nxos_config.py

@@ -41,7 +41,7 @@ class ActionModule(_ActionModule):
             try:
                 self._handle_template()
             except ValueError as exc:
-                return dict(failed=True, msg=exc.message)
+                return dict(failed=True, msg=str(exc))
 
         result = super(ActionModule, self).run(tmp, task_vars)
 
@@ -55,7 +55,7 @@ class ActionModule(_ActionModule):
 
         # strip out any keys that have two leading and two trailing
         # underscore characters
-        for key in result.keys():
+        for key in list(result.keys()):
             if PRIVATE_KEYS_RE.match(key):
                 del result[key]
 

lib/ansible/plugins/action/nxos_template.py

@@ -22,9 +22,9 @@ __metaclass__ = type
 import os
 import time
 import glob
-import urlparse
 
 from ansible.module_utils._text import to_text
+from ansible.module_utils.six.moves.urllib.parse import urlsplit
 from ansible.plugins.action.nxos import ActionModule as _ActionModule
 
 
@@ -35,7 +35,7 @@ class ActionModule(_ActionModule):
         try:
             self._handle_template()
         except (ValueError, AttributeError) as exc:
-            return dict(failed=True, msg=exc.message)
+            return dict(failed=True, msg=str(exc))
 
         result = super(ActionModule, self).run(tmp, task_vars)
 
@@ -72,7 +72,7 @@ class ActionModule(_ActionModule):
 
         working_path = self._get_working_path()
 
-        if os.path.isabs(src) or urlparse.urlsplit(src).scheme:
+        if os.path.isabs(src) or urlsplit(src).scheme:
             source = src
         else:
             source = self._loader.path_dwim_relative(working_path, 'templates', src)

test/integration/targets/nxos_command/tests/cli/lessthanorequal.yaml

@@ -1,5 +1,5 @@
 ---
-- debug: msg="START cli/lesstahnorequal.yaml"
+- debug: msg="START cli/lessthanorequal.yaml"
 
 - name: test le operator
   nxos_command:
@@ -29,4 +29,4 @@
     that:
       - "result.changed == false"
 
-- debug: msg="END cli/lesstahnorequal.yaml"
+- debug: msg="END cli/lessthanorequal.yaml"

test/integration/targets/nxos_evpn_global/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+testcase: "*"

test/integration/targets/nxos_feature/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+testcase: "*"

test/integration/targets/nxos_interface/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+testcase: "*"

test/integration/targets/nxos_mtu/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+testcase: "*"

test/integration/targets/nxos_nxapi/tasks/cli.yaml

@@ -13,3 +13,9 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
+
+- name: disable nxapi
+  nxos_config:
+    lines:
+      - no feature nxapi
+    provider: "{{ cli }}"

test/integration/targets/nxos_system/defaults/main.yaml

@@ -0,0 +1,2 @@
+---
+testcase: "*"

test/units/modules/network/nxos/test_nxos_acl_interface.py

@@ -48,8 +48,7 @@ class TestNxosAclInterfaceModule(TestNxosModule):
 
             for item in commands:
                 try:
-                    obj = json.loads(item)
+                    command = item['command']
-                    command = obj['command']
                 except ValueError:
                     command = item
                 filename = '%s.txt' % str(command).split(' | ')[0].replace(' ', '_')