rtems-proxy 0.3.0__tar.gz → 0.5.0__tar.gz

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtems-proxy
-Version: 0.3.0
+Version: 0.5.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-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy/__main__.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from time import sleep
 from typing import Optional
 
 import typer

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.3.0'
-__version_tuple__ = version_tuple = (0, 3, 0)
+__version__ = version = '0.5.0'
+__version_tuple__ = version_tuple = (0, 5, 0)

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy/rsync.sh.jinja

@@ -10,9 +10,9 @@ export IOC_PATH={{ ioc_path }}
 pkill -f rsync-background &>/dev/null
 
 ibek dev instance $IOC_PATH
+bash /epics/ioc/install.sh
 
 mkdir -p $RTEMS_TFTP_PATH
-cd $RTEMS_TFTP_PATH
 
 # get previous contents
 rsync -rt "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_GROUP/$IOC_NAME/" $RTEMS_TFTP_PATH 2>/dev/null

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy/telnet.py

@@ -92,6 +92,8 @@ class TelnetRTEMS:
         bootloader. Because there is a possibility that we are in the middle
         of a reboot, we will retry for one before giving up.
         """
+        assert self._child, "must call connect before check_prompt"
+
         while retries > 0:
             try:
                 # see if we are in the IOC shell
@@ -123,6 +125,8 @@ class TelnetRTEMS:
         Reboot the board from IOC shell or bootloader and choose appropriate
         options to get to the state requested by the into argument.
         """
+        assert self._child, "must call connect before reboot"
+
         self.report(f"Rebooting into {into.name}")
         current_state = self.check_prompt()
         if current_state == RtemsState.MOT:
@@ -144,10 +148,12 @@ class TelnetRTEMS:
         it into the IOC shell. If the IOC is running, do a reboot only if
         requested (in order to pick up new binaries/startup/epics db)
         """
+        assert self._child, "must call connect before get_epics_prompt"
+
         current = self.check_prompt()
         if current != RtemsState.IOC:
             sleep(0.2)
-            self._child.reboot(RtemsState.IOC)
+            self.reboot(RtemsState.IOC)
             self.ioc_rebooted = True
             self._child.expect(self.IOC_STARTED, timeout=50)
         else:
@@ -163,6 +169,8 @@ class TelnetRTEMS:
         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()
         if current != RtemsState.MOT:
             # get out of the IOC and return to MOT

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy/utils.py

@@ -36,8 +36,6 @@ def run_command(
 
     if p_result.returncode != 0 and not error_OK:
         typer.echo("\nCommand Failed:")
-        if not globals.EC_VERBOSE:
-            typer.echo(command)
         typer.echo(output)
         typer.echo(error_out)
         raise typer.Exit(1)

{rtems-proxy-0.3.0 → rtems-proxy-0.5.0}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rtems-proxy
-Version: 0.3.0
+Version: 0.5.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