Update Robot Framework format - step 4

Robotidy has stricter formatting rules for line width, alignment,
section ordering & spacing, etc.

Update the format of Robot Framework files in the following directory
with Robotidy:

- csit/suites/bier
- csit/suites/capwap
- csit/suites/cardinal
- csit/suites/centinel

JIRA: INTTEST-132
Change-Id: I3296eb336d9473a2d86437461e65035787bd57ae
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/csit/suites/bier/basic/010_BierTeIntergrationTest.robot b/csit/suites/bier/basic/010_BierTeIntergrationTest.robot
index 0792636bc30699599c1da2b499b100364c41328a..dea8044c8be41d608e9e5f66f5574020d15c795e 100644 (file)
--- a/csit/suites/bier/basic/010_BierTeIntergrationTest.robot
+++ b/csit/suites/bier/basic/010_BierTeIntergrationTest.robot
@@ -1,132 +1,224 @@
 *** Settings ***
-Documentation     Basic tests for BIER information configuration and verification.
-...               Copyright (c) 2016-2017 Zte, Inc. and others. All rights reserved.
-...               Test suite performs basic BIER information configuration and verification test cases for topology domain, subdomain, node and channel as follows:
-...               Test Case 1: Query the topology, node and check their existence
-...               Expected result: Exist a topology which topologyId is example-linkstate-topology and five nodes inside it
-...               Test Case 2: Configure domain with add and delete operation
-...               Expected result: The Configure result with corresponding operation verified as expected
-...               Test Case 3: Configure subdomain with add and delete operation
-...               Expected result: The Configure result with corresponding operation verified as expected
-...               Test Case 4: Configure bier node params with add, modify and delete operation
-...               Expected result: The Configure result with corresponding operation verified as expected
-...               Test Case 5: Configure bier-te node params with add, modify and delete operation
-...               Expected result: The Configure result with corresponding operation verified as expected
-...               Test Case 6: Configure channel with add, modify, deploy and delete operation
-...               Expected result: The Configure result with corresponding operation verified as expected
-Suite Setup       Init All
-Suite Teardown    Delete All Sessions
-Resource          ../../../libraries/BierTeResource.robot
-Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../variables/Variables.robot
-Library           RequestsLibrary
+Documentation       Basic tests for BIER information configuration and verification.
+...                 Copyright (c) 2016-2017 Zte, Inc. and others. All rights reserved.
+...                 Test suite performs basic BIER information configuration and verification test cases for topology domain, subdomain, node and channel as follows:
+...                 Test Case 1: Query the topology, node and check their existence
+...                 Expected result: Exist a topology which topologyId is example-linkstate-topology and five nodes inside it
+...                 Test Case 2: Configure domain with add and delete operation
+...                 Expected result: The Configure result with corresponding operation verified as expected
+...                 Test Case 3: Configure subdomain with add and delete operation
+...                 Expected result: The Configure result with corresponding operation verified as expected
+...                 Test Case 4: Configure bier node params with add, modify and delete operation
+...                 Expected result: The Configure result with corresponding operation verified as expected
+...                 Test Case 5: Configure bier-te node params with add, modify and delete operation
+...                 Expected result: The Configure result with corresponding operation verified as expected
+...                 Test Case 6: Configure channel with add, modify, deploy and delete operation
+...                 Expected result: The Configure result with corresponding operation verified as expected
+
+Resource            ../../../libraries/BierTeResource.robot
+Resource            ../../../libraries/TemplatedRequests.robot
+Resource            ../../../variables/Variables.robot
+Library             RequestsLibrary
+
+Suite Setup         Init All
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-@{NODE_ID_LIST}    1111.1111.1111    1111.1111.1122    1111.1111.1133    1111.1111.1144    1111.1111.1155
-${TOPOLOGY_ID}    example-linkstate-topology
-@{DOMAIN_ID_LIST}    ${1}    ${2}
-@{SUBDOMAIN_ID_LIST}    ${1}    ${2}
-@{BFR_ID_LIST}    ${1}    ${2}    ${3}    ${4}    ${5}
-@{TE_LABEL_BASE_LIST}    ${1100}    ${2200}    ${3300}    ${4400}    ${5500}
-${TE_LABEL_RANGE_SIZE}    ${100}
-@{TP_ID_LIST_OF_NODE1}    fei-0/1/0/4    fei-0/1/0/1    fei-0/1/0/7    atm135-0/1/2/2
-@{BP_LIST_OF_NODE1}    1    2    3    4
-@{TP_ID_LIST_OF_NODE2}    fei-0/1/0/1    atm155-0/1/2/1    fei-0/1/0/6
-@{BP_LIST_OF_NODE2}    5    6    15
-@{TP_ID_LIST_OF_NODE3}    fei-0/1/0/4    fei-0/1/0/5    pos192-0/1/0/3
-@{BP_LIST_OF_NODE3}    7    8    9
-@{TP_ID_LIST_OF_NODE4}    fei-0/1/0/5    spi-0/1/0/4    fei-0/1/0/6
-@{BP_LIST_OF_NODE4}    10    11    14
-&{NODE_TO_TP_ID_LIST}    1111.1111.1111=${TP_ID_LIST_OF_NODE1}    1111.1111.1122=${TP_ID_LIST_OF_NODE2}    1111.1111.1133=${TP_ID_LIST_OF_NODE3}    1111.1111.1144=${TP_ID_LIST_OF_NODE4}
-&{NODE_TO_BP_LIST}    1111.1111.1111=${BP_LIST_OF_NODE1}    1111.1111.1122=${BP_LIST_OF_NODE2}    1111.1111.1133=${BP_LIST_OF_NODE3}    1111.1111.1144=${BP_LIST_OF_NODE4}
-@{CHANNEL_NAME_LIST}    channel1    channel2    channel3
-@{SRC_IP_LIST}    1.1.1.1    2.2.2.2    3.3.3.3
-@{DST_GROUP_LIST}    239.1.1.1    239.2.2.2    239.3.3.3
+@{NODE_ID_LIST}             1111.1111.1111    1111.1111.1122    1111.1111.1133    1111.1111.1144    1111.1111.1155
+${TOPOLOGY_ID}              example-linkstate-topology
+@{DOMAIN_ID_LIST}           ${1}    ${2}
+@{SUBDOMAIN_ID_LIST}        ${1}    ${2}
+@{BFR_ID_LIST}              ${1}    ${2}    ${3}    ${4}    ${5}
+@{TE_LABEL_BASE_LIST}       ${1100}    ${2200}    ${3300}    ${4400}    ${5500}
+${TE_LABEL_RANGE_SIZE}      ${100}
+@{TP_ID_LIST_OF_NODE1}      fei-0/1/0/4    fei-0/1/0/1    fei-0/1/0/7    atm135-0/1/2/2
+@{BP_LIST_OF_NODE1}         1    2    3    4
+@{TP_ID_LIST_OF_NODE2}      fei-0/1/0/1    atm155-0/1/2/1    fei-0/1/0/6
+@{BP_LIST_OF_NODE2}         5    6    15
+@{TP_ID_LIST_OF_NODE3}      fei-0/1/0/4    fei-0/1/0/5    pos192-0/1/0/3
+@{BP_LIST_OF_NODE3}         7    8    9
+@{TP_ID_LIST_OF_NODE4}      fei-0/1/0/5    spi-0/1/0/4    fei-0/1/0/6
+@{BP_LIST_OF_NODE4}         10    11    14
+&{NODE_TO_TP_ID_LIST}
+...                         1111.1111.1111=${TP_ID_LIST_OF_NODE1}
+...                         1111.1111.1122=${TP_ID_LIST_OF_NODE2}
+...                         1111.1111.1133=${TP_ID_LIST_OF_NODE3}
+...                         1111.1111.1144=${TP_ID_LIST_OF_NODE4}
+&{NODE_TO_BP_LIST}
+...                         1111.1111.1111=${BP_LIST_OF_NODE1}
+...                         1111.1111.1122=${BP_LIST_OF_NODE2}
+...                         1111.1111.1133=${BP_LIST_OF_NODE3}
+...                         1111.1111.1144=${BP_LIST_OF_NODE4}
+@{CHANNEL_NAME_LIST}        channel1    channel2    channel3
+@{SRC_IP_LIST}              1.1.1.1    2.2.2.2    3.3.3.3
+@{DST_GROUP_LIST}           239.1.1.1    239.2.2.2    239.3.3.3
+
 
 *** Test Cases ***
 TC1_Load Topology
     [Documentation]    Verify the topology has been succesfully put into the datastore by querying nodes and topology names.
     Wait Until Keyword Succeeds    30s    2s    Node Online
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/load_topology    {}    session    True
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/load_topology
+    ...    {}
+    ...    session
+    ...    True
 
 TC1_Query Link
     [Documentation]    Query the all links in the bier topology.
     ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_link    ${mapping1}    session    True
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_link
+    ...    ${mapping1}
+    ...    session
+    ...    True
 
 TC2_Configure Domain
     [Documentation]    Configure two BIER domains with domain id list ${DOMAIN_ID_LIST}.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID1=${DOMAIN_ID_LIST[0]}    DOMAINID2=${DOMAIN_ID_LIST[1]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/configure_domain    ${mapping1}    session
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID1=${DOMAIN_ID_LIST[0]}
+    ...    DOMAINID2=${DOMAIN_ID_LIST[1]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/configure_domain
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC2_Delete Domain
     [Documentation]    Delete the second domain created in the testcase TC2_Configure Domain.
     ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[1]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/delete_domain    ${mapping1}    session
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/delete_domain
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC2_Query Domain
     [Documentation]    Query the domains created in the datastore.
     ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/query_domain    ${mapping1}    session    True
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/query_domain
+    ...    ${mapping1}
+    ...    session
+    ...    True
 
 TC3_Configure Subdomain
     [Documentation]    Configure two subdomains with subdomain list ${SUBDOMAIN_ID_LIST}.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAIN1=${SUBDOMAIN_ID_LIST[0]}    SUBDOMAIN2=${SUBDOMAIN_ID_LIST[1]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/configure_subdomain    ${mapping1}    session
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAIN1=${SUBDOMAIN_ID_LIST[0]}
+    ...    SUBDOMAIN2=${SUBDOMAIN_ID_LIST[1]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/configure_subdomain
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC3_Delete Subdomain
     [Documentation]    Delete the second subdomain created in TC3_Configure Subdomain.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[1]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/delete_subdomain    ${mapping1}    session
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[1]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/delete_subdomain
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC3_Query Subdomain
     [Documentation]    Query the subdomains in the datastore.
     ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/query_subdomain    ${mapping1}    session    True
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_domain_configuration/query_subdomain
+    ...    ${mapping1}
+    ...    session
+    ...    True
 
 TC4_Configure Node
     [Documentation]    Configure the bier params of nodes in the bier network topology.
     FOR    ${i}    IN RANGE    len(${NODE_ID_LIST})
         ${domain-bfr-id}    Get From List    ${BFR_ID_LIST}    ${i}
         ${node-id}    Get From List    ${NODE_ID_LIST}    ${i}
-        ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${node-id}    DOMAINID=${DOMAIN_ID_LIST[0]}    DOMAINBFRID=${domain-bfr-id}
-        ...    SUBDOMAINBFRID=${domain-bfr-id}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-        ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_node    ${mapping1}    session
+        ${mapping1}    Create Dictionary
+        ...    TOPOLOGYID=${TOPOLOGY_ID}
+        ...    NODEID=${node-id}
+        ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+        ...    DOMAINBFRID=${domain-bfr-id}
+        ...    SUBDOMAINBFRID=${domain-bfr-id}
+        ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+        ${resp}    TemplatedRequests.Post_As_Json_Templated
+        ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_node
+        ...    ${mapping1}
+        ...    session
         Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
     END
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_node    {}    session
-    Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_node    config_node_response
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_node
+    ...    {}
+    ...    session
+    Verify_Response_As_Json_Templated
+    ...    ${resp}
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_node
+    ...    config_node_response
 
 TC4_Delete Node
     [Documentation]    Configure the bier params of one node in the bier network topology and then delete it.
     ${node-id}    Get From List    ${NODE_ID_LIST}    ${3}
-    ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    NODEID=${node-id}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_node    ${mapping}    session
+    ${mapping}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    NODEID=${node-id}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_node
+    ...    ${mapping}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC4_Delete IPV4
     [Documentation]    Configure the bier params of one node in the bier network topology and delete the ipv4 parameter of it.
     ${node-id}    Get From List    ${NODE_ID_LIST}    ${4}
-    ${mapping}    Create Dictionary    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    NODEID=${node-id}    TOPOLOGYID=${TOPOLOGY_ID}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_ipv4    ${mapping}    session
+    ${mapping}    Create Dictionary
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    NODEID=${node-id}
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_ipv4
+    ...    ${mapping}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC4_Query Subdomain Link
     [Documentation]    Query the bier links in the domain 1 and subdomain 1.
-    ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_subdomain_link    ${mapping}    session    True
+    ${mapping}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_subdomain_link
+    ...    ${mapping}
+    ...    session
+    ...    True
 
 TC5_Configure Te Label
     [Documentation]    Configure the BIER-TE label base and label range size for all nodes in the bier topology.
     FOR    ${i}    IN RANGE    len(${NODE_ID_LIST})
         ${node-id}    Get From List    ${NODE_ID_LIST}    ${i}
         ${label-base}    Get From List    ${TE_LABEL_BASE_LIST}    ${i}
-        ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${node-id}    LABELBASE=${label-base}    LABELRANGESIZE=${TE_LABEL_RANGE_SIZE}
-        ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_label    ${mapping}    session
+        ${mapping}    Create Dictionary
+        ...    TOPOLOGYID=${TOPOLOGY_ID}
+        ...    NODEID=${node-id}
+        ...    LABELBASE=${label-base}
+        ...    LABELRANGESIZE=${TE_LABEL_RANGE_SIZE}
+        ${resp}    TemplatedRequests.Post_As_Json_Templated
+        ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_label
+        ...    ${mapping}
+        ...    session
         Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
     END
 
@@ -141,43 +233,99 @@ TC5_Configure Te Node
 
 TC5_Query Te Subdomain Link
     [Documentation]    Query the bier links in the te-domain 1 and te-subdomain 1.
-    ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_te_subdomain_link    ${mapping}    session    True
+    ${mapping}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/query_te_subdomain_link
+    ...    ${mapping}
+    ...    session
+    ...    True
 
 TC5_Delete Te BP
     [Documentation]    Configure the bier te params of one node and delete the BP parameter.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    TPID=spi-0/1/0/3
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    TPID=spi-0/1/0/3
     ...    BP=13
-    ${resp1}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node    ${mapping1}    session
+    ${resp1}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp1}    ${BIER_TE_VAR_FOLDER}/common    success_response
-    ${mapping2}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    TPID=spi-0/1/0/3
-    ${resp2}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_bp    ${mapping2}    session
+    ${mapping2}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    TPID=spi-0/1/0/3
+    ${resp2}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_bp
+    ...    ${mapping2}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp2}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC5_Delete Te SI
     [Documentation]    Configure the bier te params of one node and delete the SI parameter.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    TPID=spi-0/1/0/3
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    TPID=spi-0/1/0/3
     ...    BP=13
-    ${resp1}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node    ${mapping1}    session
+    ${resp1}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp1}    ${BIER_TE_VAR_FOLDER}/common    success_response
-    ${mapping2}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-    ${resp2}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_si    ${mapping2}    session
+    ${mapping2}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ${resp2}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_si
+    ...    ${mapping2}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp2}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC5_Delete Te BSL
     [Documentation]    Configure the bier te params of one node and delete the BSL parameter.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}    TPID=spi-0/1/0/3
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ...    TPID=spi-0/1/0/3
     ...    BP=13
