rtems-proxy 0.5.2__tar.gz → 0.6.0__tar.gz

{rtems_proxy-0.5.2 → rtems_proxy-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rtems-proxy
-Version: 0.5.2
+Version: 0.6.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.5.2 → rtems_proxy-0.6.0}/src/rtems_proxy/__main__.py

@@ -91,7 +91,7 @@ def dev(
 
     ioc_path = ioc_repo / "services" / ioc_name
 
-    values = ioc_repo / "helm/shared/values.yaml"
+    values = ioc_repo / "services" / "values.yaml"
     if not values.exists():
         typer.echo(f"Global settings file {values} not found. Exiting")
         raise typer.Exit(1)
@@ -106,20 +106,25 @@ def dev(
     with open(values) as fp:
         yaml = YAML(typ="safe").load(fp)
     try:
-        ioc_group = yaml["ioc-instance"]["ioc_group"]
+        ioc_group = yaml["global"]["ioc_group"]
+    except KeyError:
+        typer.echo(f"{values} global.ioc_group key missing")
+        raise typer.Exit(1) from None
+    try:
+        ioc_group = yaml["global"]["ioc_group"]
         for item in yaml["ioc-instance"]["globalEnv"]:
             env_vars[item["name"]] = item["value"]
     except KeyError:
-        typer.echo(f"{values} not in expected format")
+        typer.echo(f"{values} globalEnv key missing")
         raise typer.Exit(1) from None
 
     with open(ioc_values) as fp:
         yaml = YAML(typ="safe").load(fp)
     try:
-        for item in yaml["shared"]["ioc-instance"]["iocEnv"]:
+        for item in yaml["ioc-instance"]["iocEnv"]:
             env_vars[item["name"]] = item["value"]
     except KeyError:
-        typer.echo(f"{ioc_values} not in expected format")
+        typer.echo(f"{ioc_values} iocEnv key missing")
         raise typer.Exit(1) from None
 
     this_dir = Path(__file__).parent

{rtems_proxy-0.5.2 → rtems_proxy-0.6.0}/src/rtems_proxy/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.5.2'
-__version_tuple__ = version_tuple = (0, 5, 2)
+__version__ = version = '0.6.0'
+__version_tuple__ = version_tuple = (0, 6, 0)

{rtems_proxy-0.5.2 → rtems_proxy-0.6.0}/src/rtems_proxy/copy.py

@@ -22,6 +22,15 @@ def copy_rtems():
     # where to copy the generated runtime assets to (st.cmd and ioc.db)
     dest_runtime = root / "runtime"
 
+    # TODO - perhaps do this for linux IOCs too - in which case this needs
+    # to go somewhere generic
+    protocol_folder = GLOBALS.RUNTIME / "protocol"
+    protocol_folder.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)
+
     # move all the files needed for runtime into the PVC that is being shared
     # over nfs/tftp by the nfsv2-tftp service
     ioc_src = GLOBALS.IOC.readlink()
@@ -36,12 +45,6 @@ def copy_rtems():
     shutil.copy(bin_rtems_src, bin_rtems_dest)
     shutil.copytree(GLOBALS.RUNTIME, dest_runtime, dirs_exist_ok=True)
 
-    protocol_folder = RTEMS_TFTP_PATH / "protocol"
-    protocol_files = GLOBALS.SUPPORT.glob("**/*.proto*")
-    for proto_file in protocol_files:
-        dest = protocol_folder / proto_file.name
-        shutil.copy(proto_file, dest)
-
     # because we moved the ioc files we need to fix up startup script paths
     startup = dest_runtime / "st.cmd"
     cmd_txt = startup.read_text()

rtems_proxy-0.6.0/src/rtems_proxy/rsync.sh.jinja

@@ -0,0 +1,53 @@
+#!/bin/bash
+
+{% for name,value in env_vars.items() -%}
+export {{ name }}={{ value }}
+{% endfor -%}
+export IOC_GROUP={{ ioc_group }}
+export IOC_NAME={{ ioc_name }}
+export IOC_PATH={{ ioc_path }}
+
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]] ; then
+  echo "This script must be sourced"
+  exit 1
+fi
+
+# validate we have the essential environment variables
+if [[ -z "$RTEMS_TFTP_PATH" || -z "$RTEMS_TFTP_IP"  || -z "$IOC_NAME" || -z "$RTEMS_TFTP_IP" ]]; then
+  echo "RTEMS_TFTP_PATH,RTEMS_TFTP_IP,IOC_NAME must all be set"
+  return 1
+fi
+
+if [[ $RTEMS_TFTP_PATH != "/"* ]]; then
+  echo "RTEMS_TFTP_PATH must be an absolute path"
+  return 1
+fi
+
+# remove previoud rsync-background process if it exists
+pkill -f rsync-background &>/dev/null
+
+ibek dev instance $IOC_PATH
+bash /epics/ioc/install.sh
+
+mkdir -p $RTEMS_TFTP_PATH
+
+# get previous contents
+echo "getting existing contents of the IOC nfs2-tftp folder"
+(
+  set -x
+  rsync -rt "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_NAME/" $RTEMS_TFTP_PATH 2>/dev/null
+)
+
+echo "
+#!/bin/bash
+
+while true; do
+  inotifywait -e modify,create,delete,move -r $RTEMS_TFTP_PATH
+  rsync -rt --delete /$RTEMS_TFTP_PATH/ \
+        "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_NAME/"
+done
+" > /tmp/rsync-background.sh
+chmod +x /tmp/rsync-background.sh
+
+echo "launching rsync-background.sh"
+nohup /tmp/rsync-background.sh &> /tmp/rsync-background.log &

{rtems_proxy-0.5.2 → rtems_proxy-0.6.0}/src/rtems_proxy.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: rtems-proxy
-Version: 0.5.2
+Version: 0.6.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.5.2/src/rtems_proxy/rsync.sh.jinja

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-{% for name,value in env_vars.items() -%}
-export {{ name }}={{ value }}
-{% endfor -%}
-export IOC_GROUP={{ ioc_group }}
-export IOC_NAME={{ ioc_name }}
-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
-
-# get previous contents
-rsync -rt "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_GROUP/$IOC_NAME/" $RTEMS_TFTP_PATH 2>/dev/null
-
-echo "
-#!/bin/bash
-
-while true; do
-  inotifywait -e modify,create,delete,move -r $RTEMS_TFTP_PATH
-  rsync -rt --delete /$RTEMS_TFTP_PATH/ \
-        "rsync://$RTEMS_TFTP_IP:12002/files/$IOC_GROUP/$IOC_NAME/" &> /tmp/rsync.log
-done
-" > /tmp/rsync-background.sh
-
-nohup bash /tmp/rsync-background.sh &> /tmp/rsync-background.log &