Additional Test for varying afi-safis

[integration/test.git] / csit / suites / netconf / restperfclient / mdsal.robot

diff --git a/csit/suites/netconf/restperfclient/mdsal.robot b/csit/suites/netconf/restperfclient/mdsal.robot
index 931e601f16cd0aef5870cf8ae3a1d35e9576dfdb..150ba5c89896da9e818b7c21d5b529b77f7c4489 100644 (file)
--- a/csit/suites/netconf/restperfclient/mdsal.robot
+++ b/csit/suites/netconf/restperfclient/mdsal.robot
@@ -1,13 +1,13 @@
 *** Settings ***
 Documentation     netconf-restperfclient MDSAL performance test suite.
-...
+...           
 ...               Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved.
-...
+...           
 ...               This program and the accompanying materials are made available under the
 ...               terms of the Eclipse Public License v1.0 which accompanies this distribution,
 ...               and is available at http://www.eclipse.org/legal/epl-v10.html
-...
-...
+...           
+...           
 ...               Perform given count of update operations on ODL MDSAL. In first half the
 ...               requests are directed directly to MDSAL via Restconf and in the second
 ...               half the MDSAL is mounted onto a netconf connector and the reqursts are
@@ -33,8 +33,9 @@ Variables         ${CURDIR}/../../../variables/Variables.py
 
 *** Variables ***
 ${DIRECTORY_WITH_TEMPLATE_FOLDERS}    ${CURDIR}/../../../variables/netconf/RestPerfClient
-${REQUEST_COUNT}    65536
-${device_type}    default
+${REQUEST_COUNT}    16384
+${device_type}    full-uri-device
+${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.
@@ -113,10 +114,12 @@ Setup_Everything
     SetupUtils.Setup_Utils_For_Setup_And_Teardown
     NetconfKeywords.Setup_Netconf_Keywords
     RestPerfClient.Setup_Restperfclient
+    ${device_type}=    BuiltIn.Set_Variable_If    ${USE_NETCONF_CONNECTOR}==${True}    default    ${device_type}
+    BuiltIn.Set_Suite_Variable    ${device_type}
     # Calculate timeouts
     ${value}=    BuiltIn.Evaluate    ${REQUEST_COUNT}/50+10
     Utils.Set_User_Configurable_Variable_Default    DIRECT_MDSAL_TIMEOUT    ${value} s
-    ${value}=    BuiltIn.Evaluate    ${REQUEST_COUNT}/10+10
+    ${value}=    BuiltIn.Evaluate    ${REQUEST_COUNT}/10+20
     Utils.Set_User_Configurable_Variable_Default    NETCONF_CONNECTOR_MDSAL_TIMEOUT    ${value} s
 
 Teardown_Everything