updating netconf-scale suite not to use netconf connector in carbon

works together with https://git.opendaylight.org/gerrit/#/c/49301/

Change-Id: I462cf11fcab126bd54bb39c917f2e90f33767936
Signed-off-by: Peter Gubka <pgubka@cisco.com>

diff --git a/csit/libraries/RestPerfClient.robot b/csit/libraries/RestPerfClient.robot
index ca1d892d632fce49ce3bde469ae0de661bb12466..0bb873abd06cb590dea031fe821e0225f1facdf0 100644 (file)
--- a/csit/libraries/RestPerfClient.robot
+++ b/csit/libraries/RestPerfClient.robot
@@ -56,6 +56,7 @@ Restperfclient__Invoke_With_Timeout
     [Arguments]    ${timeout}    ${command}
     [Timeout]    ${timeout}
     Execute_Command_Passes    ${command} >${RestPerfClient__restperfclientlog} 2>&1
+    Execute_Command_Passes    cat ${RestPerfClient__restperfclientlog}
 
 Invoke_Restperfclient
     [Arguments]    ${timeout}    ${url}    ${testcase}=${EMPTY}    ${ip}=${ODL_SYSTEM_IP}    ${port}=${RESTCONFPORT}    ${count}=${REQUEST_COUNT}

diff --git a/csit/suites/netconf/restperfclient/mdsal.robot b/csit/suites/netconf/restperfclient/mdsal.robot
index 931e601f16cd0aef5870cf8ae3a1d35e9576dfdb..00c5725a44a09e00c785e5814102e58b4f0ec294 100644 (file)
--- a/csit/suites/netconf/restperfclient/mdsal.robot
+++ b/csit/suites/netconf/restperfclient/mdsal.robot
@@ -35,6 +35,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 ${DIRECTORY_WITH_TEMPLATE_FOLDERS}    ${CURDIR}/../../../variables/netconf/RestPerfClient
 ${REQUEST_COUNT}    65536
 ${device_type}    default
+${test_device}    odl-mdsal-northbound-via-netconf-connector
 
 *** Test Cases ***
 Create_Test_Data_For_Direct_Access
@@ -72,12 +73,12 @@ 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_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
+    NetconfKeywords.Configure_Device_In_Netconf    ${test_device}    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    ${test_device}
 
 Run_RestPerfClient_Through_Netconf_Connector
-    [Documentation]    Ask RestPerfClient to send the requests to the MDSAL mapped via a netconf connector.
-    ${url}=    BuiltIn.Set_Variable    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/odl-mdsal-northbound-via-netconf-connector/yang-ext:mount/car:cars
+    [Documentation]    Ask RestPerfClient to send the requests to the MDSAL mapped via netconf topology device.
+    ${url}=    BuiltIn.Set_Variable    /restconf/config/network-topology:network-topology/topology/topology-netconf/node/${test_device}/yang-ext:mount/car:cars
     RestPerfClient.Invoke_Restperfclient    ${NETCONF_CONNECTOR_MDSAL_TIMEOUT}    ${url}    testcase=netconf-connector
 
 Check_For_Failed_Netconf_Connector_Requests
@@ -98,7 +99,7 @@ Check_For_Failed_Netconf_Connector_Requests
 Deconfigure_ODL_From_Netconf
     [Documentation]    Deconfigure the ODL MDSAL Northbound attached to a Netconf connector.
     [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    NetconfKeywords.Remove_Device_From_Netconf    odl-mdsal-northbound-via-netconf-connector
+    NetconfKeywords.Remove_Device_From_Netconf    ${test_device}
 
 Cleanup_And_Collect_For_Connector_Access
     [Documentation]    Delete the test data produced by the Netconf connector MDSAL access.

diff --git a/csit/suites/netconf/restperfclient/performance.robot b/csit/suites/netconf/restperfclient/performance.robot
index 6105b51c6b589bebfe5c0759201cb83f0da4d5df..3300375db654b75dd82d67eca522a21b916b48ac 100644 (file)
--- a/csit/suites/netconf/restperfclient/performance.robot
+++ b/csit/suites/netconf/restperfclient/performance.robot
@@ -37,7 +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
+${device_type}    full-uri-device
 
 *** Test Cases ***
 Start_Testtool
@@ -95,6 +95,8 @@ Setup_Everything
     # Connect to the tools system (testtool)
     ${testtool}=    SSHKeywords.Open_Connection_To_Tools_System
     BuiltIn.Set_Suite_Variable    ${testtool}    ${testtool}
+    ${device_type}=    BuiltIn.Set_Variable_If    ${USE_NETCONF_CONNECTOR}==${True}    default    ${device_type}
+    BuiltIn.Set_Suite_Variable    ${device_type}
 
 Teardown_Everything
     [Documentation]    Teardown the test infrastructure, perform cleanup and release all resources.

diff --git a/csit/suites/netconf/scale/getmulti.robot b/csit/suites/netconf/scale/getmulti.robot
index faff21a20d9668baf97a4ce6c75506cbc1a99509..792b0e0373f137214fb8a20cee5fb0138d1c8d84 100644 (file)
--- a/csit/suites/netconf/scale/getmulti.robot
+++ b/csit/suites/netconf/scale/getmulti.robot
@@ -32,7 +32,7 @@ ${DEVICE_COUNT}    500
 ${WORKER_COUNT}    10
 ${TIMEOUT_FACTOR}    10
 ${device_name_base}    netconf-scaling-device
-${device_type}    default
+${device_type}    full-uri-device
 ${base_port}      17830
 
 *** Test Cases ***
@@ -84,6 +84,8 @@ Setup_Everything
     # Deploy testing tools.
     SSHLibrary.Put_File    ${CURDIR}/../../../../tools/netconf_tools/getter.py
     SSHLibrary.Put_File    ${CURDIR}/../../../libraries/AuthStandalone.py
+    ${device_type}=    BuiltIn.Set_Variable_If    ${USE_NETCONF_CONNECTOR}==${True}    default    ${device_type}
+    BuiltIn.Set_Suite_Variable    ${device_type}
 
 Teardown_Everything
     [Documentation]    Teardown the test infrastructure, perform cleanup and release all resources.

diff --git a/csit/suites/netconf/scale/getsingle.robot b/csit/suites/netconf/scale/getsingle.robot
index ae4746845efb2e9fc7369ef051d40c246b9e60e8..bd8b78c9fd86c623bcb6e0fc986e70a0d9c6f571 100644 (file)
--- a/csit/suites/netconf/scale/getsingle.robot
+++ b/csit/suites/netconf/scale/getsingle.robot
@@ -26,7 +26,7 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 *** Variables ***
 ${DEVICE_COUNT}    500
 ${TIMEOUT_FACTOR}    10
-${device_type}    default
+${device_type}    full-uri-device
 
 *** Test Cases ***
 Start_Test_Tool
@@ -61,6 +61,8 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords
     KarafKeywords.Configure_Timeout_For_Karaf_Console    120s
+    ${device_type}=    BuiltIn.Set_Variable_If    ${USE_NETCONF_CONNECTOR}==${True}    default    ${device_type}
+    BuiltIn.Set_Suite_Variable    ${device_type}
 
 Teardown_Everything
     [Documentation]    Teardown the test infrastructure, perform cleanup and release all resources.