Tidy updated test suites

Change-Id: I8005dc69c8d07380bcdfefb832ebffb7c4d698e8
Signed-off-by: Jozef Behran <jbehran@cisco.com>

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index fbd3fbe65652eb5ded172a7ff8f253d8221b5033..ed3979a101ea6bac3521d3c5e5dda2bdf0880e7c 100644 (file)
--- 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 473940a078e542d9c44e18f8d99b845a3655ba72..76a2a196a88df660dd77f7a821b7a3e1ce070a5e 100644 (file)
--- 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 298eec2b12b4b3c7a5addff145be1b891ffd74b5..93d29a56786387f232f5b18a603ee872a73d8e0b 100644 (file)
--- 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 0c7605d2eef8bfbfa5fb500f3150d5b883ef51a9..6c5d08c93ad3881d8a120589fff8b0a354b62a4b 100644 (file)
--- 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