diff --git a/CDB/stations/DTS_Outside_ConfigDb.json b/CDB/stations/DTS_Outside_ConfigDb.json index 8f775e98a52b323871eb90ee9a232773bc3fe027..6f051755943d69ee16de650a16d86cdad6e2ebbc 100644 --- a/CDB/stations/DTS_Outside_ConfigDb.json +++ b/CDB/stations/DTS_Outside_ConfigDb.json @@ -557,8 +557,8 @@ "properties": { "SNMP_host": ["10.87.2.145"], "PSOC_sockets": [ - "socket_1", - "socket_2", + "ccd_socket", + "sdptr0_socket", "socket_3", "socket_4", "socket_5", diff --git a/docker-compose/device-pcon.yml b/docker-compose/device-pcon.yml index aa20c1498c3e135accd543800d9a50e41a3ea092..40ebb3f58605ab09ad402d3e4b5bf80bc201d95e 100644 --- a/docker-compose/device-pcon.yml +++ b/docker-compose/device-pcon.yml @@ -26,7 +26,7 @@ services: networks: - control ports: - - "5719:5719" # unique port for this DS + - "5720:5720" # unique port for this DS extra_hosts: - "host.docker.internal:host-gateway" volumes: @@ -38,5 +38,5 @@ services: - bin/start-ds.sh # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA # can't know about our Docker port forwarding - - l2ss-pcon pcon STAT -v -ORBendPoint giop:tcp:device-pcon:5719 -ORBendPointPublish giop:tcp:${HOSTNAME}:5719 + - l2ss-pcon pcon STAT -v -ORBendPoint giop:tcp:device-pcon:5720 -ORBendPointPublish giop:tcp:${HOSTNAME}:5720 restart: unless-stopped diff --git a/docker-compose/device-psoc.yml b/docker-compose/device-psoc.yml index b7b9738b0c4d6d40f2d4ff6c2f9f0698b0957a17..bc251d2de28a132953259de924b1cc8ee557175e 100644 --- a/docker-compose/device-psoc.yml +++ b/docker-compose/device-psoc.yml @@ -26,7 +26,7 @@ services: networks: - control ports: - - "5714:5714" # unique port for this DS + - "5719:5719" # unique port for this DS extra_hosts: - "host.docker.internal:host-gateway" volumes: @@ -38,5 +38,5 @@ services: - bin/start-ds.sh # configure CORBA to _listen_ on 0:port, but tell others we're _reachable_ through ${HOSTNAME}:port, since CORBA # can't know about our Docker port forwarding - - l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5714 -ORBendPointPublish giop:tcp:${HOSTNAME}:5714 + - l2ss-psoc PSOC STAT -v -ORBendPoint giop:tcp:device-psoc:5719 -ORBendPointPublish giop:tcp:${HOSTNAME}:5719 restart: unless-stopped diff --git a/tangostationcontrol/tangostationcontrol/clients/snmp_client.py b/tangostationcontrol/tangostationcontrol/clients/snmp_client.py index 0d9535134050d5b7fdd94e338fadf86d3a1de631..d7ca16b907fa78b6c767eb7d81d2654afaf37a00 100644 --- a/tangostationcontrol/tangostationcontrol/clients/snmp_client.py +++ b/tangostationcontrol/tangostationcontrol/clients/snmp_client.py @@ -160,6 +160,9 @@ class snmp_attribute: # get all of the values errorIndication, errorStatus, errorIndex, *varBinds = self.comm.getter(self.objs) + if errorIndication is not None: + raise IOError(f"An error occurred while attempting to write '{self.name}'. errorIndication: {errorIndication}") + # get all the values in a list converted to the correct type val_lst = self.convert(varBinds) @@ -178,6 +181,9 @@ class snmp_attribute: errorIndication, errorStatus, errorIndex, *varBinds = self.comm.setter(write_obj) + if errorIndication is not None: + raise IOError(f"An error occurred while attempting to write '{self.name}'. errorIndication: {errorIndication}") + def convert(self, var_binds): """