rtems-proxy 1.0.1__tar.gz → 1.2.0__tar.gz

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/.gitignore

@@ -66,6 +66,9 @@ venv*
 
 # further build artifacts
 lockfiles/
+uv.lock
 
 # ruff cache
 .ruff_cache/
+
+bl21i-pss-ioc-01.sh

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 1.0.1
+Version: 1.2.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
@@ -229,6 +229,7 @@ Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: tox-direct; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/epics-containers/rtems-proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/epics-containers/rtems-proxy/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/epics-containers/rtems-proxy/branch/main/graph/badge.svg)](https://codecov.io/gh/epics-containers/rtems-proxy)

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/__main__.py

@@ -172,13 +172,16 @@ def configure(
     attach: bool = typer.Option(
         False, help="attach to the IOC console after configuration"
     ),
+    use_console: bool = typer.Option(
+        False, help="use conserver console instead of telnet"
+    ),
 ):
     """
     Configure the RTEMS IOC boot parameters
     """
 
     assert GLOBALS.RTEMS_CONSOLE, "No RTEMS console defined"
-    telnet = motboot_connect(GLOBALS.RTEMS_CONSOLE)
+    telnet = motboot_connect(GLOBALS.RTEMS_CONSOLE, use_console=use_console)
     config = Configure(telnet, debug)
     config.apply_settings()
     telnet.close()

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.0.1'
-__version_tuple__ = version_tuple = (1, 0, 1)
+__version__ = version = '1.2.0'
+__version_tuple__ = version_tuple = (1, 2, 0)
+
+__commit_id__ = commit_id = 'ge82ac2b34'

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/configure.py

@@ -2,6 +2,8 @@
 Class to apply MOTBoot configuration to a VME crate.
 """
 
+from time import sleep
+
 from .globals import GLOBALS
 from .telnet import TelnetRTEMS
 
@@ -32,21 +34,40 @@ class Configure:
                     "RTEMS_IOC_NETMASK, RTEMS_IOC_GATEWAY, RTEMS_IOC_IP, "
                     "RTEMS_NFS_IP, and RTEMS_TFTP_IP must be set"
                 )
-        nfs_mount = f"{GLOBALS.RTEMS_NFS_IP}:/iocs/{GLOBALS.IOC_NAME}:/epics"
+
         ioc_bin = "ioc" if self.debug else "ioc.boot"
+
+        if GLOBALS.RTEMS_EPICS_NFS_MOUNT:
+            nfs_mount = GLOBALS.RTEMS_EPICS_NFS_MOUNT
+        else:
+            epics_script = f"{GLOBALS.RTEMS_NFS_IP}:/iocs/{GLOBALS.IOC_NAME}:/epics"
+
+        if GLOBALS.RTEMS_EPICS_SCRIPT:
+            epics_script = GLOBALS.RTEMS_EPICS_SCRIPT
+        else:
+            epics_script = "/epics/runtime/st.cmd"
+
+        if GLOBALS.RTEMS_EPICS_BINARY:
+            epics_binary = GLOBALS.RTEMS_EPICS_BINARY
+        else:
+            epics_binary = f"{GLOBALS.IOC_NAME.lower()}/ioc/bin/RTEMS-beatnik/{ioc_bin}"
+
         mot_boot = (
             f"dla=malloc 0x4000000\r"
             f"tftpGet -d/dev/enet1"
-            f" -f{GLOBALS.IOC_NAME.lower()}/ioc/bin/RTEMS-beatnik/{ioc_bin}"
+            f" -f{epics_binary}"
             f" -m{GLOBALS.RTEMS_IOC_NETMASK}"
             f" -g{GLOBALS.RTEMS_IOC_GATEWAY}"
             f" -s{GLOBALS.RTEMS_TFTP_IP}"
             f" -c{GLOBALS.RTEMS_IOC_IP}"
-            f" -adla -r4\r"
+            f" -adla -r3 -v\r"
             f"go -a04000000\r"
             f"reset"
         )
 
+        if GLOBALS.RTEMS_EPICS_NTP_SERVER:
+            self.apply_nvm("epics-ntpserver", GLOBALS.RTEMS_EPICS_NTP_SERVER)
+
         self.apply_nvm("mot-/dev/enet0-snma", GLOBALS.RTEMS_IOC_NETMASK)
         self.apply_nvm("mot-/dev/enet0-gipa", GLOBALS.RTEMS_IOC_GATEWAY)
         self.apply_nvm("mot-/dev/enet0-sipa", GLOBALS.RTEMS_NFS_IP)
@@ -54,7 +75,9 @@ class Configure:
         self.apply_nvm("mot-boot-device", "/dev/em1")
         self.apply_nvm("mot-script-boot", mot_boot)
         self.apply_nvm("rtems-client-name", GLOBALS.IOC_NAME)
-        self.apply_nvm("epics-script", "/epics/runtime/st.cmd")
+        self.apply_nvm("epics-script", epics_script)
         self.apply_nvm("epics-nfsmount", nfs_mount)
         # self.apply_nvm_variable("epics-ntpserver", "EPICS_TS_NTP_INET")
         self.apply_nvm("mot-/dev/enet0-snma", GLOBALS.RTEMS_IOC_NETMASK)
+
+        sleep(1)

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/copy.py

@@ -30,17 +30,6 @@ def copy_rtems():
     # st.cmd and ioc.db
     dest_runtime = local_root / "runtime"
 
-    protocol_folder = GLOBALS.RUNTIME / "protocol"
-    protocol_folder.mkdir(parents=True, exist_ok=True)
-
-    # TODO - perhaps do protocol files in this fashion for linux IOCs too,
-    # in which case this needs to go somewhere generic
-    dest_ioc.mkdir(parents=True, exist_ok=True)
-    protocol_files = GLOBALS.SUPPORT.glob("**/*.proto*")
-    for proto_file in protocol_files:
-        dest = protocol_folder / proto_file.name
-        shutil.copy(proto_file, dest)
-
     # make sure all files are writable - by default some products are read-only
     for folder in [dest_ioc, dest_runtime]:
         for file in folder.glob("**/*"):

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/globals.py

@@ -59,5 +59,17 @@ class _Globals:
         self.IOC_GROUP = os.getenv("IOC_GROUP", "NO_IOC_GROUP")
         """ the name of the repository that this IOC is grouped into """
 
+        self.RTEMS_EPICS_SCRIPT = os.getenv("RTEMS_EPICS_SCRIPT")
+        """ override for the EPICS startup script """
+
+        self.RTEMS_EPICS_BINARY = os.getenv("RTEMS_EPICS_BINARY")
+        """ override for the EPICS binary """
+
+        self.RTEMS_EPICS_NTP_SERVER = os.getenv("RTEMS_EPICS_NTP_SERVER")
+        """ ip address for the ntp server """
+
+        self.RTEMS_EPICS_NFS_MOUNT = os.getenv("RTEMS_EPICS_NFS_MOUNT")
+        """ NFS mount point for the EPICS IOC """
+
 
 GLOBALS = _Globals()

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy/telnet.py

@@ -38,13 +38,21 @@ class TelnetRTEMS:
     NO_CONNECTION = "Connection closed by foreign host"
     FAIL_STRINGS = ["Exception", "exception", "RTEMS_FATAL_SOURCE_EXCEPTION"]
 
-    def __init__(self, host_and_port: str, ioc_reboot: bool = False):
-        self._hostname, self._port = host_and_port.split(":")
+    def __init__(
+        self, host_and_port: str, ioc_reboot: bool = False, use_console: bool = False
+    ):
         self._ioc_reboot = ioc_reboot
         self._child = None
+        self._port = ""
 
         self.ioc_rebooted = False
-        self.command = f"telnet {self._hostname} {self._port}"
+        if use_console:
+            # console needs no port
+            self._hostname = host_and_port
+            self.command = f"console {self._hostname}"
+        else:
+            self._hostname, self._port = host_and_port.split(":")
+            self.command = f"telnet {self._hostname} {self._port}"
 
         signal.signal(signal.SIGINT, self.terminate)
         signal.signal(signal.SIGTERM, self.terminate)
@@ -256,13 +264,15 @@ def ioc_connect(
         run_command(telnet.command)
 
 
-def motboot_connect(host_and_port: str) -> TelnetRTEMS:
+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)
+    telnet = TelnetRTEMS(host_and_port, ioc_reboot=reboot, use_console=use_console)
     telnet.connect()
 
     # this will untangle a partially executed gevEdit command

{rtems_proxy-1.0.1 → rtems_proxy-1.2.0}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: rtems-proxy
-Version: 1.0.1
+Version: 1.2.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
@@ -229,6 +229,7 @@ Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
 Requires-Dist: tox-direct; extra == "dev"
 Requires-Dist: types-mock; extra == "dev"
+Dynamic: license-file
 
 [![CI](https://github.com/epics-containers/rtems-proxy/actions/workflows/ci.yml/badge.svg)](https://github.com/epics-containers/rtems-proxy/actions/workflows/ci.yml)
 [![Coverage](https://codecov.io/gh/epics-containers/rtems-proxy/branch/main/graph/badge.svg)](https://codecov.io/gh/epics-containers/rtems-proxy)