Fix sshtestagent to return exit status correctly.
Also return true for vsg health if vsg doesn't have an ip configured.
Change-Id: Ie4dea9a5efa629a23834438fd86ab15460c94e6c
diff --git a/src/test/utils/SSHTestAgent.py b/src/test/utils/SSHTestAgent.py
index e5930bf..e9022af 100644
--- a/src/test/utils/SSHTestAgent.py
+++ b/src/test/utils/SSHTestAgent.py
@@ -35,8 +35,10 @@
channel = self.client.get_transport().open_session()
channel.exec_command(cmd)
+ status_ready = False
if channel.exit_status_ready():
status = channel.recv_exit_status()
+ status_ready = True
else:
status = 0
output = None
@@ -49,6 +51,9 @@
output += data
else:
break
+ if status_ready is False:
+ status = channel.recv_exit_status()
+ st = status == 0
time.sleep(0.1)
channel.close()
self.client.close()
diff --git a/src/test/utils/VSGAccess.py b/src/test/utils/VSGAccess.py
index cb47805..392ebde 100644
--- a/src/test/utils/VSGAccess.py
+++ b/src/test/utils/VSGAccess.py
@@ -317,7 +317,7 @@
def get_health(self):
if self.ip is None:
- return False
+ return True
cmd = 'ping -c 1 {}'.format(self.ip)
st, _ = self.run_cmd_compute(cmd)
return st