aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2020-01-17 14:20:49 +0100
committerVratko Polak <vrpolak@cisco.com>2020-01-17 13:28:26 +0000
commite206bb978809135e907841db46ea5765070e818e (patch)
tree07e9bab03402ad0d0bb2e3193674f65fb807e171 /resources
parent0e4a0e02c9b7651adf6e0a0cb101c449a4e9b848 (diff)
Fix unreservation
It got broken by the previous reservation fix. Change-Id: I5d9091b7fa4fcc37148c0223fe8eb83f7e5b6770 Signed-off-by: Vratko Polak <vrpolak@cisco.com> (cherry picked from commit ac33ed374cb82c9258e4cf57e150f77750362bbc)
Diffstat (limited to 'resources')
-rwxr-xr-xresources/tools/scripts/topo_reservation.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/resources/tools/scripts/topo_reservation.py b/resources/tools/scripts/topo_reservation.py
index 213fa636df..021c60a6b6 100755
--- a/resources/tools/scripts/topo_reservation.py
+++ b/resources/tools/scripts/topo_reservation.py
@@ -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}'/*")