-    ${resp1}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node    ${mapping1}    session
+    ${resp1}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/configure_te_node
+    ...    ${mapping1}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp1}    ${BIER_TE_VAR_FOLDER}/common    success_response
-    ${mapping2}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-    ${resp2}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_bsl    ${mapping2}    session
+    ${mapping2}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    NODEID=${NODE_ID_LIST[4]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+    ${resp2}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_bsl
+    ...    ${mapping2}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp2}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC5_Delete Te Label
     [Documentation]    Delete te label base and label range size of one node.
     ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    NODEID=${NODE_ID_LIST[4]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_label    ${mapping}    session
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_node_configuration/delete_te_label
+    ...    ${mapping}
+    ...    session
     Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/common    success_response
 
 TC6_Add Channel
@@ -186,42 +334,107 @@ TC6_Add Channel
         ${channel-name}    Get From List    ${CHANNEL_NAME_LIST}    ${i}
         ${src-ip}    Get From List    ${SRC_IP_LIST}    ${i}
         ${dst-group}    Get From List    ${DST_GROUP_LIST}    ${i}
-        ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNELNAME=${channel-name}    SRCIP=${src-ip}    DSTGROUP=${dst-group}
-        ...    DOMAINID=${DOMAIN_ID_LIST[0]}    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-        ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/add_channel    ${mapping}    session
-        Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration    success_response
+        ${mapping}    Create Dictionary
+        ...    TOPOLOGYID=${TOPOLOGY_ID}
+        ...    CHANNELNAME=${channel-name}
+        ...    SRCIP=${src-ip}
+        ...    DSTGROUP=${dst-group}
+        ...    DOMAINID=${DOMAIN_ID_LIST[0]}
+        ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
+        ${resp}    TemplatedRequests.Post_As_Json_Templated
+        ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/add_channel
+        ...    ${mapping}
+        ...    session
+        Verify_Response_As_Json_Templated
+        ...    ${resp}
+        ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration
+        ...    success_response
     END
 
 TC6_Get Channel
     [Documentation]    Query the channels put into the datastore.
     ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/get_channel    ${mapping}    session    True
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/get_channel
+    ...    ${mapping}
+    ...    session
+    ...    True
 
 TC6_Query Channel
     [Documentation]    Query the channel put into the datastore by given name .
-    ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNEL1=${CHANNEL_NAME_LIST[0]}    CHANNEL2=${CHANNEL_NAME_LIST[1]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/query_channel    ${mapping}    session    True
+    ${mapping}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    CHANNEL1=${CHANNEL_NAME_LIST[0]}
+    ...    CHANNEL2=${CHANNEL_NAME_LIST[1]}
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/query_channel
+    ...    ${mapping}
+    ...    session
+    ...    True
 
 TC6_Remove Channel
     [Documentation]    Remove one channel which was put into the datastore.
     ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNELNAME=channel3
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/remove_channel    ${mapping}    session
-    Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration    success_response
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/remove_channel
+    ...    ${mapping}
+    ...    session
+    Verify_Response_As_Json_Templated
+    ...    ${resp}
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration
+    ...    success_response
 
 TC6_Modify Channel
     [Documentation]    Modify one channel which was put into the datastore.
-    ${mapping}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNELNAME=${CHANNEL_NAME_LIST[0]}    SRCIP=10.10.10.10    DSTGROUP=${DST_GROUP_LIST[0]}    DOMAINID=${DOMAIN_ID_LIST[0]}
+    ${mapping}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    CHANNELNAME=${CHANNEL_NAME_LIST[0]}
+    ...    SRCIP=10.10.10.10
+    ...    DSTGROUP=${DST_GROUP_LIST[0]}
+    ...    DOMAINID=${DOMAIN_ID_LIST[0]}
     ...    SUBDOMAINID=${SUBDOMAIN_ID_LIST[0]}
-    ${resp}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/modify_channel    ${mapping}    session
-    Verify_Response_As_Json_Templated    ${resp}    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration    success_response
+    ${resp}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/modify_channel
+    ...    ${mapping}
+    ...    session
+    Verify_Response_As_Json_Templated
+    ...    ${resp}
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration
+    ...    success_response
 
 TC6_Deploy Channel
     [Documentation]    Deploy two channels which was put into the datastore, by giving the ingress node, ingress tp, egress nodes and coressponding tps.
-    ${mapping1}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNELNAME=${CHANNEL_NAME_LIST[0]}    INGRESSNODE=${NODE_ID_LIST[0]}    SRCTP=${TP_ID_LIST_OF_NODE1[3]}    NODEID1=${NODE_ID_LIST[1]}
-    ...    RCVTP1=${TP_ID_LIST_OF_NODE2[1]}    NODEID2=${NODE_ID_LIST[2]}    RCVTP2=${TP_ID_LIST_OF_NODE3[2]}
-    ${resp1}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/deploy_channel    ${mapping1}    session
-    Verify_Response_As_Json_Templated    ${resp1}    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration    success_response
-    ${mapping2}    Create Dictionary    TOPOLOGYID=${TOPOLOGY_ID}    CHANNELNAME=${CHANNEL_NAME_LIST[1]}    INGRESSNODE=${NODE_ID_LIST[0]}    SRCTP=${TP_ID_LIST_OF_NODE1[3]}    NODEID1=${NODE_ID_LIST[1]}
-    ...    RCVTP1=${TP_ID_LIST_OF_NODE2[1]}    NODEID2=${NODE_ID_LIST[3]}    RCVTP2=${TP_ID_LIST_OF_NODE4[1]}
-    ${resp2}    TemplatedRequests.Post_As_Json_Templated    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/deploy_channel    ${mapping2}    session
-    Verify_Response_As_Json_Templated    ${resp2}    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration    success_response
+    ${mapping1}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    CHANNELNAME=${CHANNEL_NAME_LIST[0]}
+    ...    INGRESSNODE=${NODE_ID_LIST[0]}
+    ...    SRCTP=${TP_ID_LIST_OF_NODE1[3]}
+    ...    NODEID1=${NODE_ID_LIST[1]}
+    ...    RCVTP1=${TP_ID_LIST_OF_NODE2[1]}
+    ...    NODEID2=${NODE_ID_LIST[2]}
+    ...    RCVTP2=${TP_ID_LIST_OF_NODE3[2]}
+    ${resp1}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/deploy_channel
+    ...    ${mapping1}
+    ...    session
+    Verify_Response_As_Json_Templated
+    ...    ${resp1}
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration
+    ...    success_response
+    ${mapping2}    Create Dictionary
+    ...    TOPOLOGYID=${TOPOLOGY_ID}
+    ...    CHANNELNAME=${CHANNEL_NAME_LIST[1]}
+    ...    INGRESSNODE=${NODE_ID_LIST[0]}
+    ...    SRCTP=${TP_ID_LIST_OF_NODE1[3]}
+    ...    NODEID1=${NODE_ID_LIST[1]}
+    ...    RCVTP1=${TP_ID_LIST_OF_NODE2[1]}
+    ...    NODEID2=${NODE_ID_LIST[3]}
+    ...    RCVTP2=${TP_ID_LIST_OF_NODE4[1]}
+    ${resp2}    TemplatedRequests.Post_As_Json_Templated
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration/deploy_channel
+    ...    ${mapping2}
+    ...    session
+    Verify_Response_As_Json_Templated
+    ...    ${resp2}
+    ...    ${BIER_TE_VAR_FOLDER}/bier_channel_configuration
+    ...    success_response

diff --git a/csit/suites/bier/basic/__init__.robot b/csit/suites/bier/basic/__init__.robot
index 76eef138dd6edfcfe3a81cd020acb254d1b8f390..992080d14630b597be4a0531dca6311068e56f2b 100644 (file)
--- a/csit/suites/bier/basic/__init__.robot
+++ b/csit/suites/bier/basic/__init__.robot
@@ -1,4 +1,5 @@
 *** Settings ***
-Suite Setup       RequestsLibrary.Create_Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_YANG_JSON}
-Library           RequestsLibrary
-Resource          ../../../libraries/BierTeResource.robot
+Library         RequestsLibrary
+Resource        ../../../libraries/BierTeResource.robot
+
+Suite Setup     RequestsLibrary.Create_Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_YANG_JSON}

