Resolve L2SS-1955 & L2SS-1902 "Remove psoc"

30ce1362 · Jan David Mol · b63b6d7a · 30ce1362 · 30ce1362 · 30ce1362
Commit 30ce1362 authored 11 months ago by Jan David Mol
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,6 +17,9 @@ ij_smart_tabs = false
 ij_visual_guides = none
 ij_wrap_on_typing = false

+[Makefile]
+indent_style = tab
+
 [{*.bash,*.sh,*.zsh}]
 indent_size = 2
 tab_width = 2

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -305,11 +305,17 @@ unit_test:
      - log/
      - .jumppad/logs/

-integration_test_docker:
+integration_test_core:
  extends: .test_docker
  script:
    #    Do not remove 'bash' or statement will be ignored by primitive docker shell
-    - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs --module="tango"
+    - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs --module="tango" --station=cs
+
+integration_test_remote:
+  extends: .test_docker
+  script:
+    #    Do not remove 'bash' or statement will be ignored by primitive docker shell
+    - bash -e $CI_PROJECT_DIR/sbin/run_integration_test.sh --no-build --save-logs --module="tango" --station=rs

 service_test_docker:
  extends: .test_docker

--- a/CDB/stations/DTS.json
+++ b/CDB/stations/DTS.json
@@ -18,7 +18,6 @@
              "Control_Children": [
                "STAT/EC/1",
                "STAT/CCD/1",
-                "STAT/PSOC/1",
                "STAT/PCON/1",
                "STAT/Configuration/1",
                "STAT/Calibration/1",

--- a/CDB/stations/common.json
+++ b/CDB/stations/common.json
@@ -11,11 +11,6 @@
        "Power_Available_In_State": ["HIBERNATE"]
      }
    },
