From 472a6f584d61d4ab562b602aed38a3ad736e14ba Mon Sep 17 00:00:00 2001 From: Mike Langmayr <1809691+mikelangmayr@users.noreply.github.com> Date: Wed, 7 Oct 2026 15:43:06 -0700 Subject: [PATCH] Point the FEI PDU configs at the right Eatons and refresh the host table --- config/hspower/hspower_fei1.yaml | 6 +-- config/hspower/hspower_fei2.yaml | 6 +-- config/hspower/hspower_rspec1.yaml | 11 ++--- docs/build_notes/host_machine_build_notes.rst | 49 ++++++++++++++----- 4 files changed, 45 insertions(+), 27 deletions(-) diff --git a/config/hspower/hspower_fei1.yaml b/config/hspower/hspower_fei1.yaml index c3f4747..f85bee9 100644 --- a/config/hspower/hspower_fei1.yaml +++ b/config/hspower/hspower_fei1.yaml @@ -10,10 +10,8 @@ group_id: hspower hardware: # feieaton1, per the /etc/hosts table in - # docs/build_notes/host_machine_build_notes.rst. That table also lists a - # third FEI unit, feieaton3 (192.168.29.106), so confirm which two of the - # three the FEI actually runs before deploying. - ip_address: 192.168.29.102 + # docs/build_notes/host_machine_build_notes.rst + ip_address: 192.168.29.105 tcp_port: 23 # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has # ten, and this is what decides how many outlet keyword blocks exist; the diff --git a/config/hspower/hspower_fei2.yaml b/config/hspower/hspower_fei2.yaml index 331c9cb..e0de0c3 100644 --- a/config/hspower/hspower_fei2.yaml +++ b/config/hspower/hspower_fei2.yaml @@ -10,10 +10,8 @@ group_id: hspower hardware: # feieaton2, per the /etc/hosts table in - # docs/build_notes/host_machine_build_notes.rst. That table also lists a - # third FEI unit, feieaton3 (192.168.29.106), so confirm which two of the - # three the FEI actually runs before deploying. - ip_address: 192.168.29.105 + # docs/build_notes/host_machine_build_notes.rst + ip_address: 192.168.29.106 tcp_port: 23 # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has # ten, and this is what decides how many outlet keyword blocks exist; the diff --git a/config/hspower/hspower_rspec1.yaml b/config/hspower/hspower_rspec1.yaml index f7e0f1d..75e6388 100644 --- a/config/hspower/hspower_rspec1.yaml +++ b/config/hspower/hspower_rspec1.yaml @@ -9,12 +9,11 @@ peer_id: rspec1 group_id: hspower hardware: - # TODO: address unknown — the /etc/hosts table in - # docs/build_notes/host_machine_build_notes.rst documents no red-side - # Eaton, though the pdu driver's README uses 'redeaton1' as its example - # host. Left unset on purpose: the daemon then starts, serves its keywords - # and reports 'missing PDU connection parameters' rather than reaching for - # a guessed address. + # TODO: which unit is unknown. The /etc/hosts table in + # docs/build_notes/host_machine_build_notes.rst lists redeaton1, redeaton2 + # and redeaton3, and there is one RSPEC config. Left unset on purpose: the + # daemon then starts, serves its keywords and reports 'missing PDU + # connection parameters' rather than reaching for a guessed address. ip_address: tcp_port: 23 # TODO: confirm against the hardware. EMAT-08 has eight outlets, EMAT-10 has diff --git a/docs/build_notes/host_machine_build_notes.rst b/docs/build_notes/host_machine_build_notes.rst index a6c3fe7..1a8e2ee 100644 --- a/docs/build_notes/host_machine_build_notes.rst +++ b/docs/build_notes/host_machine_build_notes.rst @@ -231,19 +231,42 @@ Edit ``/etc/hosts`` to include the private network entries for HISPEC, ordered n .. code-block:: text - 192.168.29.100 feilantronix - 192.168.29.101 switch - 192.168.29.102 feieaton1 - 192.168.29.104 feilakeshore - 192.168.29.105 feieaton2 - 192.168.29.106 feieaton3 - 192.168.29.120 feiinficon - 192.168.29.125 blueinficon - 192.168.29.150 blueettemp - 192.168.29.151 blueeaton1 - 192.168.29.152 blueeaton2 - 192.168.29.153 bluelantronix - 192.168.29.154 hs1wireblue + 192.168.29.2 hispecserver + 192.168.29.3 hispecserverlom + 192.168.29.4 specswitchspare + 192.168.29.100 feilantronix + 192.168.29.101 feiswitch + 192.168.29.102 feidcpdu2 + 192.168.29.104 feilakeshore + 192.168.29.105 feieaton1 + 192.168.29.106 feieaton2 + 192.168.29.107 feifsm + 192.168.29.109 feitrackcomp + 192.168.29.110 feidcpdu1 + 192.168.29.120 feiinficon + 192.168.29.122 tmpstanda + 192.168.29.123 redatten rediriscontroller + 192.168.29.125 blueinficon + 192.168.29.129 redswitch + 192.168.29.130 redlantronix + 192.168.29.131 specblueinficon + 192.168.29.132 specredinficon + 192.168.29.135 redinficon + 192.168.29.136 specredlakeshore + 192.168.29.140 hs1wirered + 192.168.29.145 host + 192.168.29.150 blueettemp + 192.168.29.151 blueeaton1 + 192.168.29.152 blueeaton2 + 192.168.29.153 bluelantronix + 192.168.29.154 hs1wireblue + 192.168.29.161 redlakeshore1 + 192.168.29.162 redlakeshore2 + 192.168.29.163 redeaton1 + 192.168.29.164 redeaton2 + 192.168.29.165 redettemp + 192.168.29.166 redeaton3 + 192.168.29.175 cred2 MQTT Broker Setup -----------------