Fix reconstructing socket path in network_cli (#33572)

*  Persistent connection socket path is hash of
   remote address, port, remote user and connection
   type.

*  Integration test fixes

lib/ansible/plugins/connection/network_cli.py

@@ -216,7 +216,7 @@ class Connection(ConnectionBase):
         value to None and the _connected value to False
         '''
         ssh = connection_loader.get('ssh', class_only=True)
-        cp = ssh._create_control_path(self._play_context.remote_addr, self._play_context.port, self._play_context.remote_user)
+        cp = ssh._create_control_path(self._play_context.remote_addr, self._play_context.port, self._play_context.remote_user, self._play_context.connection)
 
         tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR)
         socket_path = unfrackpath(cp % dict(directory=tmp_path))

test/integration/targets/ios_interface/tests/cli/intent.yaml

@@ -21,7 +21,7 @@
     name: "{{ test_interface }}"
     state: up
     tx_rate: ge(0)
-    rx_rate: le(0)
+    rx_rate: ge(0)
     authorize: yes
   register: result
 

test/integration/targets/ios_user/tests/cli/auth.yaml

@@ -35,3 +35,6 @@
       state: absent
       authorize: yes
     register: result
+
+  - name: reset connection
+    meta: reset_connection