From e266163bea4562883891865d7b20a29d5fe6e8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 15 Apr 2026 19:57:26 +0200 Subject: [PATCH] ci: cdrouter: switch USP testing from STOMP to MQTTv5 as primary MTP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently all CDRouter USP protocol tests in prplOS use STOMP MTP (100%). This no longer matches the FEAT-63 delivery plan and industry adoption. MQTTv5 should become the default MTP for the majority of CDRouter test runs, while keeping WebSocket and STOMP coverage in some jobs as smaller regression slices. So lets switch the shared template to MQTTv5 by default, parameterising the shipped CDRouter configs instead of cloning them, and adding guarded DUT init helpers that stop obuspa, install the requested reset file, clear /etc/obuspa.db, start obuspa again, and wait for the USP data model to come back. Use the existing job matrix to keep protocol coverage aligned with the agreed distribution: - Wireless smoke tests use WebSocket - prplOS Network Test Plan Candidate jobs use WebSocket - IPv6 Top-100+mDNS VLAN jobs use STOMP - all remaining jobs use MQTTv5 - MQTTv3 stays out of scope References: PCF-1323, PCF-2322 Assisted-by: codex:gpt-5.4:xhigh Assisted-by: claude:opus-4-6:1m-context Co-developed-by: Sergio Panseri Co-developed-by: Piotr Nakraszewicz Signed-off-by: Petr Štetiar --- .gitlab/cdrouter.yml | 12 +++ .gitlab/cdrouter/arcadyan-mozart.yml | 23 +++-- .gitlab/cdrouter/mxl25641-hdk-6.yml | 23 +++-- .gitlab/cdrouter/prpl-haze.yml | 23 +++-- .gitlab/cdrouter/turris-omnia.yml | 23 +++-- .gitlab/cdrouter/wnc-freedom.yml | 23 +++-- .../cdrouter-dut-configure-usp-common.sh | 93 +++++++++++++++++++ .../cdrouter-dut-configure-usp-mqtt.sh | 36 +++++++ .../dut-init/cdrouter-dut-configure-usp-ws.sh | 35 +++++++ .../dut-init/obuspa_param_reset-mqtt.txt | 76 +++++++++++++++ .../dut-init/obuspa_param_reset-ws.txt | 64 +++++++++++++ .testbed/cdrouter/configurations/generic | 10 +- .testbed/cdrouter/configurations/generic-ipv6 | 10 +- .../configurations/generic-ipv6-dslite | 10 +- .../cdrouter/configurations/generic-ipv6-upnp | 10 +- .testbed/cdrouter/configurations/ppp | 10 +- .testbed/cdrouter/configurations/ppp-ipv6 | 10 +- .../configurations/prplos-certification | 10 +- .testbed/cdrouter/configurations/smoke-test | 10 +- .testbed/cdrouter/configurations/vlan | 10 +- .testbed/cdrouter/configurations/vlan-ipv6 | 10 +- .testbed/cdrouter/configurations/vlan-ppp | 10 +- .../cdrouter/configurations/vlan-ppp-ipv6 | 10 +- .testbed/cdrouter/configurations/wireless | 10 +- 24 files changed, 466 insertions(+), 95 deletions(-) create mode 100644 .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh create mode 100755 .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-mqtt.sh create mode 100755 .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh create mode 100755 .gitlab/scripts/dut-init/obuspa_param_reset-mqtt.txt create mode 100755 .gitlab/scripts/dut-init/obuspa_param_reset-ws.txt diff --git a/.gitlab/cdrouter.yml b/.gitlab/cdrouter.yml index 7f3b61f0e5..470e57a779 100644 --- a/.gitlab/cdrouter.yml +++ b/.gitlab/cdrouter.yml @@ -11,7 +11,13 @@ CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128' CDROUTER_CONFIG_WIFI_LAN_CHANNEL: 6 CDROUTER_CONFIG_WIFI_LAN_SSID: 'prplOS' + CDROUTER_CONFIG_USP_CONTROLLER_MTP: mqtt + CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION: 'yes' + CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN: controller.cdroutertest.com + CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH: /usr/cdrouter-data/prplos-ci/usp-ssl-certs/server.crt + CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH: /usr/cdrouter-data/prplos-ci/usp-ssl-certs/ca.crt CDROUTER_TEST_CONFIG: generic + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-mqtt.sh DUT_SLEEP_AFTER_BOOT: 90 TEST_SETUP_TEARDOWN_DURATION: 360 CDROUTER_LAN_INTERFACE: eth1 @@ -79,6 +85,12 @@ - section_end "dut-system-info" - section_start "dut-init" "DUT Initialization" "collapsed" + - > + if [ -n "${CDROUTER_DUT_INIT_USP_MTP_SCRIPT:-}" ]; then + echo "Running $CDROUTER_DUT_INIT_USP_MTP_SCRIPT"; + "${CI_PROJECT_DIR}/$CDROUTER_DUT_INIT_USP_MTP_SCRIPT"; + fi + - > for dut_init_script in $DUT_INIT_SCRIPTS; do echo "Running $dut_init_script"; "${CI_PROJECT_DIR}/$dut_init_script"; diff --git a/.gitlab/cdrouter/arcadyan-mozart.yml b/.gitlab/cdrouter/arcadyan-mozart.yml index 538fa66b48..ca3bafde41 100644 --- a/.gitlab/cdrouter/arcadyan-mozart.yml +++ b/.gitlab/cdrouter/arcadyan-mozart.yml @@ -38,6 +38,8 @@ CDRouter-Wireless Mozart initramfs: timeout: 15 minutes variables: CDROUTER_TEST_CONFIG: wireless + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b be g n' CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128 GCMP-256' DUT_INIT_SCRIPTS: | @@ -100,6 +102,8 @@ CDRouter-IPv6-Top-100+mDNS Mozart VLAN WAN/LAN initramfs: <<: *arcadyan_mozart_ipv6 variables: CDROUTER_TEST_CONFIG: vlan-ipv6 + CDROUTER_CONFIG_USP_CONTROLLER_MTP: stomp + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: '' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -149,6 +153,14 @@ prplWare-Smoke-Test-Suite Mozart initramfs: .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh +.arcadyan-mozart-certification-variables: &arcadyan_mozart_certification_variables + CDROUTER_TEST_CONFIG: prplos-certification + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + .arcadyan-mozart-certification: &arcadyan_mozart_certification <<: *arcadyan_mozart_ipv6 stage: certification tests @@ -158,12 +170,7 @@ prplWare-Smoke-Test-Suite Mozart initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: prplos-certification - DUT_INIT_SCRIPTS: | - .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh - .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + <<: *arcadyan_mozart_certification_variables prplOS-Network-Test-Plan-Mandatory-v1.2.0 Mozart initramfs: <<: *arcadyan_mozart_certification @@ -171,3 +178,7 @@ prplOS-Network-Test-Plan-Mandatory-v1.2.0 Mozart initramfs: prplOS-Network-Test-Plan-Candidate-v1.2.0 Mozart initramfs: <<: *arcadyan_mozart_certification timeout: 52 minutes + variables: + <<: *arcadyan_mozart_certification_variables + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh diff --git a/.gitlab/cdrouter/mxl25641-hdk-6.yml b/.gitlab/cdrouter/mxl25641-hdk-6.yml index e9f2ed06b5..6909447e34 100644 --- a/.gitlab/cdrouter/mxl25641-hdk-6.yml +++ b/.gitlab/cdrouter/mxl25641-hdk-6.yml @@ -38,6 +38,8 @@ CDRouter-Wireless MXL25641-HDK-6 eMMC: timeout: 15 minutes variables: CDROUTER_TEST_CONFIG: wireless + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b be g n' CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128 GCMP-256' DUT_INIT_SCRIPTS: | @@ -99,6 +101,8 @@ CDRouter-IPv6-Top-100+mDNS MXL25641-HDK-6 VLAN WAN/LAN eMMC: <<: *mxl25641_cdrouter_ipv6 variables: CDROUTER_TEST_CONFIG: vlan-ipv6 + CDROUTER_CONFIG_USP_CONTROLLER_MTP: stomp + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: '' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -147,6 +151,14 @@ prplWare-Smoke-Test-Suite MXL25641-HDK-6 eMMC: .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh +.mxl25641-certification-variables: &mxl25641_certification_variables + CDROUTER_TEST_CONFIG: prplos-certification + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + .mxl25641-certification: &mxl25641_certification <<: *mxl25641_cdrouter_ipv6 timeout: 1h 45m @@ -156,12 +168,7 @@ prplWare-Smoke-Test-Suite MXL25641-HDK-6 eMMC: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: prplos-certification - DUT_INIT_SCRIPTS: | - .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh - .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + <<: *mxl25641_certification_variables prplOS-Network-Test-Plan-Mandatory-v1.2.0 MXL25641-HDK-6 eMMC: <<: *mxl25641_certification @@ -169,3 +176,7 @@ prplOS-Network-Test-Plan-Mandatory-v1.2.0 MXL25641-HDK-6 eMMC: prplOS-Network-Test-Plan-Candidate-v1.2.0 MXL25641-HDK-6 eMMC: <<: *mxl25641_certification timeout: 52 minutes + variables: + <<: *mxl25641_certification_variables + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml index c1d93a9ac8..be781feb10 100644 --- a/.gitlab/cdrouter/prpl-haze.yml +++ b/.gitlab/cdrouter/prpl-haze.yml @@ -43,6 +43,8 @@ CDRouter-Wireless Haze initramfs: timeout: 15 minutes variables: CDROUTER_TEST_CONFIG: wireless + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh @@ -101,6 +103,8 @@ CDRouter-IPv6-Top-100+mDNS Haze VLAN WAN/LAN initramfs: <<: *prpl_haze_ipv6 variables: CDROUTER_TEST_CONFIG: vlan-ipv6 + CDROUTER_CONFIG_USP_CONTROLLER_MTP: stomp + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: '' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -150,6 +154,14 @@ prplWare-Smoke-Test-Suite Haze initramfs: .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh +.prpl-haze-certification-variables: &prpl_haze_certification_variables + CDROUTER_TEST_CONFIG: prplos-certification + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + .prpl-haze-certification: &prpl_haze_certification <<: *prpl_haze_ipv6 stage: certification tests @@ -160,12 +172,7 @@ prplWare-Smoke-Test-Suite Haze initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: prplos-certification - DUT_INIT_SCRIPTS: | - .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh - .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + <<: *prpl_haze_certification_variables prplOS-Network-Test-Plan-Mandatory-v1.2.0 Haze initramfs: <<: *prpl_haze_certification @@ -173,3 +180,7 @@ prplOS-Network-Test-Plan-Mandatory-v1.2.0 Haze initramfs: prplOS-Network-Test-Plan-Candidate-v1.2.0 Haze initramfs: <<: *prpl_haze_certification timeout: 52 minutes + variables: + <<: *prpl_haze_certification_variables + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml index bbccb7b240..18c2d56cfe 100644 --- a/.gitlab/cdrouter/turris-omnia.yml +++ b/.gitlab/cdrouter/turris-omnia.yml @@ -43,6 +43,8 @@ CDRouter-Wireless Turris initramfs: timeout: 15 minutes variables: CDROUTER_TEST_CONFIG: wireless + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh @@ -101,6 +103,8 @@ CDRouter-IPv6-Top-100+mDNS Turris VLAN WAN/LAN initramfs: <<: *turris_cdrouter_ipv6 variables: CDROUTER_TEST_CONFIG: vlan-ipv6 + CDROUTER_CONFIG_USP_CONTROLLER_MTP: stomp + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: '' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -151,6 +155,14 @@ prplWare-Smoke-Test-Suite Turris initramfs: .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh +.turris-certification-variables: &turris_certification_variables + CDROUTER_TEST_CONFIG: prplos-certification + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + .turris-certification: &turris_certification <<: *turris_cdrouter_ipv6 stage: certification tests @@ -161,12 +173,7 @@ prplWare-Smoke-Test-Suite Turris initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: prplos-certification - DUT_INIT_SCRIPTS: | - .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh - .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + <<: *turris_certification_variables prplOS-Network-Test-Plan-Mandatory-v1.2.0 Turris initramfs: <<: *turris_certification @@ -174,3 +181,7 @@ prplOS-Network-Test-Plan-Mandatory-v1.2.0 Turris initramfs: prplOS-Network-Test-Plan-Candidate-v1.2.0 Turris initramfs: <<: *turris_certification timeout: 52 minutes + variables: + <<: *turris_certification_variables + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml index a8e5291bb1..7e0a526df6 100644 --- a/.gitlab/cdrouter/wnc-freedom.yml +++ b/.gitlab/cdrouter/wnc-freedom.yml @@ -38,6 +38,8 @@ CDRouter-Wireless Freedom initramfs: timeout: 15 minutes variables: CDROUTER_TEST_CONFIG: wireless + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b be g n' CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128 GCMP-256' DUT_INIT_SCRIPTS: | @@ -100,6 +102,8 @@ CDRouter-IPv6-Top-100+mDNS Freedom VLAN WAN/LAN initramfs: <<: *wnc_freedom_ipv6 variables: CDROUTER_TEST_CONFIG: vlan-ipv6 + CDROUTER_CONFIG_USP_CONTROLLER_MTP: stomp + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: '' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh @@ -150,6 +154,14 @@ prplWare-Smoke-Test-Suite Freedom initramfs: .gitlab/scripts/dut-init/cdrouter-dut-configure-prplmesh-controller.sh .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh +.wnc-freedom-certification-variables: &wnc_freedom_certification_variables + CDROUTER_TEST_CONFIG: prplos-certification + DUT_INIT_SCRIPTS: | + .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh + .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh + .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + .wnc-freedom-certification: &wnc_freedom_certification <<: *wnc_freedom_ipv6 stage: certification tests @@ -159,12 +171,7 @@ prplWare-Smoke-Test-Suite Freedom initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: prplos-certification - DUT_INIT_SCRIPTS: | - .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-cwmpd.sh - .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh - .gitlab/scripts/dut-init/dut-change-fail-action-to-restart.sh + <<: *wnc_freedom_certification_variables prplOS-Network-Test-Plan-Mandatory-v1.2.0 Freedom initramfs: <<: *wnc_freedom_certification @@ -172,3 +179,7 @@ prplOS-Network-Test-Plan-Mandatory-v1.2.0 Freedom initramfs: prplOS-Network-Test-Plan-Candidate-v1.2.0 Freedom initramfs: <<: *wnc_freedom_certification timeout: 52 minutes + variables: + <<: *wnc_freedom_certification_variables + CDROUTER_CONFIG_USP_CONTROLLER_MTP: websocket + CDROUTER_DUT_INIT_USP_MTP_SCRIPT: .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh diff --git a/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh new file mode 100644 index 0000000000..33ee70eac6 --- /dev/null +++ b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh @@ -0,0 +1,93 @@ +#!/bin/bash + +source .gitlab/scripts/helpers.sh + +USP_DEBUG_PATHS=() + +handle_error() { + local exit_code=$1 + local line_no=$2 + local bash_lineno=$3 + local last_command=$4 + + log_error "Error occurred in script at line: $line_no / $bash_lineno" + log_error "Command that failed: $last_command" + log_error "Exit code: $exit_code" + + exit "$exit_code" +} + +obuspa_get() { + # shellcheck disable=SC2029 + ssh "root@$TARGET_LAN_IP" obuspa -c get "$1" +} + +obuspa_value() { + local path="$1" + + obuspa_get "$path" 2>/dev/null | + awk -F' => ' -v path="$path" '$1 == path { print $2; exit }' +} + +dump_usp_state() { + local path + + for path in "$@"; do + [ -n "$path" ] || continue + log_info "Dumping $path" + obuspa_get "$path" || true + done + + log_info "Dumping recent system log lines" + # shellcheck disable=SC2029 + ssh "root@$TARGET_LAN_IP" "logread | tail -n 200" || true +} + +wait_till_usp_value() { + local path="$1" + local expected="$2" + local description="$3" + local timeout="${4:-120}" + local diff=0 + local start_time + local value="" + + start_time=$(date +%s) + log_info "Checking if $description is ready..." + + while true; do + value=$(obuspa_value "$path" || true) + if [ "$value" = "$expected" ]; then + log_success "$description is ready" + return 0 + fi + + diff=$(($(date +%s) - start_time)) + if [ "$diff" -ge "$timeout" ]; then + log_error "Timeout waiting for $description, expected '$expected', got '${value:-}'" + dump_usp_state "${USP_DEBUG_PATHS[@]}" + return 1 + fi + + log_info "Waiting for $description ($diff s)" + sleep 5 + done +} + +configure_usp_reset_file() { + local reset_file="$1" + local protocol_name="$2" + local remote_reset_file="/etc/config/obuspa_param_reset.txt" + + log_info "Stopping obuspa service" + ssh "root@$TARGET_LAN_IP" "service obuspa stop" + + log_info "Installing ${protocol_name} OBUSPA reset file" + scp "$reset_file" "root@${TARGET_LAN_IP}:${remote_reset_file}" + + log_info "Removing stale OBUSPA database" + ssh "root@$TARGET_LAN_IP" "rm -f /etc/obuspa.db" + + log_info "Starting obuspa service" + ssh "root@$TARGET_LAN_IP" "service obuspa start" +} diff --git a/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-mqtt.sh b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-mqtt.sh new file mode 100755 index 0000000000..04125593f9 --- /dev/null +++ b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-mqtt.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +source .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh + +set -eu +set -o pipefail + +trap 'handle_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]:-})' ERR + +main() { + local reset_file=".gitlab/scripts/dut-init/obuspa_param_reset-mqtt.txt" + + USP_DEBUG_PATHS=( + "Device.LocalAgent.MTP.1." + "Device.LocalAgent.Controller.1.MTP.1." + "Device.MQTT." + ) + + configure_usp_reset_file "$reset_file" "MQTTv5" + wait_till_usp_value \ + "Device.LocalAgent.MTP.1.Protocol" \ + "MQTT" \ + "LocalAgent MQTT protocol" + wait_till_usp_value \ + "Device.LocalAgent.MTP.1.MQTT.ResponseTopicConfigured" \ + "/queue/agent-1" \ + "LocalAgent MQTT response topic" + wait_till_usp_value \ + "Device.LocalAgent.Controller.1.MTP.1.MQTT.Topic" \ + "/controller-path" \ + "Controller MQTT topic" + + log_success "Configured DUT to use MQTTv5 as USP MTP" +} + +main diff --git a/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh new file mode 100755 index 0000000000..72aa1aa854 --- /dev/null +++ b/.gitlab/scripts/dut-init/cdrouter-dut-configure-usp-ws.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +source .gitlab/scripts/dut-init/cdrouter-dut-configure-usp-common.sh + +set -eu +set -o pipefail + +trap 'handle_error $? $LINENO $BASH_LINENO "$BASH_COMMAND" $(printf "::%s" ${FUNCNAME[@]:-})' ERR + +main() { + local reset_file=".gitlab/scripts/dut-init/obuspa_param_reset-ws.txt" + + USP_DEBUG_PATHS=( + "Device.LocalAgent.MTP.1." + "Device.LocalAgent.Controller.1.MTP.1." + ) + + configure_usp_reset_file "$reset_file" "WebSocket" + wait_till_usp_value \ + "Device.LocalAgent.MTP.1.Protocol" \ + "WebSocket" \ + "LocalAgent WebSocket protocol" + wait_till_usp_value \ + "Device.LocalAgent.MTP.1.WebSocket.Path" \ + "/queue/agent-1" \ + "LocalAgent WebSocket path" + wait_till_usp_value \ + "Device.LocalAgent.Controller.1.MTP.1.WebSocket.Path" \ + "/controller-path" \ + "Controller WebSocket path" + + log_success "Configured DUT to use WebSocket as USP MTP" +} + +main diff --git a/.gitlab/scripts/dut-init/obuspa_param_reset-mqtt.txt b/.gitlab/scripts/dut-init/obuspa_param_reset-mqtt.txt new file mode 100755 index 0000000000..4f8d987237 --- /dev/null +++ b/.gitlab/scripts/dut-init/obuspa_param_reset-mqtt.txt @@ -0,0 +1,76 @@ +########################################################################################################## +# +# This file contains a factory reset database in text format +# +# If no USP database exists when OB-USP-AGENT starts, then OB-USP-AGENT will create a database containing +# the parameters specified in a text file located by the '-r' option. +# Example: +# obuspa -p -v 4 -r factory_reset_example.txt +# +# Each line of this file contains either a comment (denoted by '#' at the start of the line) +# or a USP data model parameter and its factory reset value. +# The parameter and value are separated by whitespace. +# The value may optionally be enclosed in speech marks "" (this is the only way to specify an empty string) +# +########################################################################################################## + +Device.LocalAgent.EndpointID "proto::agent-id" +Device.LocalAgent.X_VANTIVA-COM_PreConnectTimeout "600" + + +################################### +# Controller 1 for CDRouter tests # +################################### + +Device.LocalAgent.Controller.1.EndpointID "proto::controller-id" +Device.LocalAgent.Controller.1.Alias "cpe-1" +Device.LocalAgent.Controller.1.Enable "true" +Device.LocalAgent.Controller.1.AssignedRole "Device.LocalAgent.ControllerTrust.Role.1" +Device.LocalAgent.Controller.1.PeriodicNotifInterval "86400" +Device.LocalAgent.Controller.1.PeriodicNotifTime "0001-01-01T00:00:00Z" +Device.LocalAgent.Controller.1.USPNotifRetryMinimumWaitInterval "5" +Device.LocalAgent.Controller.1.USPNotifRetryIntervalMultiplier "2000" +Device.LocalAgent.Controller.1.ControllerCode "" + +# Controller 1, MTP = MQTT +Device.LocalAgent.Controller.1.MTP.1.Alias "cpe-1" +Device.LocalAgent.Controller.1.MTP.1.Enable "true" +Device.LocalAgent.Controller.1.MTP.1.Protocol "MQTT" +Device.LocalAgent.Controller.1.MTP.1.MQTT.Reference "Device.MQTT.Client.1" +Device.LocalAgent.Controller.1.MTP.1.MQTT.Topic "/controller-path" + +# LocalAgent, MQTT +Device.LocalAgent.MTP.1.MQTT.ResponseTopicConfigured "/queue/agent-1" +Device.LocalAgent.MTP.1.MQTT.Reference "Device.MQTT.Client.1" +Device.LocalAgent.MTP.1.Alias "cpe-1" +Device.LocalAgent.MTP.1.Enable "true" +Device.LocalAgent.MTP.1.Protocol "MQTT" + +# MQTT +Device.MQTT.Client.1.BrokerAddress "controller.cdroutertest.com" +Device.MQTT.Client.1.ProtocolVersion "5.0" +Device.MQTT.Client.1.BrokerPort "8883" +Device.MQTT.Client.1.TransportProtocol "TLS" +Device.MQTT.Client.1.Username "qacafe" +Device.MQTT.Client.1.Password "qacafe123" +Device.MQTT.Client.1.Alias "cpe-1" +Device.MQTT.Client.1.Enable "true" +Device.MQTT.Client.1.ClientID "" +Device.MQTT.Client.1.KeepAliveTime "60" +Device.MQTT.Client.1.ConnectRetryTime "5" +Device.MQTT.Client.1.ConnectRetryIntervalMultiplier "2000" +Device.MQTT.Client.1.ConnectRetryMaxInterval "60" + +# For USP service +Device.UnixDomainSockets.UnixDomainSocket.1.Alias "cpe-1" +Device.UnixDomainSockets.UnixDomainSocket.1.Mode "Listen" +Device.UnixDomainSockets.UnixDomainSocket.1.Path "/var/run/usp/broker_controller_path" +Device.UnixDomainSockets.UnixDomainSocket.2.Alias "cpe-2" +Device.UnixDomainSockets.UnixDomainSocket.2.Mode "Listen" +Device.UnixDomainSockets.UnixDomainSocket.2.Path "/var/run/usp/broker_agent_path" + +# LocalAgent, UDS +Device.LocalAgent.MTP.2.Alias "cpe-2" +Device.LocalAgent.MTP.2.Protocol "UDS" +Device.LocalAgent.MTP.2.UDS.UnixDomainSocketRef "Device.UnixDomainSockets.UnixDomainSocket.2" +Device.LocalAgent.MTP.2.Enable "true" diff --git a/.gitlab/scripts/dut-init/obuspa_param_reset-ws.txt b/.gitlab/scripts/dut-init/obuspa_param_reset-ws.txt new file mode 100755 index 0000000000..a5688f66cd --- /dev/null +++ b/.gitlab/scripts/dut-init/obuspa_param_reset-ws.txt @@ -0,0 +1,64 @@ +########################################################################################################## +# +# This file contains a factory reset database in text format +# +# If no USP database exists when OB-USP-AGENT starts, then OB-USP-AGENT will create a database containing +# the parameters specified in a text file located by the '-r' option. +# Example: +# obuspa -p -v 4 -r factory_reset_example.txt +# +# Each line of this file contains either a comment (denoted by '#' at the start of the line) +# or a USP data model parameter and its factory reset value. +# The parameter and value are separated by whitespace. +# The value may optionally be enclosed in speech marks "" (this is the only way to specify an empty string) +# +########################################################################################################## + +Device.LocalAgent.EndpointID "proto::agent-id" +Device.LocalAgent.X_VANTIVA-COM_PreConnectTimeout "600" + + +################################### +# Controller 1 for CDRouter tests # +################################### + +Device.LocalAgent.Controller.1.EndpointID "proto::controller-id" +Device.LocalAgent.Controller.1.Alias "cpe-1" +Device.LocalAgent.Controller.1.Enable "true" +Device.LocalAgent.Controller.1.AssignedRole "Device.LocalAgent.ControllerTrust.Role.1" +Device.LocalAgent.Controller.1.PeriodicNotifInterval "86400" +Device.LocalAgent.Controller.1.PeriodicNotifTime "0001-01-01T00:00:00Z" +Device.LocalAgent.Controller.1.USPNotifRetryMinimumWaitInterval "5" +Device.LocalAgent.Controller.1.USPNotifRetryIntervalMultiplier "2000" +Device.LocalAgent.Controller.1.ControllerCode "" + +# Controller 1, MTP = Websocket +Device.LocalAgent.Controller.1.MTP.1.Alias "cpe-1" +Device.LocalAgent.Controller.1.MTP.1.Enable "true" +Device.LocalAgent.Controller.1.MTP.1.Protocol "WebSocket" +Device.LocalAgent.Controller.1.MTP.1.WebSocket.Host "controller.cdroutertest.com" +Device.LocalAgent.Controller.1.MTP.1.WebSocket.Port "443" +Device.LocalAgent.Controller.1.MTP.1.WebSocket.Path "/controller-path" +Device.LocalAgent.Controller.1.MTP.1.WebSocket.EnableEncryption "true" + +# LocalAgent, WebSocket +Device.LocalAgent.MTP.1.Alias "cpe-1" +Device.LocalAgent.MTP.1.Enable "true" +Device.LocalAgent.MTP.1.Protocol "WebSocket" +Device.LocalAgent.MTP.1.WebSocket.Path "/queue/agent-1" +Device.LocalAgent.MTP.1.WebSocket.Port "443" +Device.LocalAgent.MTP.1.WebSocket.EnableEncryption "true" + +# For USP service +Device.UnixDomainSockets.UnixDomainSocket.1.Alias "cpe-1" +Device.UnixDomainSockets.UnixDomainSocket.1.Mode "Listen" +Device.UnixDomainSockets.UnixDomainSocket.1.Path "/var/run/usp/broker_controller_path" +Device.UnixDomainSockets.UnixDomainSocket.2.Alias "cpe-2" +Device.UnixDomainSockets.UnixDomainSocket.2.Mode "Listen" +Device.UnixDomainSockets.UnixDomainSocket.2.Path "/var/run/usp/broker_agent_path" + +# LocalAgent, UDS +Device.LocalAgent.MTP.2.Alias "cpe-2" +Device.LocalAgent.MTP.2.Protocol "UDS" +Device.LocalAgent.MTP.2.UDS.UnixDomainSocketRef "Device.UnixDomainSockets.UnixDomainSocket.2" +Device.LocalAgent.MTP.2.Enable "true" diff --git a/.testbed/cdrouter/configurations/generic b/.testbed/cdrouter/configurations/generic index 3aede74229..d5c48e19cc 100644 --- a/.testbed/cdrouter/configurations/generic +++ b/.testbed/cdrouter/configurations/generic @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/generic-ipv6 b/.testbed/cdrouter/configurations/generic-ipv6 index e26ee94ca5..0270144d11 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6 +++ b/.testbed/cdrouter/configurations/generic-ipv6 @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/generic-ipv6-dslite b/.testbed/cdrouter/configurations/generic-ipv6-dslite index dadcc4f9a5..4c2b0cc001 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-dslite +++ b/.testbed/cdrouter/configurations/generic-ipv6-dslite @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/generic-ipv6-upnp b/.testbed/cdrouter/configurations/generic-ipv6-upnp index 5311dff9ca..189bf67b9f 100644 --- a/.testbed/cdrouter/configurations/generic-ipv6-upnp +++ b/.testbed/cdrouter/configurations/generic-ipv6-upnp @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/ppp b/.testbed/cdrouter/configurations/ppp index bd7669c418..4e7e84387c 100644 --- a/.testbed/cdrouter/configurations/ppp +++ b/.testbed/cdrouter/configurations/ppp @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/ppp-ipv6 b/.testbed/cdrouter/configurations/ppp-ipv6 index 2e7c3d7d0d..000932aa44 100644 --- a/.testbed/cdrouter/configurations/ppp-ipv6 +++ b/.testbed/cdrouter/configurations/ppp-ipv6 @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/prplos-certification b/.testbed/cdrouter/configurations/prplos-certification index 84bb65cb10..edefd4a1a0 100644 --- a/.testbed/cdrouter/configurations/prplos-certification +++ b/.testbed/cdrouter/configurations/prplos-certification @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/smoke-test b/.testbed/cdrouter/configurations/smoke-test index e3bb7fc0a9..fc98fc4947 100644 --- a/.testbed/cdrouter/configurations/smoke-test +++ b/.testbed/cdrouter/configurations/smoke-test @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/vlan b/.testbed/cdrouter/configurations/vlan index 1dea7f4491..46cee0cbf3 100644 --- a/.testbed/cdrouter/configurations/vlan +++ b/.testbed/cdrouter/configurations/vlan @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/vlan-ipv6 b/.testbed/cdrouter/configurations/vlan-ipv6 index ca59fc84fe..9d86d0b155 100644 --- a/.testbed/cdrouter/configurations/vlan-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ipv6 @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/vlan-ppp b/.testbed/cdrouter/configurations/vlan-ppp index 57aa69c70f..58a19a8239 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp +++ b/.testbed/cdrouter/configurations/vlan-ppp @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 index 2a74d98d6e..1b2c5cf952 100644 --- a/.testbed/cdrouter/configurations/vlan-ppp-ipv6 +++ b/.testbed/cdrouter/configurations/vlan-ppp-ipv6 @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem diff --git a/.testbed/cdrouter/configurations/wireless b/.testbed/cdrouter/configurations/wireless index 6fb8cd3ca7..43346b61ee 100644 --- a/.testbed/cdrouter/configurations/wireless +++ b/.testbed/cdrouter/configurations/wireless @@ -2505,16 +2505,16 @@ SECTION "CDRouter USP Add-On" { # testvar uspControllerUseNonPayloadProtection no # testvar uspControllerUseSessionContext no - testvar uspControllerMTP stomp - # testvar uspControllerMTPEncryption no + testvar uspControllerMTP @CDROUTER_CONFIG_USP_CONTROLLER_MTP@ + testvar uspControllerMTPEncryption @CDROUTER_CONFIG_USP_CONTROLLER_MTP_ENCRYPTION@ # testvar uspControllerUSPEncryption no - # testvar uspControllerDomain controller.cdroutertest.com + testvar uspControllerDomain @CDROUTER_CONFIG_USP_CONTROLLER_DOMAIN@ # testvar uspSegmentationEnable no # testvar uspSegmentationSize auto - # testvar uspControllerMTPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem - # testvar uspControllerMTPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem + testvar uspControllerMTPCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CERT_PATH@ + testvar uspControllerMTPCaCertPath @CDROUTER_CONFIG_USP_CONTROLLER_MTP_CA_CERT_PATH@ # testvar uspControllerUSPCaCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com-ca.pem # testvar uspControllerUSPCertPath /usr/cdrouter/tests/wildcard.cdroutertest.com.pem