rtems-proxy 2.0.0__tar.gz → 2.1.0__tar.gz

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 2.0.0
+Version: 2.1.0
 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-2.0.0 → rtems_proxy-2.1.0}/requirements.txt

@@ -1,3 +1,3 @@
 # these requirements are for additional python packages to install into the
 # container
-ibek==3.1.3
+ibek==3.3.1

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/rtems-proxy.code-workspace

@@ -8,9 +8,6 @@
 		},
 		{
 			"path": "../i04-services"
-		},
-		{
-			"path": "../rf-services"
 		}
 	],
 	"settings": {}

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/__main__.py

@@ -11,9 +11,9 @@ from rtems_proxy.utils import run_command
 
 from . import __version__
 from .configure import Configure
-from .copy import copy_rtems
+from .connect import ioc_connect, motboot_connect, report
+from .copy import check_new_version, copy_rtems, save_current_version
 from .globals import GLOBALS
-from .telnet import ioc_connect, motboot_connect, report
 
 __all__ = ["main"]
 
@@ -52,6 +52,9 @@ def start(
     reboot: bool = typer.Option(
         True, "--reboot/--no-reboot", help="reboot the IOC first"
     ),
+    configure: bool = typer.Option(
+        True, "--configure/--no-configure", help="configure motBoot when rebooting"
+    ),
     raise_errors: bool = typer.Option(
         True, "--raise-errors/--no-raise-errors", help="raise errors instead of exiting"
     ),
@@ -78,11 +81,23 @@ def start(
     )
     if copy:
         copy_rtems()
+
+    # always reboot if the IOC definition has changed
+    if check_new_version():
+        report("IOC definition has changed, forcing reboot to pick up changes")
+        reboot = True
+
     if connect:
         assert GLOBALS.RTEMS_CONSOLE, "No RTEMS console defined"
         ioc_connect(
-            GLOBALS.RTEMS_CONSOLE, reboot=reboot, attach=True, raise_errors=raise_errors
+            GLOBALS.RTEMS_CONSOLE,
+            reboot=reboot,
+            attach=True,
+            raise_errors=raise_errors,
+            configure=configure,
         )
+        # now we have rebooted into the IOC we can save the current version
+        save_current_version()
     else:
         report("IOC console connection disabled. ")
 
@@ -189,9 +204,8 @@ def configure(
     else:
         assert GLOBALS.RTEMS_CONSOLE, "No RTEMS console defined"
 
-        config = Configure(None, debug=debug)
         telnet = motboot_connect(GLOBALS.RTEMS_CONSOLE, use_console=use_console)
-        config = Configure(telnet, debug=debug, dry_run=dry_run)
+        config = Configure(telnet, debug=debug, dry_run=False)
         config.apply_settings()
         telnet.close()
         if attach:

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '2.0.0'
-__version_tuple__ = version_tuple = (2, 0, 0)
+__version__ = version = '2.1.0'
+__version_tuple__ = version_tuple = (2, 1, 0)
 
-__commit_id__ = commit_id = 'g9b4243c59'
+__commit_id__ = commit_id = 'gb348b0264'

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/configure.py

@@ -35,7 +35,7 @@ class Configure:
         else:
             self.telnet.sendline(f"gevE {variable}")
             self.telnet.expect(r"\(Blank line terminates input.\)")
-            self.telnet.sendline(value or "")
+            self.telnet.sendline(value)
             self.telnet.sendline("")
             self.telnet.expect(r"\?")
             self.telnet.sendline("Y")

rtems_proxy-2.1.0/src/rtems_proxy/connect.py

@@ -0,0 +1,102 @@
+from time import sleep
+
+import pexpect
+
+from .configure import Configure
+from .telnet import CannotConnectError, RtemsState, TelnetRTEMS
+from .utils import run_command
+
+
+def report(message):
+    """
+    print a message that is noticeable amongst all the other output
+    """
+    print(f"\n>>>> {message} <<<<\n")
+
+
+def ioc_connect(
+    host_and_port: str,
+    reboot: bool = False,
+    configure: bool = True,
+    attach: bool = True,
+    raise_errors: bool = False,
+):
+    """
+    Entrypoint to make a connection to an RTEMS IOC over telnet.
+    Once connected, enters an interactive user session with the IOC.
+
+    args:
+    host_and_port: 'hostname:port' of the IOC to connect to
+    reboot: reboot the IOC to pick up new binaries/startup/epics db
+    """
+    telnet = TelnetRTEMS(host_and_port, reboot)
+
+    try:
+        telnet.connect()
+
+        # this will untangle a partially executed gevEdit command
+        for _ in range(3):
+            telnet.sendline("\r")
+
+        current = telnet.check_prompt(retries=6, timeout=10)
+        match current:
+            case RtemsState.MOT:
+                report("At MOTBoot prompt")
+                reboot = True
+            case RtemsState.UNKNOWN:
+                report("Current IOC state unknown, attempting reboot ...")
+                reboot = True
+            case RtemsState.IOC:
+                report("At IOC shell prompt")
+
+        if reboot:
+            if configure:
+                report("Rebooting to configure motBoot settings")
+                telnet.get_boot_prompt(retries=10)
+                sleep(1)
+                cfg = Configure(telnet)
+                cfg.apply_settings()
+            else:
+                report("Rebooting into IOC shell")
+
+            telnet.get_epics_prompt(retries=10)
+        else:
+            report("Auto reboot disabled. Skipping reboot")
+
+    except (CannotConnectError, pexpect.exceptions.TIMEOUT):
+        report("Connection failed, Exiting.")
+        telnet.close()
+        raise
+
+    except Exception as e:
+        # flush any remaining buffered output to stdout
+        telnet.flush_remaining_output()
+        report(f"An error occurred: {e}")
+        telnet.close()
+        if raise_errors:
+            raise
+
+    telnet.close()
+    if attach:
+        report("Connecting to IOC console, hit enter for a prompt")
+        run_command(telnet.command)
+
+
+def motboot_connect(
+    host_and_port: str, reboot: bool = False, use_console: bool = False
+) -> TelnetRTEMS:
+    """
+    Connect to the MOTBoot bootloader prompt, rebooting if needed.
+
+    Returns a TelnetRTEMS object that is connected to the MOTBoot bootloader
+    """
+    telnet = TelnetRTEMS(host_and_port, ioc_reboot=reboot, use_console=use_console)
+    telnet.connect()
+
+    # this will untangle a partially executed gevEdit command
+    for _ in range(3):
+        telnet.sendline("\r")
+
+    telnet.get_boot_prompt()
+
+    return telnet

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/copy.py

@@ -9,6 +9,35 @@ from pathlib import Path
 from .globals import GLOBALS
 
 
+def save_current_version():
+    """
+    Save the current version string to a file in the NFS root so that the IOC
+    can report its version on startup
+
+    We use the env IOC_ORIGINAL_LOCATION as a proxy for the version string
+    """
+    version_file = Path(GLOBALS.RTEMS_NFS_ROOT_PATH) / "rtems_proxy_version.txt"
+    with open(version_file, "w") as vf:
+        vf.write(str(GLOBALS.IOC_ORIGINAL_LOCATION) + "\n")
+
+
+def check_new_version():
+    """
+    Check if the version string saved in the NFS root matches the current
+    version string.
+
+    We use the env IOC_ORIGINAL_LOCATION as a proxy for the version string
+    """
+    version_file = Path(GLOBALS.RTEMS_NFS_ROOT_PATH) / "rtems_proxy_version.txt"
+    if not version_file.exists():
+        return True
+
+    with open(version_file) as vf:
+        saved_version = vf.read().strip()
+
+    return saved_version != str(GLOBALS.IOC_ORIGINAL_LOCATION)
+
+
 def copy_rtems(debug: bool = False):
     """
     Copy RTEMS IOC binary and startup assets to a location where the RTEMS IOC

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/globals.py

@@ -22,7 +22,7 @@ class _Globals:
         self.RTEMS_TFTP_ROOT_PATH = Path("/ioc_tftp")
         """ root folder of a mounted PVC in which to place IOC binaries """
         self.RTEMS_NFS_ROOT_PATH = Path("/ioc_nfs")
-        """ root folder of a mounted NFS folder in which to place IOC binaries """
+        """ root folder of a mounted NFS folder in which to place IOC runtime files """
 
         ########################################################################
         ## Beamline level config from global.env in services/values.yaml

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy/telnet.py

@@ -5,8 +5,6 @@ from time import sleep
 
 import pexpect
 
-from .utils import run_command
-
 
 class CannotConnectError(Exception):
     pass
@@ -78,6 +76,7 @@ class TelnetRTEMS:
             logfile=sys.stdout,
             echo=False,
             codec_errors="ignore",
+            timeout=5,
         )
         try:
             # first check for connection refusal
@@ -89,7 +88,7 @@ class TelnetRTEMS:
             report("Cannot connect to remote IOC, connection in use?")
             raise CannotConnectError
 
-    def check_prompt(self, retries) -> RtemsState:
+    def check_prompt(self, retries, timeout=15) -> RtemsState:
         """
         Determine if we are currently seeing an IOC shell prompt or
         bootloader. Because there is a possibility that we are in the middle
@@ -104,24 +103,33 @@ class TelnetRTEMS:
                 self._child.sendline(self.IOC_CHECK)
                 self._child.expect(self.IOC_RESPONSE, timeout=1)
             except pexpect.exceptions.TIMEOUT:
-                try:
-                    # see if we are in the bootloader
-                    self._child.sendline()
-                    self._child.expect(self.MOT_PROMPT, timeout=1)
-                except pexpect.exceptions.TIMEOUT:
-                    # current state unknown. wait and retry
-                    sleep(15)
-                else:
-                    report("Currently in bootloader")
-                    return RtemsState.MOT
+                pass
             else:
-                report("Currently in IOC shell")
                 return RtemsState.IOC
 
+            try:
+                # see if we are in the bootloader
+                self._child.sendline()
+                self._child.expect(self.MOT_PROMPT, timeout=1)
+            except pexpect.exceptions.TIMEOUT:
+                pass
+            else:
+                return RtemsState.MOT
+
+            try:
+                # current state unknown. check for mot start prompt
+                # in case we are in a boot loop
+                self._child.expect(self.CONTINUE, timeout=timeout)
+            except pexpect.exceptions.TIMEOUT:
+                pass
+            else:
+                # send escape to get into the bootloader
+                self._child.sendline(chr(27))
+                return RtemsState.MOT
+
             report(f"Retry {retry + 1} of get current status")
 
-        report("Current state UNKNOWN")
-        raise CannotConnectError("Current state of remote IOC unknown")
+        return RtemsState.UNKNOWN
 
     def reboot(self, into: RtemsState):
         """
@@ -145,6 +153,8 @@ class TelnetRTEMS:
             # send space to boot the IOC
             self._child.send(" ")
 
+        self.ioc_rebooted = True
+
     def get_epics_prompt(self, retries=5):
         """
         Get to the IOC shell prompt, if the IOC is not already running, reboot
@@ -153,27 +163,26 @@ class TelnetRTEMS:
         """
         assert self._child, "must call connect before get_epics_prompt"
 
-        current = self.check_prompt(retries=10)
+        current = self.check_prompt(retries=retries)
 
         if current != RtemsState.IOC or (self._ioc_reboot and not self.ioc_rebooted):
             sleep(0.5)
-            report("Rebooting the IOC")
 
+            report("Rebooting into IOC shell")
             self.reboot(RtemsState.IOC)
-            self.ioc_rebooted = True
 
-            current = self.check_prompt(retries=10)
+            current = self.check_prompt(retries=retries)
             if current != RtemsState.IOC:
                 raise CannotConnectError("Failed to reboot into IOC shell")
 
-    def get_boot_prompt(self):
+    def get_boot_prompt(self, retries=5):
         """
         Get to the bootloader prompt, if the IOC shell is running then exit
         and send appropriate commands to get to the bootloader
         """
         assert self._child, "must call connect before get_boot_prompt"
 
-        current = self.check_prompt(retries=10)
+        current = self.check_prompt(retries=retries)
         if current != RtemsState.MOT:
             # get out of the IOC and return to MOT
             self.reboot(RtemsState.MOT)
@@ -185,8 +194,9 @@ class TelnetRTEMS:
         """
         Send a command to the telnet session
         """
+        # always pause a little to allow the previous expect to complete
         assert self._child, "must call connect before send"
-        self._child.sendline(command)
+        self._child.sendline(command + "\r")
 
     def expect(self, pattern, timeout=10) -> None:
         """
@@ -221,70 +231,3 @@ def report(message):
     print a message that is noticeable amongst all the other output
     """
     print(f"\n>>>> {message} <<<<\n")
-
-
-def ioc_connect(
-    host_and_port: str,
-    reboot: bool = False,
-    attach: bool = True,
-    raise_errors: bool = False,
-):
-    """
-    Entrypoint to make a connection to an RTEMS IOC over telnet.
-    Once connected, enters an interactive user session with the IOC.
-
-    args:
-    host_and_port: 'hostname:port' of the IOC to connect to
-    reboot: reboot the IOC to pick up new binaries/startup/epics db
-    """
-    telnet = TelnetRTEMS(host_and_port, reboot)
-
-    try:
-        telnet.connect()
-
-        # this will untangle a partially executed gevEdit command
-        for _ in range(3):
-            telnet.sendline("\r")
-
-        if reboot:
-            telnet.get_epics_prompt(retries=10)
-        else:
-            report("Auto reboot disabled. Skipping reboot")
-
-    except (CannotConnectError, pexpect.exceptions.TIMEOUT):
-        report("Connection failed, Exiting.")
-        telnet.close()
-        raise
-
-    except Exception as e:
-        # flush any remaining buffered output to stdout
-        telnet.flush_remaining_output()
-        report(f"An error occurred: {e}")
-        telnet.close()
-        if raise_errors:
-            raise
-
-    telnet.close()
-    if attach:
-        report("Connecting to IOC console, hit enter for a prompt")
-        run_command(telnet.command)
-
-
-def motboot_connect(
-    host_and_port: str, reboot: bool = False, use_console: bool = False
-) -> TelnetRTEMS:
-    """
-    Connect to the MOTBoot bootloader prompt, rebooting if needed.
-
-    Returns a TelnetRTEMS object that is connected to the MOTBoot bootloader
-    """
-    telnet = TelnetRTEMS(host_and_port, ioc_reboot=reboot, use_console=use_console)
-    telnet.connect()
-
-    # this will untangle a partially executed gevEdit command
-    for _ in range(3):
-        telnet.sendline("\r")
-
-    telnet.get_boot_prompt()
-
-    return telnet

{rtems_proxy-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 2.0.0
+Version: 2.1.0
 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-2.0.0 → rtems_proxy-2.1.0}/src/rtems_proxy.egg-info/SOURCES.txt

@@ -34,6 +34,7 @@ src/rtems_proxy/__init__.py
 src/rtems_proxy/__main__.py
 src/rtems_proxy/_version.py
 src/rtems_proxy/configure.py
+src/rtems_proxy/connect.py
 src/rtems_proxy/copy.py
 src/rtems_proxy/globals.py
 src/rtems_proxy/rsync.sh.jinja