diff --git a/csit/suites/capwap/basic/capwap_session.robot b/csit/suites/capwap/basic/capwap_session.robot
index 5fbfc5149c57fcc4cd288a02921d241d6ffc5869..b731cf1a9e771845b889fa478af293542eb4ba24 100644 (file)
--- a/csit/suites/capwap/basic/capwap_session.robot
+++ b/csit/suites/capwap/basic/capwap_session.robot
@@ -1,17 +1,21 @@
 *** Settings ***
-Documentation     Test suite for capwap discover functionality
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-Library           Collections
-Library           ../../../libraries/CapwapLibrary.py
+Documentation       Test suite for capwap discover functionality
+
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/Utils.robot
+Library             Collections
+Library             ../../../libraries/CapwapLibrary.py
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
 ${DISC_WTP_REST}    /restconf/operational/capwap-impl:capwap-ac-root/
 
+
 *** Test Cases ***
 Get Discovered WTPs
     [Documentation]    Get the WTP Discoverd
@@ -23,6 +27,7 @@ Get Specific WTP
     send discover    ${ODL_SYSTEM_IP}
     Wait Until Keyword Succeeds    10s    5s    Run Test Get Specifc WTP
 
+
 *** Keywords ***
 Run Test Get Discovered WTP
     ${resp}    RequestsLibrary.Get Request    session    ${DISC_WTP_REST}
