Merge branch 'L2SS-828_dts_outside_integration_changes' into 'master'

Resolve L2SS-828 "Dts outside integration changes"

Closes L2SS-828

See merge request !402

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",

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

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

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):
         """