From 39e0837092d40c8e5effc8f488acfc69934a6092 Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Fri, 24 Nov 2023 11:34:22 +0100 Subject: [PATCH] New cagw setup simplifies EPICS_CA_ADDR settings a lot --- startup.script_common | 62 ++----------------------------------------- startup.script_linux | 24 ++--------------- 2 files changed, 4 insertions(+), 82 deletions(-) diff --git a/startup.script_common b/startup.script_common index e60d015..c929842 100644 --- a/startup.script_common +++ b/startup.script_common @@ -94,66 +94,8 @@ ifEnvSet IP_ADDR, "~129.129.131.*", "EPICS_CA_ADDR_LIST", "129.129.130.255 129.1 ifEnvSet IP_ADDR, "~129.129.137.*", "EPICS_CA_ADDR_LIST", "129.129.130.255 129.129.131.255" # SLS machine network -# Some tricks needed because VxWorks 5 command line has max 128 chars, VxWorks 6 has 256 chars. -# Does not work for EPICS 3.13 because EPICS_CAS_SERVER_PORT is not recognized -# Thus, 3.13 machine IOCs cannot connect to beamline PVs through gateways -SLS_CAGW1 = "129.129.98.10 129.129.99.11 129.129.102.10 129.129.101.10 129.129.105.10 129.129.104.10 129.129.107.10" -SLS_CAGW2 = "129.129.106.10 129.129.110.10 129.129.126.10 129.129.109.10 129.129.113.10 129.129.112.10 129.129.117.10" -SLS_CAGW3 = "129.129.116.10 129.129.119.10 129.129.118.10 129.129.121.10 129.129.122.10 172.21.110.26" -SLS_ADDR_LIST = malloc(400) -SLS_BEACON_ADDR_LIST = malloc(400) -sprintf SLS_ADDR_LIST, "172.20.255.255:5064 %s %s %s 129.129.130.36:5064", SLS_CAGW1, SLS_CAGW2, SLS_CAGW3 -sprintf SLS_BEACON_ADDR_LIST, "172.20.255.255:5065 %s %s %s 129.129.130.36:5065", SLS_CAGW1, SLS_CAGW2, SLS_CAGW3 -ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" -ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_SERVER_PORT", "5062" -ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_SERVER_PORT", "5064" -ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CA_ADDR_LIST", SLS_ADDR_LIST - -# I am getting erros from V69 IOCs about the beacons... -ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_AUTO_BEACON_ADDR_LIST","YES" -#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_AUTO_BEACON_ADDR_LIST", "NO" -#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_PORT", "5063" -#ifEnvSet IP_ADDR, R3_13?"":"~172.20.*", "EPICS_CAS_BEACON_ADDR_LIST", SLS_BEACON_ADDR_LIST - -# SLS beamlines -ifEnvSet IP_ADDR, "~129.129.98.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5800" -ifEnvSet IP_ADDR, "~129.129.98.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5801" -ifEnvSet IP_ADDR, "~129.129.99.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5802" -ifEnvSet IP_ADDR, "~129.129.99.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5803" -ifEnvSet IP_ADDR, "~129.129.102.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5804" -ifEnvSet IP_ADDR, "~129.129.102.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5805" -ifEnvSet IP_ADDR, "~129.129.101.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5806" -ifEnvSet IP_ADDR, "~129.129.101.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5807" -ifEnvSet IP_ADDR, "~129.129.105.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5808" -ifEnvSet IP_ADDR, "~129.129.105.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5809" -ifEnvSet IP_ADDR, "~129.129.104.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5810" -ifEnvSet IP_ADDR, "~129.129.104.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5811" -ifEnvSet IP_ADDR, "~129.129.107.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5812" -ifEnvSet IP_ADDR, "~129.129.107.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5813" -ifEnvSet IP_ADDR, "~129.129.106.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5814" -ifEnvSet IP_ADDR, "~129.129.106.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5815" -ifEnvSet IP_ADDR, "~129.129.110.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5816" -ifEnvSet IP_ADDR, "~129.129.110.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5817" -ifEnvSet IP_ADDR, "~129.129.126.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5818" -ifEnvSet IP_ADDR, "~129.129.126.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5818" -ifEnvSet IP_ADDR, "~129.129.109.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5820" -ifEnvSet IP_ADDR, "~129.129.109.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5821" -ifEnvSet IP_ADDR, "~129.129.113.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5822" -ifEnvSet IP_ADDR, "~129.129.113.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5823" -ifEnvSet IP_ADDR, "~129.129.112.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5824" -ifEnvSet IP_ADDR, "~129.129.112.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5825" -ifEnvSet IP_ADDR, "~129.129.117.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5826" -ifEnvSet IP_ADDR, "~129.129.117.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5827" -ifEnvSet IP_ADDR, "~129.129.116.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5828 172.20.3.11:5062" -ifEnvSet IP_ADDR, "~129.129.116.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5829 172.20.3.11:5063" -ifEnvSet IP_ADDR, "~129.129.119.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5830" -ifEnvSet IP_ADDR, "~129.129.119.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5831" -ifEnvSet IP_ADDR, "~129.129.118.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5832" -ifEnvSet IP_ADDR, "~129.129.118.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5833" -ifEnvSet IP_ADDR, "~129.129.121.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5834" -ifEnvSet IP_ADDR, "~129.129.121.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5835" -ifEnvSet IP_ADDR, "~129.129.122.*", "EPICS_CA_ADDR_LIST", "172.20.3.11:5836" -ifEnvSet IP_ADDR, "~129.129.122.*", "EPICS_CAS_BEACON_ADDR_LIST", "172.20.3.11:5837" +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_ADDR_LIST", "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" # HIPA ifEnvSet IP_ADDR, "~172.19.*", "EPICS_CA_ADDR_LIST", "172.19.10.255 172.19.30.255 172.19.32.255" diff --git a/startup.script_linux b/startup.script_linux index 56a81ea..4262426 100644 --- a/startup.script_linux +++ b/startup.script_linux @@ -30,28 +30,8 @@ ifEnvSet $(IP_ADDR) ~129.129.131.* EPICS_CA_ADDR_LIST "129.129.130.255 129.129.1 ifEnvSet $(IP_ADDR) ~129.129.137.* EPICS_CA_ADDR_LIST "129.129.130.255 129.129.131.255" # SLS machine network -ifEnvSet $(IP_ADDR) ~172.20.* EPICS_CA_ADDR_LIST "cryo-cagw.psi.ch:5062 sls129-softioc-mevis.psi.ch x01dc-cagw.psi.ch:5062 x02da-cagw.psi.ch:5062 x03da-cagw.psi.ch:5062 x03ma-cagw.psi.ch:5062 x04db-cagw.psi.ch:5062 x04sa-cagw.psi.ch:5062 x05da-cagw.psi.ch:5062 x05la-cagw.psi.ch:5062 x06da-cagw.psi.ch:5062 x06mx-cagw.psi.ch:5062 x06sa-cagw.psi.ch:5062 x07da-cagw.psi.ch:5062 x07ma-cagw.psi.ch:5062 x09la-cagw.psi.ch:5062 x09lb-cagw.psi.ch:5062 x10da-cagw.psi.ch:5062 x10sa-cagw.psi.ch:5062 x11ma-cagw.psi.ch:5062 x12sa-cagw.psi.ch:5062" - -# SLS beamlines -ifEnvSet $(IP_ADDR) ~129.129.98.* EPICS_CA_ADDR_LIST sls-x01dc-cagw.psi.ch:5800 -ifEnvSet $(IP_ADDR) ~129.129.99.* EPICS_CA_ADDR_LIST sls-x02da-cagw.psi.ch:5802 -ifEnvSet $(IP_ADDR) ~129.129.102.* EPICS_CA_ADDR_LIST sls-x03da-cagw.psi.ch:5804 -ifEnvSet $(IP_ADDR) ~129.129.101.* EPICS_CA_ADDR_LIST sls-x03ma-cagw.psi.ch:5806 -ifEnvSet $(IP_ADDR) ~129.129.105.* EPICS_CA_ADDR_LIST sls-x04db-cagw.psi.ch:5808 -ifEnvSet $(IP_ADDR) ~129.129.104.* EPICS_CA_ADDR_LIST sls-x04sa-cagw.psi.ch:5810 -ifEnvSet $(IP_ADDR) ~129.129.107.* EPICS_CA_ADDR_LIST sls-x05da-cagw.psi.ch:5812 -ifEnvSet $(IP_ADDR) ~129.129.106.* EPICS_CA_ADDR_LIST sls-x05la-cagw.psi.ch:5814 -ifEnvSet $(IP_ADDR) ~129.129.110.* EPICS_CA_ADDR_LIST sls-x06da-cagw.psi.ch:5816 -ifEnvSet $(IP_ADDR) ~129.129.126.* EPICS_CA_ADDR_LIST sls-x06mx-cagw.psi.ch:5818 -ifEnvSet $(IP_ADDR) ~129.129.109.* EPICS_CA_ADDR_LIST sls-x06sa-cagw.psi.ch:5820 -ifEnvSet $(IP_ADDR) ~129.129.113.* EPICS_CA_ADDR_LIST sls-x07da-cagw.psi.ch:5822 -ifEnvSet $(IP_ADDR) ~129.129.112.* EPICS_CA_ADDR_LIST sls-x07ma-cagw.psi.ch:5824 -ifEnvSet $(IP_ADDR) ~129.129.117.* EPICS_CA_ADDR_LIST sls-x09la-cagw.psi.ch:5826 -ifEnvSet $(IP_ADDR) ~129.129.116.* EPICS_CA_ADDR_LIST "sls-x09lb-cagw.psi.ch:5828 x09la-cagw.psi.ch:5062" -ifEnvSet $(IP_ADDR) ~129.129.119.* EPICS_CA_ADDR_LIST sls-x10da-cagw.psi.ch:5830 -ifEnvSet $(IP_ADDR) ~129.129.118.* EPICS_CA_ADDR_LIST sls-x10sa-cagw.psi.ch:5832 -ifEnvSet $(IP_ADDR) ~129.129.121.* EPICS_CA_ADDR_LIST sls-x11ma-cagw.psi.ch:5834 -ifEnvSet $(IP_ADDR) ~129.129.122.* EPICS_CA_ADDR_LIST sls-x12sa-cagw.psi.ch:5836 +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_ADDR_LIST", "172.22.4.255 172.22.5.255 172.22.6.255 172.22.7.255 172.22.120.255 172.22.121.255" +ifEnvSet IP_ADDR, "~172.22.*", "EPICS_CA_AUTO_ADDR_LIST", "NO" # SwissFEL machine networks # with directed broadcasts