@@ -42,7 +47,12 @@ Run Test Get Discovered WTP
 
 Run Test Get Specifc WTP
     ${expected_ip_addr}    get simulated wtpip    ${ODL_SYSTEM_IP}
-    ${DISC_SPECIFIC_WTP}    catenate    SEPARATOR=    ${DISC_WTP_REST}    discovered-wtps\/    ${expected_ip_addr}    \/
+    ${DISC_SPECIFIC_WTP}    catenate
+    ...    SEPARATOR=
+    ...    ${DISC_WTP_REST}
+    ...    discovered-wtps\/
+    ...    ${expected_ip_addr}
+    ...    \/
     Log    ${DISC_SPECIFIC_WTP}
     ${resp}    RequestsLibrary.Get Request    session    ${DISC_SPECIFIC_WTP}
     Log    ${resp.content}

diff --git a/csit/suites/cardinal/basic/020_FeatureInstallation.robot b/csit/suites/cardinal/basic/020_FeatureInstallation.robot
index 52d0ef42e6bb98c5f086fd7e5f4df9cba64c1984..eeee9bfae9b7b6af7a032f3e8186d7b26de12995 100644 (file)
--- a/csit/suites/cardinal/basic/020_FeatureInstallation.robot
+++ b/csit/suites/cardinal/basic/020_FeatureInstallation.robot
@@ -1,15 +1,22 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           OperatingSystem
-Library           String
-Resource          ../../../libraries/KarafKeywords.robot
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             OperatingSystem
+Library             String
+Resource            ../../../libraries/KarafKeywords.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Test Cases ***
 Centinel Feature Installation
     Install a Feature    odl-cardinal    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    120
     Verify Feature Is Installed    odl-cardinal
     ${strings_to_verify}=    Create List    CardinalProvider Session Initiated