-    "PSOC": {
-      "properties": {
-        "Power_Available_In_State": ["HIBERNATE"]
-      }
-    },
    "PCON": {
      "properties": {
        "Power_Available_In_State": ["HIBERNATE"]
@@ -118,7 +113,7 @@
            "properties": {
              "Power_Children": [
                "STAT/PCON/1",
-                "STAT/PSOC/1"
+                "STAT/CCD/1"
              ],
              "OPC_Server_Name": [
                "10.87.2.126"
@@ -193,47 +188,6 @@
        }
      }
    },
-    "PSOC": {
-      "STAT": {
-        "PSOC": {
-          "STAT/PSOC/1": {
-            "properties": {
-              "Power_Children": [
-                "STAT/CCD/1"
-              ],
-              "SNMP_host": [
-                "10.99.250.80"
-              ],
-              "SNMP_community": [
-                "public"
-              ],
-              "SNMP_mib_dir": [
-                "devices/mibs/PowerNet-MIB.mib"
-              ],
-              "SNMP_timeout": [
-                "10.0"
-              ],
-              "SNMP_version": [
-                "1"
-              ],
-              "SNMP_use_simulators": [
-                "False"
-              ],
-              "PSOC_sockets": [
-                "socket_1",
-                "socket_2",
-                "socket_3",
-                "socket_4",
-                "socket_5",
-                "socket_6",
-                "socket_7",
-                "socket_8"
-              ]
-            }
-          }
-        }
-      }
-    },
    "PCON": {
      "STAT": {
        "PCON": {

--- a/CDB/stations/cs.json
+++ b/CDB/stations/cs.json
@@ -18,7 +18,6 @@
              "Control_Children": [
                "STAT/EC/1",
                "STAT/CCD/1",
-                "STAT/PSOC/1",
                "STAT/PCON/1",
                "STAT/Configuration/1",
                "STAT/Calibration/1",

--- a/CDB/stations/rs.json
+++ b/CDB/stations/rs.json
@@ -17,7 +17,6 @@
              "Control_Children": [
                "STAT/EC/1",
                "STAT/CCD/1",
-                "STAT/PSOC/1",
                "STAT/PCON/1",
                "STAT/Configuration/1",
                "STAT/Calibration/1",

--- a/CDB/stations/simulators_ConfigDb.json
+++ b/CDB/stations/simulators_ConfigDb.json
@@ -171,19 +171,6 @@
                }
            }
        },
-        "PSOC": {
-            "STAT": {
-                "PSOC": {
-                    "STAT/PSOC/1": {
-                        "properties": {
-                            "SNMP_use_simulators": [
-                                "True"
-                            ]
-                        }
-                    }
-                }
-            }
-        },
        "RECVH": {
            "STAT": {
                "RECVH": {

--- a/CDB/stations/testenv_cs001.json
+++ b/CDB/stations/testenv_cs001.json
@@ -365,19 +365,6 @@
                }
            }
        },
-        "PSOC": {
-            "STAT": {
-                "PSOC": {
-                    "STAT/PSOC/1": {
-                        "properties": {
-                            "SNMP_use_simulators": [
-                                "True"
-                            ]
-                        }
-                    }
-                }
-            }
-        },
        "RECVH": {
            "STAT": {
                "RECVH": {

--- a/CDB/stations/testenv_rs307.json
+++ b/CDB/stations/testenv_rs307.json
--- a/README.md
+++ b/README.md
@@ -114,17 +114,6 @@ If you think the network is lingering as an error you can use

 ### Inspect services

-Now we can start all containers, and make sure everything is up:
-
-```sh
-make start
-make status
-```
-
-If not, you can inspect why with `docker logs <container>`. The containers will
-automatically be restarted on reboot or failure. Stop them explicitly to bring
-them down (`make stop <container>`).
-
 Most notably, you will have web interfaces available at:

 - http://localhost:8888 (Jupyter Lab)
@@ -164,6 +153,7 @@ Next change the version in the following places:

 * 0.42.2 Add protection control device shutting down station during over temperature
         Use the station manager `protection_lock_RW` to see if the station is locked against further damage.
+         Add integration tests for remote stations
 * 0.42.1 Added lock around commands in AsyncDevices to prevent concurrent execution
 * 0.42.0 Change CS032 port mappings to prevent beamlet overlap
 * 0.41.1 Reduce log size for value changes and metadata publications drastically

--- a/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/02-devices.py
+++ b/docker/jupyter-lab/ipython-profiles/stationcontrol-jupyter/startup/02-devices.py
@@ -80,7 +80,6 @@ stationmanager = OptionalDeviceProxy("STAT/StationManager/1")
 ccd = OptionalDeviceProxy("STAT/CCD/1")
 ec = OptionalDeviceProxy("STAT/EC/1")
 pcon = OptionalDeviceProxy("STAT/PCON/1")
-psoc = OptionalDeviceProxy("STAT/PSOC/1")
 protectioncontrol = OptionalDeviceProxy("STAT/ProtectionControl/1")
 configuration = OptionalDeviceProxy("STAT/Configuration/1")
 calibration = OptionalDeviceProxy("STAT/Calibration/1")

--- a/infra/dev/all.hcl
+++ b/infra/dev/all.hcl
@@ -12,6 +12,10 @@ variable "debug_host" {
  default = ""
 }

+variable "station_type" {
+  default = "cs"
+}
+
 module "nomad" {
  source    = "./nomad"
  variables = {

--- a/infra/dev/services.hcl
+++ b/infra/dev/services.hcl
@@ -5,6 +5,10 @@ variable "image_tag" {
  default = "latest"
 }

+variable "station_type" {
+  default = "cs"
+}
+
 module "nomad" {
  source    = "./nomad"
  variables = {

--- a/infra/dev/services/variables.hcl
+++ b/infra/dev/services/variables.hcl
@@ -2,6 +2,10 @@ variable "nomad_cluster" {
  default = ""
 }

+variable "station_type" {
+  default = "cs"
+}
+
 variable "lofar20_dir" {
  default = ""
 }
--- a/infra/dev/tango.hcl
+++ b/infra/dev/tango.hcl
@@ -12,6 +12,10 @@ variable "debug_host" {
  default = ""
 }

+variable "station_type" {
+  default = "cs"
+}
+
 module "nomad" {
  source    = "./nomad"
  variables = {

--- a/infra/dev/tango/tango.hcl
+++ b/infra/dev/tango/tango.hcl
@@ -87,6 +87,7 @@ resource "exec" "dsconfig" {
    DOCKER_HOST=docker_host()
    TANGO_HOST="tango.service.consul:10000"
    TAG=variable.image_tag
+    STATION_TYPE=variable.station_type
  }
  working_directory = "${variable.lofar20_dir}"
  timeout = "300s"
@@ -108,10 +109,19 @@ resource "exec" "dsconfig" {
  bash sbin/dsconfig.sh --update CDB/stations/l1.json
  bash sbin/dsconfig.sh --update CDB/stations/lba.json
  bash sbin/dsconfig.sh --update CDB/stations/h0.json
+  if [ "$STATION_TYPE" = "rs" ]; then
+    echo "Configuring dsconfig for remote station"
+    bash sbin/dsconfig.sh --update CDB/stations/hba_remote.json
+    bash sbin/dsconfig.sh --update CDB/stations/rs.json
+    bash sbin/dsconfig.sh --update CDB/stations/rs307.json
+    bash sbin/dsconfig.sh --update CDB/stations/testenv_rs307.json
+  else
+    echo "Configuring dsconfig for core station"
    bash sbin/dsconfig.sh --update CDB/stations/hba_core.json
    bash sbin/dsconfig.sh --update CDB/stations/cs.json
    bash sbin/dsconfig.sh --update CDB/stations/cs001.json
    bash sbin/dsconfig.sh --update CDB/stations/testenv_cs001.json
+  fi
  EOF
 }


--- a/infra/dev/tango/variables.hcl
+++ b/infra/dev/tango/variables.hcl
@@ -2,6 +2,10 @@ variable "nomad_cluster" {
  default = ""
 }

+variable "station_type" {
+  default = "cs"
+}
+
 variable "image_tag" {
  default = "latest"
 }

--- a/infra/env/common.yaml
+++ b/infra/env/common.yaml
@@ -73,7 +73,6 @@ devices:
  - ObservationControl
  - Metadata
  - PCON
-  - PSOC
  - RECVH
  - RECVL
  - SDP

--- a/infra/jobs/station/Makefile
+++ b/infra/jobs/station/Makefile
 TAG ?= latest
 STATION ?= dev
+STATION_TYPE ?= cs
 DIR_OUT ?= .
 DIR_SRC += .
 SRC_JOBS += $(wildcard $(addsuffix /*.levant.nomad, $(DIR_SRC)))
 JOBS := $(patsubst %.levant.nomad,%.nomad, $(SRC_JOBS))
+ifeq ($(STATION_TYPE), cs)
 		ENV ?= ../../env/common.yaml ../../env/cs.yaml
+else
+		ENV ?= ../../env/common.yaml ../../env/rs.yaml
+endif

 .PHONY: render


--- a/sbin/prepare_dev_env.sh
+++ b/sbin/prepare_dev_env.sh
@@ -37,6 +37,7 @@ if ! [ -x "$(command -v levant)" ]; then
  chmod +x ./.bin/levant
 fi

+echo "Generating jobs for station configuration: $STATION_TYPE"
 make -C infra/jobs/station DIR_OUT="$( realpath "infra/dev/jobs/station")" render

 docker_volume="dev_nomad_station"