ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix reconstructing socket path in network_cli (#33572)

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

*  Integration test fixes
This commit is contained in:
Ganesh Nalawade 2017-12-05 15:11:49 +05:30 committed by GitHub
parent 6654d69569
commit 399e72abb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/plugins/connection/network_cli.py
View file

@ -216,7 +216,7 @@ class Connection(ConnectionBase):
value to None and the _connected value to False value to None and the _connected value to False
''' '''
ssh = connection_loader.get('ssh', class_only=True) 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) tmp_path = unfrackpath(C.PERSISTENT_CONTROL_PATH_DIR)
socket_path = unfrackpath(cp % dict(directory=tmp_path)) socket_path = unfrackpath(cp % dict(directory=tmp_path))

2
test/integration/targets/ios_interface/tests/cli/intent.yaml
View file

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

3
test/integration/targets/ios_user/tests/cli/auth.yaml
View file

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