-    Wait Until Keyword Succeeds    180s    1s    Check For Elements On Karaf Command Output Message    log:display | grep "CardinalProvider Session Initiated"    ${strings_to_verify}
+    Wait Until Keyword Succeeds
+    ...    180s
+    ...    1s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    log:display | grep "CardinalProvider Session Initiated"
+    ...    ${strings_to_verify}

diff --git a/csit/suites/cardinal/basic/030_FeatureUninstallation.robot b/csit/suites/cardinal/basic/030_FeatureUninstallation.robot
index 95179f6a09b57b90be81889313b149bc1d41a3d5..b22b489a56481e5213971008deef0615d08e8b73 100644 (file)
--- a/csit/suites/cardinal/basic/030_FeatureUninstallation.robot
+++ b/csit/suites/cardinal/basic/030_FeatureUninstallation.robot
@@ -1,6 +1,8 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Resource          ../../../libraries/KarafKeywords.robot
+Resource        ../../../libraries/KarafKeywords.robot
+
+Suite Setup     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+
 
 *** Test Cases ***
 Centinel Feature Uninstallation

diff --git a/csit/suites/centinel/basic/020_FeatureInstallation.robot b/csit/suites/centinel/basic/020_FeatureInstallation.robot
index ff3cb2ab7073b6431f7f85f4b92b8e4e644536e2..02b0870a130a11e11676e36b7c286ac8c3cb14fc 100644 (file)
--- a/csit/suites/centinel/basic/020_FeatureInstallation.robot
+++ b/csit/suites/centinel/basic/020_FeatureInstallation.robot
@@ -1,17 +1,24 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           OperatingSystem
-Library           String
-Library           Collections
-Library           DateTime
-Resource          ../../../libraries/KarafKeywords.robot
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             OperatingSystem
+Library             String
+Library             Collections
+Library             DateTime
+Resource            ../../../libraries/KarafKeywords.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Test Cases ***
 Centinel Feature Installation
     Install a Feature    odl-centinel-all    ${ODL_SYSTEM_IP}    ${KARAF_SHELL_PORT}    120
     Verify Feature Is Installed    odl-centinel-all
     ${strings_to_verify}=    Create List    Stream handler provider initated
