Fix unreservation 08/24408/1
authorVratko Polak <vrpolak@cisco.com>
Fri, 17 Jan 2020 13:20:49 +0000 (14:20 +0100)
committerVratko Polak <vrpolak@cisco.com>
Fri, 17 Jan 2020 13:20:49 +0000 (14:20 +0100)
It got broken by the previous reservation fix.

Change-Id: I5d9091b7fa4fcc37148c0223fe8eb83f7e5b6770
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
resources/tools/scripts/topo_reservation.py

index 213fa63..021c60a 100755 (executable)
@@ -103,7 +103,8 @@ def main():
         # If connection is refused, ret==None.
         if ret != 0:
             print(f"Cancellation unsuccessful:\n{err!r}")
-        return 1
+            return 1
+        return 0
     # Before critical section, output can be outdated already.
     print(u"Diagnostic commands:")
     # -d and * are to suppress "total <size>", see https://askubuntu.com/a/61190
@@ -113,7 +114,7 @@ def main():
     ret, _, _ = exec_cmd(node, f"mkdir '{RESERVATION_DIR}'")
     # Critical section is over.
     if ret is None:
-        print(f"Failed to connect to testbed.")
+        print(u"Failed to connect to testbed.")
         return 1
     if ret != 0:
         _, stdo, _ = exec_cmd(node, f"ls '{RESERVATION_DIR}'/*")