archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Convert value of port and timeout in provider to integer (#28732)

Browse Source 
Fixes #28361
pull/28338/merge
Ganesh Nalawade 7 years ago committed by GitHub
parent 4137169b21
commit a914a39975
15 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
lib/ansible/plugins/action/aireos.py
Unescape Escape View File

@ -52,10 +52,10 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'aireos' pc.network_os = 'aireos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

4
lib/ansible/plugins/action/aruba.py
Unescape Escape View File

@ -52,11 +52,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'aruba' pc.network_os = 'aruba'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

4
lib/ansible/plugins/action/asa.py
Unescape Escape View File

@ -54,11 +54,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'asa' pc.network_os = 'asa'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']

4
lib/ansible/plugins/action/ce.py
Unescape Escape View File

@ -55,10 +55,10 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'ce' pc.network_os = 'ce'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = int(provider['port']) or int(self._play_context.port) or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
self._task.args['provider'] = provider.update( self._task.args['provider'] = provider.update(
host=pc.remote_addr, host=pc.remote_addr,
port=pc.port, port=pc.port,

4
lib/ansible/plugins/action/dellos10.py
Unescape Escape View File

@ -53,11 +53,11 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context) pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'dellos10' pc.network_os = 'dellos10'
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']

4
lib/ansible/plugins/action/dellos6.py
Unescape Escape View File

@ -49,11 +49,11 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context) pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'dellos6' pc.network_os = 'dellos6'
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']

4
lib/ansible/plugins/action/dellos9.py
Unescape Escape View File

@ -53,11 +53,11 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context) pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'dellos9' pc.network_os = 'dellos9'
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']

8
lib/ansible/plugins/action/eos.py
Unescape Escape View File

@ -55,11 +55,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'eos' pc.network_os = 'eos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']
@ -94,10 +94,10 @@ class ActionModule(_ActionModule):
if provider.get('port') is None: if provider.get('port') is None:
default_port = 443 if provider['use_ssl'] else 80 default_port = 443 if provider['use_ssl'] else 80
provider['port'] = self._play_context.port or default_port provider['port'] = int(self._play_context.port or default_port)
if provider.get('timeout') is None: if provider.get('timeout') is None:
provider['timeout'] = self._play_context.timeout provider['timeout'] = C.PERSISTENT_COMMAND_TIMEOUT
if provider.get('username') is None: if provider.get('username') is None:
provider['username'] = self._play_context.connection_user provider['username'] = self._play_context.connection_user

4
lib/ansible/plugins/action/ios.py
Unescape Escape View File

@ -52,11 +52,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'ios' pc.network_os = 'ios'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
pc.become = provider['authorize'] or False pc.become = provider['authorize'] or False
pc.become_pass = provider['auth_pass'] pc.become_pass = provider['auth_pass']

4
lib/ansible/plugins/action/iosxr.py
Unescape Escape View File

@ -52,10 +52,10 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'iosxr' pc.network_os = 'iosxr'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

2
lib/ansible/plugins/action/junos.py
Unescape Escape View File

@ -71,7 +71,7 @@ class ActionModule(_ActionModule):
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

6
lib/ansible/plugins/action/net_base.py
Unescape Escape View File

@ -51,16 +51,16 @@ class ActionModule(ActionBase):
if play_context.network_os == 'junos': if play_context.network_os == 'junos':
play_context.connection = 'netconf' play_context.connection = 'netconf'
play_context.port = self.provider['port'] or self._play_context.port or 830 play_context.port = int(self.provider['port'] or self._play_context.port or 830)
else: else:
play_context.connection = 'network_cli' play_context.connection = 'network_cli'
play_context.port = self.provider['port'] or self._play_context.port or 22 play_context.port = int(self.provider['port'] or self._play_context.port or 22)
play_context.remote_addr = self.provider['host'] or self._play_context.remote_addr play_context.remote_addr = self.provider['host'] or self._play_context.remote_addr
play_context.remote_user = self.provider['username'] or self._play_context.connection_user play_context.remote_user = self.provider['username'] or self._play_context.connection_user
play_context.password = self.provider['password'] or self._play_context.password play_context.password = self.provider['password'] or self._play_context.password
play_context.private_key_file = self.provider['ssh_keyfile'] or self._play_context.private_key_file play_context.private_key_file = self.provider['ssh_keyfile'] or self._play_context.private_key_file
play_context.timeout = self.provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT play_context.timeout = int(self.provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
if 'authorize' in self.provider.keys(): if 'authorize' in self.provider.keys():
play_context.become = self.provider['authorize'] or False play_context.become = self.provider['authorize'] or False
play_context.become_pass = self.provider['auth_pass'] play_context.become_pass = self.provider['auth_pass']

6
lib/ansible/plugins/action/nxos.py
Unescape Escape View File

@ -55,11 +55,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'nxos' pc.network_os = 'nxos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
self._task.args['provider'] = provider.update( self._task.args['provider'] = provider.update(
host=pc.remote_addr, host=pc.remote_addr,
port=pc.port, port=pc.port,
@ -99,7 +99,7 @@ class ActionModule(_ActionModule):
provider['port'] = 80 provider['port'] = 80
if provider.get('timeout') is None: if provider.get('timeout') is None:
provider['timeout'] = self._play_context.timeout provider['timeout'] = C.PERSISTENT_COMMAND_TIMEOUT
if provider.get('username') is None: if provider.get('username') is None:
provider['username'] = self._play_context.connection_user provider['username'] = self._play_context.connection_user

4
lib/ansible/plugins/action/sros.py
Unescape Escape View File

@ -52,11 +52,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'sros' pc.network_os = 'sros'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

4
lib/ansible/plugins/action/vyos.py
Unescape Escape View File

@ -51,11 +51,11 @@ class ActionModule(_ActionModule):
pc.connection = 'network_cli' pc.connection = 'network_cli'
pc.network_os = 'vyos' pc.network_os = 'vyos'
pc.remote_addr = provider['host'] or self._play_context.remote_addr pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = provider['port'] or self._play_context.port or 22 pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password pc.password = provider['password'] or self._play_context.password
pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file pc.private_key_file = provider['ssh_keyfile'] or self._play_context.private_key_file
pc.timeout = provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT pc.timeout = int(provider['timeout'] or C.PERSISTENT_COMMAND_TIMEOUT)
display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr) display.vvv('using connection plugin %s' % pc.connection, pc.remote_addr)
connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin) connection = self._shared_loader_obj.connection_loader.get('persistent', pc, sys.stdin)

Write Preview
Loading…
Cancel
Save