-    Wait Until Keyword Succeeds    180s    1s    Check For Elements On Karaf Command Output Message    log:display | grep "Stream handler provider initated"    ${strings_to_verify}
+    Wait Until Keyword Succeeds
+    ...    180s
+    ...    1s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    log:display | grep "Stream handler provider initated"
+    ...    ${strings_to_verify}

diff --git a/csit/suites/centinel/basic/030_Configuration.robot b/csit/suites/centinel/basic/030_Configuration.robot
index 921d4b4f1d54f6c859d2bdabd97fac3b89bf7ce3..0803d68319fded8a66912c27558fc779b32fe286 100644 (file)
--- a/csit/suites/centinel/basic/030_Configuration.robot
+++ b/csit/suites/centinel/basic/030_Configuration.robot
@@ -1,15 +1,18 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           OperatingSystem
-Resource          ../../../libraries/KarafKeywords.robot
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
+Library             RequestsLibrary
+Library             OperatingSystem
+Resource            ../../../libraries/KarafKeywords.robot
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/Utils.robot
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
 ${SET_CONFIGURATION}    ${CURDIR}/../../../variables/centinel/set_configuration.json
 
+
 *** Test Cases ***
 Set Configurations
     ${body}    OperatingSystem.Get File    ${SET_CONFIGURATION}

