From 7f9fbdbb703e1b93193e02bab9ed7abe1b5f1e34 Mon Sep 17 00:00:00 2001
From: Bjoern Senfftleben <bjoern.senfftleben@xfel.eu>
Date: Sun, 9 Feb 2025 17:35:52 +0100
Subject: [PATCH] fix link status identfication based on ssh output
---
src/tempus/Tempus.py | 52 ++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/tempus/Tempus.py b/src/tempus/Tempus.py
index 82b5791..7ce05fb 100644
--- a/src/tempus/Tempus.py
+++ b/src/tempus/Tempus.py
@@ -242,20 +242,20 @@ class Tempus(Device):
link_result = await self.send_command(
f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 "
- "-l 0x0 -s 0x{link_speed:.0f}')", sleep_time=15) # 0x2 -> 0x1 at the end would double the bandwidth per link to 2.56 Gbit/s instead of 1.28
- if "DOWN" in link_result:
+ f"-l 0x0 -s 0x{link_speed:.0f}')", sleep_time=15) # 0x2 -> 0x1 at the end would double the bandwidth per link to 2.56 Gbit/s instead of 1.28
+ if "is Down" in link_result:
self.LinkStateBottom1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom1 = State.ACTIVE
else:
self.LinkStateBottom1 = State.UNKNOWN
link_result = await self.send_command(
f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 "
- "-l 0x0 -s 0x{link_speed:.0f}')", sleep_time=15) # 0x2 -> 0x1 at the end would double the bandwidth per link to 2.56 Gbit/s instead of 1.28
- if "DOWN" in link_result:
+ f"-l 0x0 -s 0x{link_speed:.0f}')", sleep_time=15) # 0x2 -> 0x1 at the end would double the bandwidth per link to 2.56 Gbit/s instead of 1.28
+ if "is Down" in link_result:
self.LinkStateTop1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop1 = State.ACTIVE
else:
self.LinkStateTop1 = State.UNKNOWN
@@ -283,33 +283,33 @@ class Tempus(Device):
await self.send_command("mytpx4.configureGWT()", sleep_time=0.5)
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 -l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateBottom1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom1 = State.ACTIVE
else:
self.LinkStateBottom1 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 -l 0x3 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateBottom2 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom2 = State.ACTIVE
else:
self.LinkStateBottom2 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 -l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateTop1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop1 = State.ACTIVE
else:
self.LinkStateTop1 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 -l 0x1 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateTop2 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop2 = State.ACTIVE
else:
self.LinkStateTop2 = State.UNKNOWN
@@ -344,9 +344,9 @@ class Tempus(Device):
link_result = await self.send_command(
f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 "
"-l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateBottom1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom1 = State.ACTIVE
else:
self.LinkStateBottom1 = State.UNKNOWN
@@ -354,9 +354,9 @@ class Tempus(Device):
link_result = await self.send_command(
f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 "
"-l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateTop1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop1 = State.ACTIVE
else:
self.LinkStateTop1 = State.UNKNOWN
@@ -365,33 +365,33 @@ class Tempus(Device):
self.state = initial_state
else:
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 -l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateBottom1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom1 = State.ACTIVE
else:
self.LinkStateBottom1 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x0 -l 0x3 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateBottom2 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateBottom2 = State.ACTIVE
else:
self.LinkStateBottom2 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 -l 0x0 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateTop1 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop1 = State.ACTIVE
else:
self.LinkStateTop1 = State.UNKNOWN
link_result = await self.send_command(f"os.system('{self.APP_DIR}/sc_set_gwt_link_up.py -i 0x1 -l 0x1 -s 0x2')", sleep_time=15)
- if "DOWN" in link_result:
+ if "is Down" in link_result:
self.LinkStateTop2 = State.ERROR
- elif "READY" in link_result:
+ elif "is READY" in link_result:
self.LinkStateTop2 = State.ACTIVE
else:
self.LinkStateTop2 = State.UNKNOWN
--
GitLab