From 259a3a6aaf2cb79effc0f6611b6e76abba742a0a Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Tue, 22 Mar 2016 16:26:20 +0100 Subject: [PATCH] Tidy updated test suites Change-Id: I8005dc69c8d07380bcdfefb832ebffb7c4d698e8 Signed-off-by: Jozef Behran --- csit/libraries/ClusterManagement.robot | 3 ++- csit/libraries/VtnMaKeywordsLi.robot | 12 ++++++------ csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot | 5 ++--- csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot index fbd3fbe656..ed3979a101 100644 --- a/csit/libraries/ClusterManagement.robot +++ b/csit/libraries/ClusterManagement.robot @@ -92,7 +92,8 @@ Get_Leader_And_Followers_For_Shard [Arguments] ${shard_name}=default ${shard_type}=operational ${validate}=True ${member_index_list}=${EMPTY} ${verify_restconf}=True [Documentation] Get role lists, validate there is one leader, return the leader and list of followers. ... Optionally, issue GET to a simple restconf URL to make sure subsequent operations will not encounter 503. - ${leader_list} ${follower_list} = Get_State_Info_For_Shard shard_name=${shard_name} shard_type=${shard_type} validate=True member_index_list=${member_index_list} verify_restconf=${verify_restconf} + ${leader_list} ${follower_list} = Get_State_Info_For_Shard shard_name=${shard_name} shard_type=${shard_type} validate=True member_index_list=${member_index_list} + ... verify_restconf=${verify_restconf} ${leader_count} = BuiltIn.Get_Length ${leader_list} BuiltIn.Run_Keyword_If ${leader_count} < 1 BuiltIn.Fail No leader found. BuiltIn.Length_Should_Be ${leader_list} ${1} Too many Leaders. diff --git a/csit/libraries/VtnMaKeywordsLi.robot b/csit/libraries/VtnMaKeywordsLi.robot index 473940a078..76a2a196a8 100644 --- a/csit/libraries/VtnMaKeywordsLi.robot +++ b/csit/libraries/VtnMaKeywordsLi.robot @@ -37,13 +37,13 @@ ${out_after_pathpolicy} output:3 *** Keywords *** Start SuiteVtnMa + [Arguments] ${version_flag}=none [Documentation] Start VTN Manager Init Test Suite - [Arguments] ${version_flag}=none Create Session session http://${ODL_SYSTEM_IP}:${RESTPORT} auth=${AUTH} headers=${HEADERS} BuiltIn.Wait_Until_Keyword_Succeeds 30 3 Fetch vtn list Start Suite - Run Keyword If '${version_flag}' == 'OF13' Set Global Variable ${OPENFLOW_VERSION} OF13 - ... ELSE Set Global Variable ${OPENFLOW_VERSION} OF10 + Run Keyword If '${version_flag}' == 'OF13' Set Global Variable ${OPENFLOW_VERSION} OF13 + ... ELSE Set Global Variable ${OPENFLOW_VERSION} OF10 Stop SuiteVtnMa [Documentation] Stop VTN Manager Test Suite @@ -59,7 +59,7 @@ Stop SuiteVtnMaTest Add Table Miss Flows [Documentation] Add Flow entried to handle table miss situation - Write dpctl add-flow priority=0,actions=output:CONTROLLER -OOpenFlow13 + Write dpctl add-flow priority=0,actions=output:CONTROLLER -OOpenFlow13 Read Until mininet> Fetch vtn list @@ -217,7 +217,7 @@ Add a vBridgeMacMapping Mininet Ping Should Succeed [Arguments] ${host1} ${host2} [Documentation] Ping hosts to check connectivity - Run Keyword If '${OPENFLOW_VERSION}' == 'OF13' Add Table Miss Flows + Run Keyword If '${OPENFLOW_VERSION}' == 'OF13' Add Table Miss Flows Write ${host1} ping -c 1 ${host2} ${result} Read Until mininet> Should Contain ${result} 64 bytes @@ -225,7 +225,7 @@ Mininet Ping Should Succeed Mininet Ping Should Not Succeed [Arguments] ${host1} ${host2} [Documentation] Ping hosts when there is no connectivity and check hosts is unreachable - Run Keyword If '${OPENFLOW_VERSION}' == 'OF13' Add Table Miss Flows + Run Keyword If '${OPENFLOW_VERSION}' == 'OF13' Add Table Miss Flows Write ${host1} ping -c 3 ${host2} ${result} Read Until mininet> Should Not Contain ${result} 64 bytes diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot index 298eec2b12..93d29a5678 100644 --- a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot +++ b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot @@ -10,7 +10,6 @@ Documentation Basic tests for iBGP peers. ... Test suite performs basic iBGP functional test case for ... carrying LSP State Information in BGP as described in ... http://tools.ietf.org/html/draft-ietf-idr-te-lsp-distribution-03 -... Suite Setup Setup_Everything Suite Teardown Teardown_Everything Test Setup SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing @@ -33,7 +32,7 @@ Resource ${CURDIR}/../../../libraries/WaitForFailure.robot *** Variables *** ${BGP_VARIABLES_FOLDER} ${CURDIR}/../../../variables/bgpuser/ -${COUNT} 1 +${COUNT} 1 ${HOLDTIME} 180 ${BGP_PEER_LOG_FILE} bgp_peer.log ${BGP_PEER_COMMAND} python play.py --amount ${COUNT} --myip=${TOOLS_SYSTEM_IP} --myport=${BGP_TOOL_PORT} --peerip=${ODL_SYSTEM_IP} --peerport=${ODL_BGP_PORT} --${BGP_PEER_LOG_LEVEL} --logfile ${BGP_PEER_LOG_FILE} --bgpls True @@ -46,8 +45,8 @@ ${CONTROLLER_BGP_LOG_LEVEL} DEFAULT *** Test Cases *** TC1_Configure_iBGP_Peer - [Tags] critical [Documentation] Configure BGP peer module with initiate-connection set to false. + [Tags] critical ${template_as_string}= BuiltIn.Set_Variable {'NAME': 'example-bgp-peer', 'IP': '${TOOLS_SYSTEM_IP}', 'HOLDTIME': '${HOLDTIME}', 'PEER_PORT': '${BGP_TOOL_PORT}', 'INITIATE': 'false'} ConfigViaRestconf.Put_Xml_Template_Folder_Config_Via_Restconf ${BGP_VARIABLES_FOLDER}${/}bgp_peer ${template_as_string} diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot index 0c7605d2ee..6c5d08c93a 100644 --- a/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot +++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/__init__.robot @@ -1,6 +1,6 @@ *** Settings *** Documentation Test suite for VTN Manager (OF13) -Suite Setup Start SuiteVtnMa version_flag=OF13 +Suite Setup Start SuiteVtnMa version_flag=OF13 Suite Teardown Stop SuiteVtnMa Resource ../../../libraries/VtnMaKeywordsLi.robot -- 2.36.6