diff --git a/csit/suites/centinel/basic/040_Stream.robot b/csit/suites/centinel/basic/040_Stream.robot
index 823fb241a52ed61ca4e2921ef3b7c1f3541fa125..5c3ba4ad05b8a44d9f6b735a1e54f92d730113e1 100644 (file)
--- a/csit/suites/centinel/basic/040_Stream.robot
+++ b/csit/suites/centinel/basic/040_Stream.robot
@@ -1,17 +1,20 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           Collections
-Library           json
-Library           String
-Library           OperatingSystem
-Resource          ../../../libraries/KarafKeywords.robot
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             Collections
+Library             json
+Library             String
+Library             OperatingSystem
+Resource            ../../../libraries/KarafKeywords.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
 ${SET_STREAMRECORD_JSON}    ${CURDIR}/../../../variables/centinel/set_streamRecord.json
 
+
 *** Test Cases ***
 Set StreamRecord
     ${body}    OperatingSystem.Get File    ${SET_STREAMRECORD_JSON}

diff --git a/csit/suites/centinel/basic/050_Alertrule.robot b/csit/suites/centinel/basic/050_Alertrule.robot
index 03133958a1359c9300f1a5a1e849011c329632ba..891b6168310a912474cace0284b58b5cde271abf 100644 (file)
--- a/csit/suites/centinel/basic/050_Alertrule.robot
+++ b/csit/suites/centinel/basic/050_Alertrule.robot
@@ -1,18 +1,21 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           Collections
-Library           json
-Library           String
-Library           OperatingSystem
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             Collections
+Library             json
+Library             String
+Library             OperatingSystem
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${SET_STREAMRECORD_JSON}    ${CURDIR}/../../../variables/centinel/set_streamRecord.json
-${SET_ALERTFIELDCONTENTRULERECORD_JSON}    ${CURDIR}/../../../variables/centinel/set_alertFieldContentRuleRecord.json
-${SET_ALERTFIELDVALUERULERECORD_JSON}    ${CURDIR}/../../../variables/centinel/set_alertFieldValueRuleRecord.json
-${SET_ALERTMESSAGECOUNTRULERECORD_JSON}    ${CURDIR}/../../../variables/centinel/set_alertMessageCountRuleRecord.json
+${SET_STREAMRECORD_JSON}                    ${CURDIR}/../../../variables/centinel/set_streamRecord.json
+${SET_ALERTFIELDCONTENTRULERECORD_JSON}     ${CURDIR}/../../../variables/centinel/set_alertFieldContentRuleRecord.json
+${SET_ALERTFIELDVALUERULERECORD_JSON}       ${CURDIR}/../../../variables/centinel/set_alertFieldValueRuleRecord.json
+${SET_ALERTMESSAGECOUNTRULERECORD_JSON}     ${CURDIR}/../../../variables/centinel/set_alertMessageCountRuleRecord.json
+
 
 *** Test Cases ***
 Set StreamRecord

