From cf328fabbd76748909ca8a088153d1f3aa311570 Mon Sep 17 00:00:00 2001 From: Benjamin Labrecque Date: Tue, 7 Jul 2026 09:56:44 +0200 Subject: [PATCH] refactor: only use one (prod) ioc file template --- cli/src/core/service_creator.py | 1 + cli/src/service.py | 1 - .../ioc/AGEBD-CPCL-MASTER-DEV_main.subs | 36 ----------- .../ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml | 6 -- .../current/ioc/AGEBD-CPCL-MASTER_main.subs | 60 +++++++++---------- .../ioc/AGEBD-CPCL-MASTER_parameters.yaml | 3 +- 6 files changed, 33 insertions(+), 74 deletions(-) delete mode 100644 services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs delete mode 100644 services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml diff --git a/cli/src/core/service_creator.py b/cli/src/core/service_creator.py index 8a7e674..0671c93 100644 --- a/cli/src/core/service_creator.py +++ b/cli/src/core/service_creator.py @@ -15,6 +15,7 @@ SERVICE_TEMPLATES_DIR = REPO_ROOT / "templates" / "service" SERVICE_DEST_DIR = REPO_ROOT / "services" +# TODO: generate and push initial uv.lock file class ServiceCreator: def __init__( self, diff --git a/cli/src/service.py b/cli/src/service.py index 239f88e..93ca8e0 100644 --- a/cli/src/service.py +++ b/cli/src/service.py @@ -14,7 +14,6 @@ def add( name: str = typer.Option(..., "--name", "-n"), ): init_logging() - # TODO: Maybe create a GitPusher context manager ServiceCreator( ioc_host="ex-host", # TODO ioc_port=9999, # TODO diff --git a/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs b/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs deleted file mode 100644 index 4fa4105..0000000 --- a/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_main.subs +++ /dev/null @@ -1,36 +0,0 @@ -file MASTER.template { - pattern { SUFFIX SERVICE STARTON AUTOOFF } - { "-DEV", "MASTER" , "0", "30" } - { "-DEV", "NTURNS" , "0", "0" } - { "-DEV", "DBPM3CURR" , "1", "0" } - { "-DEV", "TAUBPM" , "1", "0" } - { "-DEV", "TAUPCT" , "1", "0" } - { "-DEV", "SCRUBBING" , "1", "0" } - { "-DEV", "TIMING" , "0", "0" } - { "-DEV", "TUNE" , "1", "0" } - { "-DEV", "INJECTIONGUARD" , "1", "0" } - { "-DEV", "POSTMORTEMLOG" , "1", "0" } - { "-DEV", "TUNEBUMP" , "1", "0" } - { "-DEV", "PLOTS" , "0", "0" } - { "-DEV", "ORBITBUMP" , "0", "0" } - { "-DEV", "TOPUPTOOL" , "0", "0" } - { "-DEV", "SHIFTTOOL" , "1", "0" } - { "-DEV", "BEAMTRANSFERCHECKS" , "0", "0" } - { "-DEV", "TUNEFBX" , "0", "0" } - { "-DEV", "TUNEFBY" , "0", "0" } - { "-DEV", "OPTICSFF-X02S" , "0", "0" } # I-TOMCAT - { "-DEV", "OPTICSFF-X03M" , "0", "0" } # ADRESS - { "-DEV", "OPTICSFF-X04S" , "0", "0" } # ADDAMS - { "-DEV", "OPTICSFF-X05L" , "0", "0" } # QUEST - { "-DEV", "OPTICSFF-X06S" , "0", "0" } # PXI - { "-DEV", "OPTICSFF-X07M" , "0", "0" } # PHOENIX/XTREME - { "-DEV", "OPTICSFF-X08S" , "0", "0" } # MicroXAS - { "-DEV", "OPTICSFF-X09L" , "0", "0" } # OPERA - { "-DEV", "OPTICSFF-X10S" , "0", "0" } # PXII - { "-DEV", "OPTICSFF-X11M" , "0", "0" } # SIM - { "-DEV", "OPTICSFF-X12S" , "0", "0" } # cSAXS - { "-DEV", "DUMMY-0000" , "0", "0" } # DUMMY to test - { "-DEV", "DUMMY-0001" , "0", "0" } # DUMMY to test - { "-DEV", "DUMMY-0002" , "0", "0" } # DUMMY to test - -} diff --git a/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml b/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml deleted file mode 100644 index 3c8d77a..0000000 --- a/services/000-master/current/ioc/AGEBD-CPCL-MASTER-DEV_parameters.yaml +++ /dev/null @@ -1,6 +0,0 @@ -cpu_architecture: x86_64 -epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01-dev -ioc_port: 50011 -os: RHEL8 -os_id: rhel diff --git a/services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs index 62e1099..4f8cd44 100644 --- a/services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs +++ b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_main.subs @@ -1,33 +1,33 @@ file MASTER.template { - pattern { SUFFIX SERVICE STARTON AUTOOFF } - { "", "MASTER" , "0", "30" } - { "", "NTURNS" , "0", "0" } - { "", "DBPM3CURR" , "1", "0" } - { "", "TAUBPM" , "1", "0" } - { "", "TAUPCT" , "1", "0" } - { "", "SCRUBBING" , "1", "0" } - { "", "TIMING" , "0", "0" } - { "", "TUNE" , "1", "0" } - { "", "INJECTIONGUARD" , "1", "0" } - { "", "POSTMORTEMLOG" , "1", "0" } - { "", "TUNEBUMP" , "1", "0" } - { "", "PLOTS" , "0", "0" } - { "", "ORBITBUMP" , "0", "0" } - { "", "TOPUPTOOL" , "0", "0" } - { "", "SHIFTTOOL" , "1", "0" } - { "", "BEAMTRANSFERCHECKS" , "0", "0" } - { "", "TUNEFBX" , "0", "0" } - { "", "TUNEFBY" , "0", "0" } - { "", "OPTICSFF-X02S" , "0", "0" } # I-TOMCAT - { "", "OPTICSFF-X03M" , "0", "0" } # ADRESS - { "", "OPTICSFF-X04S" , "0", "0" } # ADDAMS - { "", "OPTICSFF-X05L" , "0", "0" } # QUEST - { "", "OPTICSFF-X06S" , "0", "0" } # PXI - { "", "OPTICSFF-X07M" , "0", "0" } # PHOENIX/XTREME - { "", "OPTICSFF-X08S" , "0", "0" } # MicroXAS - { "", "OPTICSFF-X09L" , "0", "0" } # OPERA - { "", "OPTICSFF-X10S" , "0", "0" } # PXII - { "", "OPTICSFF-X11M" , "0", "0" } # SIM - { "", "OPTICSFF-X12S" , "0", "0" } # cSAXS + pattern { SUFFIX SERVICE STARTON AUTOOFF } + { "{{ agebd_env }}", "MASTER" , "0", "30" } + { "{{ agebd_env }}", "NTURNS" , "0", "0" } + { "{{ agebd_env }}", "DBPM3CURR" , "1", "0" } + { "{{ agebd_env }}", "TAUBPM" , "1", "0" } + { "{{ agebd_env }}", "TAUPCT" , "1", "0" } + { "{{ agebd_env }}", "SCRUBBING" , "1", "0" } + { "{{ agebd_env }}", "TIMING" , "0", "0" } + { "{{ agebd_env }}", "TUNE" , "1", "0" } + { "{{ agebd_env }}", "INJECTIONGUARD" , "1", "0" } + { "{{ agebd_env }}", "POSTMORTEMLOG" , "1", "0" } + { "{{ agebd_env }}", "TUNEBUMP" , "1", "0" } + { "{{ agebd_env }}", "PLOTS" , "0", "0" } + { "{{ agebd_env }}", "ORBITBUMP" , "0", "0" } + { "{{ agebd_env }}", "TOPUPTOOL" , "0", "0" } + { "{{ agebd_env }}", "SHIFTTOOL" , "1", "0" } + { "{{ agebd_env }}", "BEAMTRANSFERCHECKS" , "0", "0" } + { "{{ agebd_env }}", "TUNEFBX" , "0", "0" } + { "{{ agebd_env }}", "TUNEFBY" , "0", "0" } + { "{{ agebd_env }}", "OPTICSFF-X02S" , "0", "0" } # I-TOMCAT + { "{{ agebd_env }}", "OPTICSFF-X03M" , "0", "0" } # ADRESS + { "{{ agebd_env }}", "OPTICSFF-X04S" , "0", "0" } # ADDAMS + { "{{ agebd_env }}", "OPTICSFF-X05L" , "0", "0" } # QUEST + { "{{ agebd_env }}", "OPTICSFF-X06S" , "0", "0" } # PXI + { "{{ agebd_env }}", "OPTICSFF-X07M" , "0", "0" } # PHOENIX/XTREME + { "{{ agebd_env }}", "OPTICSFF-X08S" , "0", "0" } # MicroXAS + { "{{ agebd_env }}", "OPTICSFF-X09L" , "0", "0" } # OPERA + { "{{ agebd_env }}", "OPTICSFF-X10S" , "0", "0" } # PXII + { "{{ agebd_env }}", "OPTICSFF-X11M" , "0", "0" } # SIM + { "{{ agebd_env }}", "OPTICSFF-X12S" , "0", "0" } # cSAXS } diff --git a/services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml index 3c8d77a..f5dc3c2 100644 --- a/services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml +++ b/services/000-master/current/ioc/AGEBD-CPCL-MASTER_parameters.yaml @@ -1,6 +1,7 @@ cpu_architecture: x86_64 epics_version: 7.0.8 -ioc_host: sls-vserv-bd-01-dev +# TODO: dev/prod +ioc_host: sls-vserv-bd-01 ioc_port: 50011 os: RHEL8 os_id: rhel