Add variable to select configure netconf device method

Default is still config system but this would allow to test using
the topology API.

Change-Id: Iae445dd44427f36568c7018683f26a3a482890b7
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/csit/suites/netconf/CRUD/CRUD.robot b/csit/suites/netconf/CRUD/CRUD.robot
index 470e8f4457da513ef705f83e8e914f6f29fdb037..c7b2ff27883c0d94f1c56513a56f2ac5cc614570 100644 (file)
--- a/csit/suites/netconf/CRUD/CRUD.robot
+++ b/csit/suites/netconf/CRUD/CRUD.robot
@@ -34,6 +34,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 *** Variables ***
 ${directory_with_template_folders}    ${CURDIR}/../../../variables/netconf/CRUD
 ${device_name}    netconf-test-device
+${device_type}    default
 
 *** Test Cases ***
 Start_Testtool
@@ -48,7 +49,7 @@ Check_Device_Is_Not_Configured_At_Beginning
 Configure_Device_On_Netconf
     [Documentation]    Make request to configure a testtool device on Netconf connector.
     [Tags]    critical
-    NetconfKeywords.Configure_Device_In_Netconf    ${device_name}
+    NetconfKeywords.Configure_Device_In_Netconf    ${device_name}    device_type=${device_type}
 
 Check_ODL_Has_Netconf_Connector_For_Device
     [Documentation]    Get the list of configured devices and search for our device there. Fail if not found.
@@ -99,7 +100,7 @@ Configure_The_Device_Back
     [Documentation]    Configure the device again.
     ...    This is the second step of the device configuration.
     [Tags]    critical
-    NetconfKeywords.Configure_Device_In_Netconf    ${device_name}
+    NetconfKeywords.Configure_Device_In_Netconf    ${device_name}    device_type=${device_type}
 
 Wait_For_Device_To_Reconnect
     [Documentation]    Wait until the device becomes available through Netconf.

diff --git a/csit/suites/netconf/restperfclient/mdsal.robot b/csit/suites/netconf/restperfclient/mdsal.robot
index 5574fbd7a27eb19d82c7f10a96310f1a5bfb114e..931e601f16cd0aef5870cf8ae3a1d35e9576dfdb 100644 (file)
--- a/csit/suites/netconf/restperfclient/mdsal.robot
+++ b/csit/suites/netconf/restperfclient/mdsal.robot
@@ -34,6 +34,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 *** Variables ***
 ${DIRECTORY_WITH_TEMPLATE_FOLDERS}    ${CURDIR}/../../../variables/netconf/RestPerfClient
 ${REQUEST_COUNT}    65536
+${device_type}    default
 
 *** Test Cases ***
 Create_Test_Data_For_Direct_Access
@@ -71,7 +72,7 @@ Create_Test_Data_For_Connector_Access
 
 Configure_ODL_As_A_Device_On_Netconf
     [Documentation]    Configure ODL MDSAL Northbound as a Netconf device on a Netconf connector.
-    NetconfKeywords.Configure_Device_In_Netconf    odl-mdsal-northbound-via-netconf-connector    device_address=${ODL_SYSTEM_IP}    device_port=${ODL_NETCONF_MDSAL_PORT}    device_user=${ODL_NETCONF_USER}    device_password=${ODL_NETCONF_PASSWORD}
+    NetconfKeywords.Configure_Device_In_Netconf    odl-mdsal-northbound-via-netconf-connector    device_type=${device_type}    device_address=${ODL_SYSTEM_IP}    device_port=${ODL_NETCONF_MDSAL_PORT}    device_user=${ODL_NETCONF_USER}    device_password=${ODL_NETCONF_PASSWORD}
     NetconfKeywords.Wait_Device_Connected    odl-mdsal-northbound-via-netconf-connector
 
 Run_RestPerfClient_Through_Netconf_Connector

