rtems-proxy 1.3.0b2__tar.gz → 1.3.0b3__tar.gz

{rtems_proxy-1.3.0b2 → rtems_proxy-1.3.0b3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 1.3.0b2
+Version: 1.3.0b3
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

rtems_proxy-1.3.0b3/rtems-proxy.code-workspace

@@ -0,0 +1,14 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../i06-services"
+		},
+		{
+			"path": "../i04-services"
+		}
+	],
+	"settings": {}
+}

{rtems_proxy-1.3.0b2 → rtems_proxy-1.3.0b3}/src/rtems_proxy/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.3.0b2'
-__version_tuple__ = version_tuple = (1, 3, 0, 'b2')
+__version__ = version = '1.3.0b3'
+__version_tuple__ = version_tuple = (1, 3, 0, 'b3')
 
-__commit_id__ = commit_id = 'g88e506f98'
+__commit_id__ = commit_id = 'g4ee61374d'

{rtems_proxy-1.3.0b2 → rtems_proxy-1.3.0b3}/src/rtems_proxy/telnet.py

@@ -89,7 +89,7 @@ class TelnetRTEMS:
             report("Cannot connect to remote IOC, connection in use?")
             raise CannotConnectError
 
-    def check_prompt(self, retries=5) -> RtemsState:
+    def check_prompt(self, retries) -> RtemsState:
         """
         Determine if we are currently seeing an IOC shell prompt or
         bootloader. Because there is a possibility that we are in the middle
@@ -97,7 +97,7 @@ class TelnetRTEMS:
         """
         assert self._child, "must call connect before check_prompt"
 
-        while retries > 0:
+        for retry in range(retries):
             try:
                 # see if we are in the IOC shell
                 sleep(0.5)
@@ -118,8 +118,7 @@ class TelnetRTEMS:
                 report("Currently in IOC shell")
                 return RtemsState.IOC
 
-            report("Retrying get current status")
-            retries -= 1
+            report(f"Retry {retry + 1} of get current status")
 
         report("Current state UNKNOWN")
         raise CannotConnectError("Current state of remote IOC unknown")
@@ -132,13 +131,13 @@ class TelnetRTEMS:
         assert self._child, "must call connect before reboot"
 
         report(f"Rebooting into {into.name}")
-        current_state = self.check_prompt()
+        current_state = self.check_prompt(retries=2)
         if current_state == RtemsState.MOT:
             self._child.sendline("reset")
         else:
             self._child.sendline("exit")
 
-        self._child.expect(self.CONTINUE, timeout=10)
+        self._child.expect(self.CONTINUE, timeout=30)
         if into == RtemsState.MOT:
             # send escape to get into the bootloader
             self._child.sendline(chr(27))
@@ -146,15 +145,7 @@ class TelnetRTEMS:
             # send space to boot the IOC
             self._child.send(" ")
 
-    def wait_epics_prompt(self, timeout=50):
-        if self._child is None:
-            raise RuntimeError("Connection not established")
-        expects: list[str] = self.FAIL_STRINGS + [self.IOC_STARTED]
-        index = self._child.expect(expects, timeout=timeout)  # type: ignore[arg-type]
-        if index != len(self.FAIL_STRINGS):
-            raise RuntimeError(f"IOC boot failed - output included '{expects[index]}'")
-
-    def get_epics_prompt(self):
+    def get_epics_prompt(self, retries=5):
         """
         Get to the IOC shell prompt, if the IOC is not already running, reboot
         it into the IOC shell. If the IOC is running, do a reboot only if
@@ -162,17 +153,18 @@ class TelnetRTEMS:
         """
         assert self._child, "must call connect before get_epics_prompt"
 
-        current = self.check_prompt()
-        if current != RtemsState.IOC:
-            sleep(0.2)
+        current = self.check_prompt(retries=10)
+
+        if current != RtemsState.IOC or (self._ioc_reboot and not self.ioc_rebooted):
+            sleep(0.5)
+            report("Rebooting the IOC")
+
             self.reboot(RtemsState.IOC)
             self.ioc_rebooted = True
-            self.wait_epics_prompt()
-        else:
-            if self._ioc_reboot and not self.ioc_rebooted:
-                self.ioc_rebooted = True
-                self.reboot(RtemsState.IOC)
-                self.wait_epics_prompt()
+
+            current = self.check_prompt(retries=10)
+            if current != RtemsState.IOC:
+                raise CannotConnectError("Failed to reboot into IOC shell")
 
     def get_boot_prompt(self):
         """
@@ -181,7 +173,7 @@ class TelnetRTEMS:
         """
         assert self._child, "must call connect before get_boot_prompt"
 
-        current = self.check_prompt()
+        current = self.check_prompt(retries=10)
         if current != RtemsState.MOT:
             # get out of the IOC and return to MOT
             self.reboot(RtemsState.MOT)
@@ -203,6 +195,18 @@ class TelnetRTEMS:
         assert self._child, "must call connect before expect"
         self._child.expect(pattern, timeout=timeout)
 
+    def flush_remaining_output(self) -> None:
+        """
+        Flush any remaining buffered output to stdout.
+        Useful for displaying output before error reporting.
+        """
+        try:
+            if self._child:
+                self._child.read_nonblocking(size=8192, timeout=0.5)
+        except (pexpect.exceptions.TIMEOUT, pexpect.exceptions.EOF):
+            # no more output available, which is fine
+            pass
+
     def close(self):
         if self._child:
             self._child.close()
@@ -243,7 +247,7 @@ def ioc_connect(
             telnet.sendline("\r")
 
         if reboot:
-            telnet.get_epics_prompt()
+            telnet.get_epics_prompt(retries=10)
         else:
             report("Auto reboot disabled. Skipping reboot")
 
@@ -253,8 +257,8 @@ def ioc_connect(
         raise
 
     except Exception as e:
-        # still show the remaining output
-        telnet.expect("_main_")
+        # flush any remaining buffered output to stdout
+        telnet.flush_remaining_output()
         report(f"An error occurred: {e}")
         telnet.close()
         if raise_errors:

{rtems_proxy-1.3.0b2 → rtems_proxy-1.3.0b3}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 1.3.0b2
+Version: 1.3.0b3
 Summary: Support for a K8S proxy container in controlling and monitoring RTEMS EPICS IOCs
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

{rtems_proxy-1.3.0b2 → rtems_proxy-1.3.0b3}/src/rtems_proxy.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ README.md
 pyproject.toml
 renovate.json
 requirements.txt
+rtems-proxy.code-workspace
 uv.lock
 .devcontainer/devcontainer.json
 .github/CONTRIBUTING.md