From 4b2f0074adbfe9816444cafb6476e2ea7ef634f4 Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Tue, 7 Dec 2021 20:46:52 +0100 Subject: [PATCH] Use call-home SSH port 4334 Adapt tests for change in NETCONF 3.x branch for Sulfur release stream. Starting with Sulfur release we use 4334 port for NETCONF call-home SSH instead of 6666. For simplicity configure all docker placeholders (SSH + TLS) from NetconfCallHome.robot file. JIRA: NETCONF-846 Change-Id: If4e95c26adae57425005859578a69f468d545373 Signed-off-by: Ivan Hrasko --- csit/libraries/NetconfCallHome.robot | 3 +++ csit/variables/netconf/callhome/docker-compose.yaml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/csit/libraries/NetconfCallHome.robot b/csit/libraries/NetconfCallHome.robot index d18568d70b..48233be4f0 100644 --- a/csit/libraries/NetconfCallHome.robot +++ b/csit/libraries/NetconfCallHome.robot @@ -185,6 +185,9 @@ Suite Setup SSHLibrary.Put File ${CURDIR}/../variables/netconf/callhome/docker-compose.yaml . SSHLibrary.Put File ${CURDIR}/../variables/netconf/callhome/init_configuration.sh . SSHLibrary.Execute_Command sed -i -e 's/ODL_SYSTEM_IP/${ODL_SYSTEM_IP}/g' docker-compose.yaml + ${netconf_cl_ssh_port} Set_Variable_If_At_Least_Sulfur 4334 6666 + SSHLibrary.Execute_Command sed -i -e 's/NETCONF_CH_SSH/${netconf_cl_ssh_port}/g' docker-compose.yaml + SSHLibrary.Execute_Command sed -i -e 's/NETCONF_CH_TLS/4335/g' docker-compose.yaml ${netconf_mount_expected_values} Create list ${substring1} ${substring2} ${substring3} Set Suite Variable ${netconf_mount_expected_values} Set Suite Variable ${CREATE_SSH_DEVICE_REQ_V1} ${CURDIR}/../variables/netconf/callhome/json/apiv1/create_device.json diff --git a/csit/variables/netconf/callhome/docker-compose.yaml b/csit/variables/netconf/callhome/docker-compose.yaml index 00e6c97e9b..47c7ca6fa9 100644 --- a/csit/variables/netconf/callhome/docker-compose.yaml +++ b/csit/variables/netconf/callhome/docker-compose.yaml @@ -6,8 +6,8 @@ netopeer2-server: exec netopeer2-server -d -v3" environment: - CALL_HOME_SERVER_IP=ODL_SYSTEM_IP - - CALL_HOME_SSH_PORT=6666 - - CALL_HOME_TLS_PORT=4335 + - CALL_HOME_SSH_PORT=NETCONF_CH_SSH + - CALL_HOME_TLS_PORT=NETCONF_CH_TLS volumes: - ./configuration-files:/root/configuration-files - ./init_configuration.sh:/root/init_configuration.sh -- 2.36.6