diff --git a/csit/suites/netconf/restperfclient/performance.robot b/csit/suites/netconf/restperfclient/performance.robot
index 115b3a582cf7d4c6f944ca3b95f3edf7eae74180..6105b51c6b589bebfe5c0759201cb83f0da4d5df 100644 (file)
--- a/csit/suites/netconf/restperfclient/performance.robot
+++ b/csit/suites/netconf/restperfclient/performance.robot
@@ -37,6 +37,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 ${DEVICE_NAME}    ${FIRST_TESTTOOL_PORT}-sim-device
 ${REQUEST_COUNT}    65536
 ${directory_with_crud_templates}    ${CURDIR}/../../../variables/netconf/CRUD
+${device_type}    default
 
 *** Test Cases ***
 Start_Testtool
@@ -47,7 +48,7 @@ Start_Testtool
 
 Configure_Device_On_Netconf
     [Documentation]    Configure the testtool device on Netconf connector.
-    NetconfKeywords.Configure_Device_In_Netconf    ${DEVICE_NAME}
+    NetconfKeywords.Configure_Device_In_Netconf    ${DEVICE_NAME}    device_type=${device_type}
 
 Wait_For_Device_To_Become_Connected
     [Documentation]    Wait until the device becomes available through Netconf.

diff --git a/csit/suites/netconf/scale/getmulti.robot b/csit/suites/netconf/scale/getmulti.robot
index f5bedb0589276462aaf951a27a72235d5f2d7fbc..faff21a20d9668baf97a4ce6c75506cbc1a99509 100644 (file)
--- a/csit/suites/netconf/scale/getmulti.robot
+++ b/csit/suites/netconf/scale/getmulti.robot
@@ -32,6 +32,7 @@ ${DEVICE_COUNT}    500
 ${WORKER_COUNT}    10
 ${TIMEOUT_FACTOR}    10
 ${device_name_base}    netconf-scaling-device
+${device_type}    default
 ${base_port}      17830
 
 *** Test Cases ***
@@ -93,7 +94,7 @@ Configure_Device
     [Arguments]    ${current_name}
     [Documentation]    Operation for configuring the device.
     KarafKeywords.Log_Message_To_Controller_Karaf    Configuring device ${current_name} to Netconf
-    NetconfKeywords.Configure_Device_In_Netconf    ${current_name}    device_port=${current_port}
+    NetconfKeywords.Configure_Device_In_Netconf    ${current_name}    device_type=${device_type}    device_port=${current_port}
     KarafKeywords.Log_Message_To_Controller_Karaf    Device ${current_name} configured
 
 Wait_Connected

diff --git a/csit/suites/netconf/scale/getsingle.robot b/csit/suites/netconf/scale/getsingle.robot
index 68e41d1db96ff53a4eb93b539f2b15229759d978..ae4746845efb2e9fc7369ef051d40c246b9e60e8 100644 (file)
--- a/csit/suites/netconf/scale/getsingle.robot
+++ b/csit/suites/netconf/scale/getsingle.robot
@@ -26,6 +26,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 *** Variables ***
 ${DEVICE_COUNT}    500
 ${TIMEOUT_FACTOR}    10
+${device_type}    default
 
 *** Test Cases ***
 Start_Test_Tool
@@ -70,7 +71,7 @@ Configure_Device
     [Arguments]    ${current_name}
     [Documentation]    Operation for configuring the device in the Netconf subsystem and connecting to it.
     KarafKeywords.Log_Message_To_Controller_Karaf    Connecting device ${current_name}
-    NetconfKeywords.Configure_Device_In_Netconf    ${current_name}    device_port=${current_port}
+    NetconfKeywords.Configure_Device_In_Netconf    ${current_name}    device_type=${device_type}    device_port=${current_port}
     KarafKeywords.Log_Message_To_Controller_Karaf    Waiting for device ${current_name} to connect
     NetconfKeywords.Wait_Device_Connected    ${current_name}    period=0.5s
     KarafKeywords.Log_Message_To_Controller_Karaf    Device ${current_name} connected