diff --git a/csit/suites/centinel/basic/060_Dashboardrule.robot b/csit/suites/centinel/basic/060_Dashboardrule.robot
index 4c4607df23268421e1dbf20462025269269bc34a..c40e3f2d8a91cbb3a44fa706bff3acc629a36cc1 100644 (file)
--- a/csit/suites/centinel/basic/060_Dashboardrule.robot
+++ b/csit/suites/centinel/basic/060_Dashboardrule.robot
@@ -1,15 +1,18 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           SSHLibrary
-Library           Collections
-Library           RequestsLibrary
-Library           OperatingSystem
-Library           requests
-Variables         ../../../variables/Variables.py
+Library             SSHLibrary
+Library             Collections
+Library             RequestsLibrary
+Library             OperatingSystem
+Library             requests
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${SET_DASHBOARD_JSON}    ${CURDIR}/../../../variables/centinel/set_dashboard.json
+${SET_DASHBOARD_JSON}       ${CURDIR}/../../../variables/centinel/set_dashboard.json
+
 
 *** Test Cases ***
 Set DashboardRecord

diff --git a/csit/suites/centinel/basic/070_Subscribe.robot b/csit/suites/centinel/basic/070_Subscribe.robot
index 7421b100b06c4b4e8af6cfed6d0e14d16bfeb7a3..5ebe4f82e3d8873d68633d6d9cf46e439a44669e 100644 (file)
--- a/csit/suites/centinel/basic/070_Subscribe.robot
+++ b/csit/suites/centinel/basic/070_Subscribe.robot
@@ -1,15 +1,18 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           Collections
-Library           json
-Library           String
-Library           OperatingSystem
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             Collections
+Library             json
+Library             String
+Library             OperatingSystem
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${SET_SUBSCRIBEUSER_JSON}    ${CURDIR}/../../../variables/centinel/set_subscribeUser.json
+${SET_SUBSCRIBEUSER_JSON}       ${CURDIR}/../../../variables/centinel/set_subscribeUser.json
+
 
 *** Test Cases ***
 Set SubscribeUser

diff --git a/csit/suites/centinel/basic/080_FeatureUninstallation.robot b/csit/suites/centinel/basic/080_FeatureUninstallation.robot
index ee08772da5b9873cbee61e8801dfa87bd0fb3737..4b8a6fde5ca516b753310437d9a513a30ae57592 100644 (file)
--- a/csit/suites/centinel/basic/080_FeatureUninstallation.robot
+++ b/csit/suites/centinel/basic/080_FeatureUninstallation.robot
@@ -1,12 +1,14 @@
 *** Settings ***
-Suite Setup       Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           OperatingSystem
-Library           String
-Library           Collections
-Resource          ../../../libraries/KarafKeywords.robot
-Variables         ../../../variables/Variables.py
+Library             RequestsLibrary
+Library             OperatingSystem
+Library             String
+Library             Collections
+Resource            ../../../libraries/KarafKeywords.robot
+Variables           ../../../variables/Variables.py
+
+Suite Setup         Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Test Cases ***
 Centinel Feature Uninstallation