From 1bce70eddfe28e6309cf3c80e47277dd995d3354 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Mon, 22 Feb 2016 14:38:07 +0100 Subject: [PATCH] Fix netconf port variables There are two netconf ports in ODL, one is MDSAL and the other one is the config subsystem. However there was only one Netconf port variable, confusingly named ODL_NETCONF_PORT which pointed to the MDSAL port. Fix that by putting the name of the subsystem behind the port into the name of the variable and also create the other variable which for some reason was still missing. Change-Id: I526f1a314a7a3b1414f333f9b161f146e5e88d87 Signed-off-by: Jozef Behran --- csit/suites/netconf/MDSAL/northbound.robot | 2 +- csit/variables/Variables.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/csit/suites/netconf/MDSAL/northbound.robot b/csit/suites/netconf/MDSAL/northbound.robot index e3dc825470..df30cb6ea2 100644 --- a/csit/suites/netconf/MDSAL/northbound.robot +++ b/csit/suites/netconf/MDSAL/northbound.robot @@ -306,7 +306,7 @@ Get_Data [Return] ${data} Create_ODL_Netconf_Connection - [Arguments] ${host}=${CONTROLLER} ${port}=${ODL_NETCONF_PORT} ${user}=${ODL_NETCONF_USER} ${password}=${ODL_NETCONF_PASSWORD} + [Arguments] ${host}=${CONTROLLER} ${port}=${ODL_NETCONF_MDSAL_PORT} ${user}=${ODL_NETCONF_USER} ${password}=${ODL_NETCONF_PASSWORD} [Documentation] Open a netconf connecion to the given machine. # The "-s netconf" flag (see the "SSHLibrary.Write" line below) is not # supported by SSHLibrary, therefore we need to use this elaborate and diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py index 5ccea6037e..f33a790dd9 100644 --- a/csit/variables/Variables.py +++ b/csit/variables/Variables.py @@ -48,7 +48,8 @@ ODL_RESTCONF_USER = 'admin' ODL_RESTCONF_PASSWORD = 'admin' # Netconf variables -ODL_NETCONF_PORT = '2830' +ODL_NETCONF_CONFIG_PORT = '1830' +ODL_NETCONF_MDSAL_PORT = '2830' ODL_NETCONF_USER = 'admin' ODL_NETCONF_PASSWORD = 'admin' ODL_NETCONF_PROMPT = ']]>]]>' -- 2.36.6