cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tweak transport_tests to avoid logic duplication (#22158)

Browse source
This commit is contained in:
Matt Davis 2017-03-01 15:54:27 -08:00 committed by GitHub
parent 28b882e737
commit 42ccf9ca98
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/connection/ssh.py
View file

@ -62,7 +62,7 @@ class Connection(ConnectionBase):
super(Connection, self).__init__(*args, **kwargs) super(Connection, self).__init__(*args, **kwargs)
self.host = self._play_context.remote_addr self.host = self._play_context.remote_addr
self.port = int(self._play_context.port or 22) self.port = self._play_context.port
self.user = self._play_context.remote_user self.user = self._play_context.remote_user
self.control_path = C.ANSIBLE_SSH_CONTROL_PATH self.control_path = C.ANSIBLE_SSH_CONTROL_PATH
self.control_path_dir = C.ANSIBLE_SSH_CONTROL_PATH_DIR self.control_path_dir = C.ANSIBLE_SSH_CONTROL_PATH_DIR
@ -76,8 +76,9 @@ class Connection(ConnectionBase):
def transport_test(self, connect_timeout): def transport_test(self, connect_timeout):
''' Test the transport mechanism, if available ''' ''' Test the transport mechanism, if available '''
display.vvv("attempting transport test to %s:%s" % (self.host, self.port)) port = int(self.port or 22)
sock = socket.create_connection((self.host, self.port), connect_timeout) display.vvv("attempting transport test to %s:%s" % (self.host, port))
sock = socket.create_connection((self.host, port), connect_timeout)
sock.close() sock.close()
@staticmethod @staticmethod

4
lib/ansible/plugins/connection/winrm.py
View file

@ -92,8 +92,8 @@ class Connection(ConnectionBase):
def transport_test(self, connect_timeout): def transport_test(self, connect_timeout):
''' Test the transport mechanism, if available ''' ''' Test the transport mechanism, if available '''
host = self._play_context.remote_addr host = self._winrm_host
port = int(self._play_context.port or 5986) port = int(self._winrm_port)
display.vvv("attempting transport test to %s:%s" % (host, port)) display.vvv("attempting transport test to %s:%s" % (host, port))
sock = socket.create_connection((host, port), connect_timeout) sock = socket.create_connection((host, port), connect_timeout)
sock.close() sock.close()