sls/hla_framework_bd
0
1
Fork 0
Code Issues 28 Pull Requests 2 Actions Packages Projects 1 Releases Wiki Activity

Use explicit agebd_env_suffix lower/upper

Browse Source
This commit is contained in:
Benjamin Labrecque
2026-08-05 10:55:08 +02:00
parent fc46d1a48b
commit 71deec0ae5
69 changed files with 734 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/src/models/master_ioc_subs.py
+1 -1
View File
@@ -24,7 +24,7 @@ class MasterIocSubs(BaseModel):
Parses the configuration text and appends a new row before the closing bracket.
"""
quoted_service = f'"{service_name}"'
new_row = f' {{ "{{{{ agebd_env_suffix }}}}", {quoted_service:<22} , "{starton}", "{autooff}" }}'
new_row = f' {{ "{{{{ agebd_env_suffix_upper }}}}", {quoted_service:<22} , "{starton}", "{autooff}" }}'
# Use regex to find the last closing curly brace of the configuration block
# This targets the line that contains only a lone closing brace, optional spaces, and maybe a comma/semicolon.
cli/tests/fixtures/expected_output/qt/A_BD_ServiceManager.ui
Vendored
+12 -12
View File
@@ -71,7 +71,7 @@ caLabel[statusTip="Operation"]{
<string notr="true">A</string>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-GUIRELOAD</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-GUIRELOAD</string>
</property>
<property name="eventSignal">
<enum>caCalc::TriggerZeroToOne</enum>
@@ -106,7 +106,7 @@ caLabel[statusTip="Operation"]{
<string notr="true">!A</string>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF</string>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget">
@@ -586,7 +586,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ALIVE</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ALIVE</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -602,7 +602,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-STARTTIME</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-STARTTIME</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -624,7 +624,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-STATUS</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-STATUS</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -646,7 +646,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-VERSION</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-VERSION</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -668,7 +668,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caChoice::Column</enum>
@@ -717,7 +717,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF-RB</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF-RB</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -763,7 +763,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-CPCL-MASTER$(AGEBD_ENV_SUFFIX):STATUS</string>
<string notr="true">AGEBD-CPCL-MASTER{{ agebd_env_suffix_upper }}:STATUS</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -1040,7 +1040,7 @@ caLabel[statusTip="Operation"]{
<enum>EPushButton::None</enum>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-MASTER$(AGEBD_ENV_SUFFIX):MASTER-LOGS-REQ</string>
<string notr="true">AGEBD-MASTER{{ agebd_env_suffix_upper }}:MASTER-LOGS-REQ</string>
</property>
<property name="label">
<string notr="true">Logs</string>
@@ -1106,7 +1106,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-GUIRELOAD</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-GUIRELOAD</string>
</property>
<property name="label">
<string notr="true">Reload</string>
@@ -1172,7 +1172,7 @@ caLabel[statusTip="Operation"]{
<enum>EPushButton::None</enum>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-CPCL-MASTER$(AGEBD_ENV_SUFFIX):RESTART</string>
<string notr="true">AGEBD-CPCL-MASTER{{ agebd_env_suffix_upper }}:RESTART</string>
</property>
<property name="label">
<string notr="true">↺</string>
cli/tests/fixtures/expected_output/qt/A_BD_TestService99-X00.ui
Vendored
+4 -4
View File
@@ -30,7 +30,7 @@
<number>0</number>
</property>
<property name="channel" stdset="0">
<string>AGEBD-TESTSERVICE99-X00$(AGEBD_ENV_SUFFIX):AO</string>
<string>AGEBD-TESTSERVICE99-X00{{ agebd_env_suffix_upper }}:AO</string>
</property>
<property name="maxValue">
<double>9.000000000000000</double>
@@ -49,10 +49,10 @@
</rect>
</property>
<property name="text">
<string>Toggle AGEBD-ALH$(AGEBD_ENV_SUFFIX):TESTSERVICE99-X00-ONOFF</string>
<string>Toggle AGEBD-ALH{{ agebd_env_suffix_upper }}:TESTSERVICE99-X00-ONOFF</string>
</property>
<property name="channel" stdset="0">
<string>AGEBD-ALH$(AGEBD_ENV_SUFFIX):TESTSERVICE99-X00-ONOFF</string>
<string>AGEBD-ALH{{ agebd_env_suffix_upper }}:TESTSERVICE99-X00-ONOFF</string>
</property>
</widget>
<widget class="QLabel" name="label">
@@ -70,7 +70,7 @@
</font>
</property>
<property name="text">
<string>Value of AGEBD-TESTSERVICE99-X00$(AGEBD_ENV_SUFFIX):AO</string>
<string>Value of AGEBD-TESTSERVICE99-X00{{ agebd_env_suffix_upper }}:AO</string>
</property>
</widget>
</widget>
cli/tests/fixtures/expected_output/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
file MASTER.template {
pattern { SUFFIX SERVICE STARTON AUTOOFF }
{ "{{ agebd_env_suffix }}", "MASTER" , "0", "30" }
{ "{{ agebd_env_suffix }}", "TESTSERVICE99-X00" , "0", "0" }
{ "{{ agebd_env_suffix_upper }}", "MASTER" , "0", "30" }
{ "{{ agebd_env_suffix_upper }}", "TESTSERVICE99-X00" , "0", "0" }
}
cli/tests/fixtures/expected_output/services/testservice99-x00/current/ioc/AGEBD-CPCL-TESTSERVICE99-X00_main.subs
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
file TESTSERVICE99-X00.template {
pattern { DEVICE }
{ AGEBD-TESTSERVICE99-X00{{ agebd_env_suffix }} }
{ AGEBD-TESTSERVICE99-X00{{ agebd_env_suffix_upper }} }
}
cli/tests/fixtures/expected_output/services/testservice99-x00/current/ioc/AGEBD-CPCL-TESTSERVICE99-X00_parameters.yaml
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
cpu_architecture: x86_64
epics_version: 7.0.8
ioc_host: sls-vserv-bd-01{{ agebd_env_suffix }}
ioc_host: sls-vserv-bd-01{{ agebd_env_suffix_lower }}
ioc_port: {{ ioc_port }}
os: RHEL8
os_id: rhel
cli/tests/fixtures/test_repo_root/qt/A_BD_ServiceManager.ui
Vendored
+13 -13
View File
@@ -71,7 +71,7 @@ caLabel[statusTip="Operation"]{
<string notr="true">A</string>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-GUIRELOAD</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-GUIRELOAD</string>
</property>
<property name="eventSignal">
<enum>caCalc::TriggerZeroToOne</enum>
@@ -106,7 +106,7 @@ caLabel[statusTip="Operation"]{
<string notr="true">!A</string>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF</string>
</property>
</widget>
<widget class="QTabWidget" name="tabWidget">
@@ -586,7 +586,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ALIVE</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ALIVE</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -602,7 +602,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-STARTTIME</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-STARTTIME</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -624,7 +624,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-STATUS</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-STATUS</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -646,7 +646,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-VERSION</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-VERSION</string>
</property>
<property name="colorMode">
<enum>caLineEdit::Default</enum>
@@ -668,7 +668,7 @@ caLabel[statusTip="Operation"]{
</rect>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF</string>
</property>
<property name="stackingMode" stdset="0">
<enum>caChoice::Column</enum>
@@ -717,7 +717,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-ONOFF-RB</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-ONOFF-RB</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -763,7 +763,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-CPCL-MASTER$(AGEBD_ENV_SUFFIX):STATUS</string>
<string notr="true">AGEBD-CPCL-MASTER{{ agebd_env_suffix_upper }}:STATUS</string>
</property>
<property name="colorMode">
<enum>caLed::Alarm</enum>
@@ -1040,7 +1040,7 @@ caLabel[statusTip="Operation"]{
<enum>EPushButton::None</enum>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-MASTER$(AGEBD_ENV_SUFFIX):MASTER-LOGS-REQ</string>
<string notr="true">AGEBD-MASTER{{ agebd_env_suffix_upper }}:MASTER-LOGS-REQ</string>
</property>
<property name="label">
<string notr="true">Logs</string>
@@ -1106,7 +1106,7 @@ caLabel[statusTip="Operation"]{
<bool>false</bool>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-ALH$(AGEBD_ENV_SUFFIX):MASTER-GUIRELOAD</string>
<string notr="true">AGEBD-ALH{{ agebd_env_suffix_upper }}:MASTER-GUIRELOAD</string>
</property>
<property name="label">
<string notr="true">Reload</string>
@@ -1172,7 +1172,7 @@ caLabel[statusTip="Operation"]{
<enum>EPushButton::None</enum>
</property>
<property name="channel" stdset="0">
<string notr="true">AGEBD-CPCL-MASTER$(AGEBD_ENV_SUFFIX):RESTART</string>
<string notr="true">AGEBD-CPCL-MASTER{{ agebd_env_suffix_upper }}:RESTART</string>
</property>
<property name="label">
<string notr="true">↺</string>
@@ -1322,4 +1322,4 @@ caLabel[statusTip="Operation"]{
</hints>
</connection>
</connections>
</ui>
</ui>
cli/tests/fixtures/test_repo_root/services/master/current/ioc/AGEBD-CPCL-MASTER_main.subs
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
file MASTER.template {
pattern { SUFFIX SERVICE STARTON AUTOOFF }
{ "{{ agebd_env_suffix }}", "MASTER" , "0", "30" }
{ "{{ agebd_env_suffix_upper }}", "MASTER" , "0", "30" }
}