maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CI: Drop IP check when connectiong via SSH and pubkey

Browse Source
This commit is contained in:
Robert Schmidt
2022-07-15 16:00:52 +02:00
parent ae05420c84
commit 16c758ae09
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/sshconnection.py
+5 -10
View File
@@ -84,16 +84,11 @@ class SSHConnection():
else: else:
logging.debug('self.sshresponse = ' + str(self.sshresponse)) logging.debug('self.sshresponse = ' + str(self.sshresponse))
elif self.sshresponse == 2: elif self.sshresponse == 2:
# Checking if we are really on the remote client defined by its IP address # We directly ended up on the remote server because of pubkey auth
self.ssh.sendline('stdbuf -o0 ifconfig | egrep --color=never "inet addr:|inet "') count = 10
self.sshresponse = self.ssh.expect([ipaddress, pexpect.EOF, pexpect.TIMEOUT]) connect_status = True
if self.sshresponse == 0: # this expect() seems to be necessary to advance the read buffer until the prompt, or getBefore() will not return the last command
count = 10 self.sshresponse = self.ssh.expect([prompt])
connect_status = True
# this expect seems to be necessary to advance the read buffer until the prompt, or getBefore() will not return the last command
self.sshresponse = self.ssh.expect([prompt])
else:
logging.error('logged in to ' + ipaddress + ' without password but IP is not found via ifconfig on remote host, aborting')
else: else:
# debug output # debug output
logging.debug(str(self.ssh.before)) logging.debug(str(self.ssh.before))