From c9e14b80e7000bc6dfb732c1ad1c06d7567c506c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Tue, 19 Aug 2025 06:55:49 +0000 Subject: [PATCH] ci: cdrouter: provide configuration for prplOS Network Test Plan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to make sure, that prplWare passes prplOS Network Test Plan certification test suite and for that we need to configure CDRouter and DUT. CDRouter config changes in new prplos-certification config: * ipv6WanMode was changed from autoconf to DHCP * ipv6LanMode was changed from autoconf to DHCP DUTs are being dynamically configured with following datamodel configuration: * DHCPv6Client.Client.wan.RequestAddresses=1 so DUT requests IA_NA * RouterAdvertisement.InterfaceSetting.lan.AdvManagedFlag=1 so CDRouter can start DHCPv6 client - WARNING(lan): The Mbit in the last router advertisement is set to 0 indicating that DHCPv6 is not allowed - WARNING(lan): Cannot start DHCPv6 client References: PCF-1609 Signed-off-by: Petr Štetiar --- .gitlab/cdrouter/arcadyan-mozart.yml | 3 ++- .gitlab/cdrouter/mxl25641-hdk-6.yml | 3 ++- .gitlab/cdrouter/prpl-haze.yml | 3 ++- .gitlab/cdrouter/turris-omnia.yml | 3 ++- .gitlab/cdrouter/urx851-hdk-3.yml | 3 ++- .gitlab/cdrouter/wnc-freedom.yml | 3 ++- .../cdrouter-dut-configure-prplos-certification.sh | 5 +++++ .../cdrouter/configurations/prplos-certification | 14 +++++++------- 8 files changed, 24 insertions(+), 13 deletions(-) create mode 100755 .gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh diff --git a/.gitlab/cdrouter/arcadyan-mozart.yml b/.gitlab/cdrouter/arcadyan-mozart.yml index ae13c9b964..a621b3527f 100644 --- a/.gitlab/cdrouter/arcadyan-mozart.yml +++ b/.gitlab/cdrouter/arcadyan-mozart.yml @@ -145,7 +145,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 Mozart initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/cdrouter/mxl25641-hdk-6.yml b/.gitlab/cdrouter/mxl25641-hdk-6.yml index b60b34c88a..1a5b322ee5 100644 --- a/.gitlab/cdrouter/mxl25641-hdk-6.yml +++ b/.gitlab/cdrouter/mxl25641-hdk-6.yml @@ -144,7 +144,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 MXL25641-HDK-6 eMMC: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml index 48aba0aeed..51858bbe3c 100644 --- a/.gitlab/cdrouter/prpl-haze.yml +++ b/.gitlab/cdrouter/prpl-haze.yml @@ -147,7 +147,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 Haze initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml index c41a34b033..eff0b6dd73 100644 --- a/.gitlab/cdrouter/turris-omnia.yml +++ b/.gitlab/cdrouter/turris-omnia.yml @@ -148,7 +148,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 Turris initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/cdrouter/urx851-hdk-3.yml b/.gitlab/cdrouter/urx851-hdk-3.yml index b9f5c02b7f..3301b4249a 100644 --- a/.gitlab/cdrouter/urx851-hdk-3.yml +++ b/.gitlab/cdrouter/urx851-hdk-3.yml @@ -142,7 +142,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 URX851-HDK-3 eMMC: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml index b3dd63ce75..3642e47038 100644 --- a/.gitlab/cdrouter/wnc-freedom.yml +++ b/.gitlab/cdrouter/wnc-freedom.yml @@ -146,7 +146,8 @@ prplOS-Network-Test-Plan-Mandatory-v1.1.0 Freedom initramfs: when: never - when: manual variables: - CDROUTER_TEST_CONFIG: generic-ipv6 + 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 diff --git a/.gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh b/.gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh new file mode 100755 index 0000000000..5fa0d91ff6 --- /dev/null +++ b/.gitlab/scripts/dut-init/cdrouter-dut-configure-prplos-certification.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +ssh "root@$TARGET_LAN_IP" "ubus -t 200 wait_for DHCPv6Client RouterAdvertisement" +ssh "root@$TARGET_LAN_IP" "ba-cli 'DHCPv6Client.Client.wan.RequestAddresses=1'" +ssh "root@$TARGET_LAN_IP" "ba-cli 'RouterAdvertisement.InterfaceSetting.lan.AdvManagedFlag=1'" diff --git a/.testbed/cdrouter/configurations/prplos-certification b/.testbed/cdrouter/configurations/prplos-certification index 330ce5bbe9..528b0b23e0 100644 --- a/.testbed/cdrouter/configurations/prplos-certification +++ b/.testbed/cdrouter/configurations/prplos-certification @@ -1198,7 +1198,7 @@ SECTION "CDRouter IPv6 Add-On" { SECTION "IPv6 WAN" { - testvar ipv6WanMode autoconf + testvar ipv6WanMode DHCP # testvar ipv6PPPoEAddressMode DHCP # testvar ipv6WanIspIp 3001::1 # testvar ipv6WanIspAssignIp 3001::2 @@ -1291,7 +1291,7 @@ SECTION "CDRouter IPv6 Add-On" { SECTION "IPv6 LAN" { - # testvar ipv6LanMode autoconf + testvar ipv6LanMode DHCP testvar ipv6LanIp 3001:dddd::1 # testvar ipv6LanPrivacyAddresses no # testvar ipv6LanPrefixLen 64 @@ -2297,9 +2297,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "Basic ACS Configuration" { # testvar acsIp 6.0.0.1 - # testvar acsPort 80 + testvar acsPort 443 testvar acsDomain acs-download.qacafe.com - # testvar acsTransport http + testvar acsTransport https # testvar acsAuth digest # testvar acsDigestQopAuth yes # testvar acsInterface wan @@ -2352,9 +2352,9 @@ SECTION "CDRouter TR-069 Add-On" { SECTION "SSL Configuration" { - # testvar acsSslVersion tls - # testvar acsCertPath /usr/cdrouter/tests/acs.cdroutertest.com.pem - # testvar acsCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem + testvar acsSslVersion tlsv1_3 + testvar acsCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/server.pem + testvar acsCaCertPath /usr/cdrouter-data/prplos-ci/softhsm-ssl-certs/ca.crt # testvar acsDownloadCertPath /usr/cdrouter/tests/acs-download.cdroutertest.com.pem # testvar acsDownloadCaCertPath /usr/cdrouter/tests/acs.cdroutertest.com-ca.pem # testvar acsCipherSuite auto