Tidied updated test suites and Robot resources.

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

diff --git a/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
index 05695e8dfc935dc57a7702969ac96ede8ab5b8ea..e1e881bb61747f1a738fa4f8be87b477a3315a7b 100644 (file)
--- a/csit/libraries/VtnCoKeywords.robot
+++ b/csit/libraries/VtnCoKeywords.robot
@@ -133,7 +133,7 @@ Create VBR in VTN
     ${vbrcreate_json}=    json.dumps    ${vbrcreate}
     ${resp}    RequestsLibrary.Post    session    ${VTNWEBAPI}/${VTNS}/${vtnname}/${VBRS_CREATE}    data=${vbrcreate_json}
     Run Keyword If    '${vbrname}' == 'Vbr_audit'    Should Be Equal As Strings    ${resp.status_code}    202
-    ...    ELSE     Should Be Equal As Strings    ${resp.status_code}    201
+    ...    ELSE    Should Be Equal As Strings    ${resp.status_code}    201
 
 Create VBRIF in VBR
     [Arguments]    ${vtnname}    ${vbrname}    ${vbrifname}    ${ifdescription}    ${retcode}

diff --git a/csit/suites/nemo/engine/NEMO_ENGINE.robot b/csit/suites/nemo/engine/NEMO_ENGINE.robot
index 366b2f509abaa88debac19d60ff3d929a699b354..a468ee1cd14825cbbc5f4d345cd0ccc58243d7aa 100644 (file)
--- a/csit/suites/nemo/engine/NEMO_ENGINE.robot
+++ b/csit/suites/nemo/engine/NEMO_ENGINE.robot
@@ -9,26 +9,26 @@ Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/Utils.robot
 
 *** Variables ***
-${REGISTER_TENANT_FILE}     ${CURDIR}/../../../variables/nemo/register-user.json
-${STRUCTURE_HOST_FILE}      ${CURDIR}/../../../variables/nemo/intent-node-host.json
-${STRUCTURE_INTENT_FILE}      ${CURDIR}/../../../variables/nemo/structure-intent.json
-${PREDEFINE_ROLE_FILE}        ${CURDIR}/../../../variables/nemo/predefine/role.json
-${PREDEFINE_NODE_FILE}        ${CURDIR}/../../../variables/nemo/predefine/node.json
-${PREDEFINE_CONNECTION_FILE}        ${CURDIR}/../../../variables/nemo/predefine/connection.json
+${REGISTER_TENANT_FILE}    ${CURDIR}/../../../variables/nemo/register-user.json
+${STRUCTURE_HOST_FILE}    ${CURDIR}/../../../variables/nemo/intent-node-host.json
+${STRUCTURE_INTENT_FILE}    ${CURDIR}/../../../variables/nemo/structure-intent.json
+${PREDEFINE_ROLE_FILE}    ${CURDIR}/../../../variables/nemo/predefine/role.json
+${PREDEFINE_NODE_FILE}    ${CURDIR}/../../../variables/nemo/predefine/node.json
+${PREDEFINE_CONNECTION_FILE}    ${CURDIR}/../../../variables/nemo/predefine/connection.json
 
 *** Test Cases ***
 Add Pre-define Role
     [Documentation]    Add Pre-define Role
     [Tags]    Put
-    ${body}    OperatingSystem.Get File   ${PREDEFINE_ROLE_FILE}
-    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_ROLE_URI}     data=${body}    headers=${HEADERS_YANG_JSON}
+    ${body}    OperatingSystem.Get File    ${PREDEFINE_ROLE_FILE}
+    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_ROLE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Pre-define Node
     [Documentation]    Add Pre-define Node
     [Tags]    Put
-    ${body}    OperatingSystem.Get File   ${PREDEFINE_NODE_FILE}
-    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_NODE_URI}     data=${body}    headers=${HEADERS_YANG_JSON}
+    ${body}    OperatingSystem.Get File    ${PREDEFINE_NODE_FILE}
+    ${resp}    RequestsLibrary.Put    session    ${PREDEFINE_NODE_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Pre-define Connection
@@ -41,13 +41,13 @@ Add Pre-define Connection
 Register Tenant
     [Documentation]    Register Tenant
     [Tags]    Post
-    ${body}    OperatingSystem.Get File   ${REGISTER_TENANT_FILE}
+    ${body}    OperatingSystem.Get File    ${REGISTER_TENANT_FILE}
     ${resp}    RequestsLibrary.Post    session    ${REGISTER_TENANT_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Host Intent
-    [Documentation]   Add Host Intent
+    [Documentation]    Add Host Intent
     [Tags]    Post
     ${body}    OperatingSystem.Get File    ${STRUCTURE_HOST_FILE}
     ${resp}    RequestsLibrary.Post Request    session    ${STRUCTURE_INTENT_URI}    data=${body}    headers=${HEADERS_YANG_JSON}
@@ -55,7 +55,7 @@ Add Host Intent
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Add Structure Intent
-    [Documentation]   Add Structure Intent
+    [Documentation]    Add Structure Intent
     [Tags]    Post
     ${body}    OperatingSystem.Get File    ${STRUCTURE_INTENT_FILE}
     ${resp}    RequestsLibrary.Post Request    session    ${STRUCTURE_INTENT_URI}    data=${body}    headers=${HEADERS_YANG_JSON}

diff --git a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
index c5c37a88b9c1cf6f92108fb08d99af4a4b05994b..d39c5a7715ff6738f9c974c4b48ca82940f1402c 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF10_Li/010__vtn_manager.robot
@@ -79,7 +79,7 @@ Add a portmap for interface if4
 
 Ping h2 to h4
     [Documentation]    Verify Ping between hosts h2 and h4. To check mininet ping here added wait until time as '20s'. Since, sometimes it takes maximum '20sec' to send packet b/w hosts.
-    Wait Until Keyword Succeeds    20s    1s   Mininet Ping Should Succeed    h2    h4
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Succeed    h2    h4
 
 Get flow
     [Documentation]    Get flow of a vtn Tenant1
@@ -88,7 +88,7 @@ Get flow
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
     [Tags]    Switch
-    Wait Until Keyword Succeeds    20s    1s   Verify FlowMacAddress    h2    h4    OF10
+    Wait Until Keyword Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
     [Documentation]    Remove portmap for the interface If1
@@ -99,7 +99,7 @@ Remove Portmap for If1
 
 Verify RemovedFlowMacAddress
     [Documentation]    flows will be deleted after the port map is removed
-    Wait Until Keyword Succeeds    20s    1s   Verify RemovedFlowMacAddress    h1    h3    OF10
+    Wait Until Keyword Succeeds    20s    1s    Verify RemovedFlowMacAddress    h1    h3    OF10
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1

diff --git a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
index 0753eda3929adf6b5dd9713bcbd3e6d2af5bca9f..e05c3d7afa250a34d64966ea39d103a6aebc2bea 100644 (file)
--- a/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
+++ b/csit/suites/vtn/VTN_Mgr_OF13_Li/010__vtn_vlanmap_dataflow.robot
@@ -63,11 +63,11 @@ Get vlanflow h2 h6
 
 Verify data flow details for vlanmap vBridge2_vlan
     [Documentation]    Verify the data flows for the specified tenant and vBridge2_vlan
-    Wait Until Keyword Succeeds    20s    1s   Verify Data Flows    Tenant1    vBridge2_vlan
+    Wait Until Keyword Succeeds    20s    1s    Verify Data Flows    Tenant1    vBridge2_vlan
 
 Get vlanflow h2 h5
     [Documentation]    ping h2 to h5
-    Wait Until Keyword Succeeds    20s    1s   Mininet Ping Should Not Succeed    h2    h5
+    Wait Until Keyword Succeeds    20s    1s    Mininet Ping Should Not Succeed    h2    h5
 
 Delete a vtn Tenant1
     [Documentation]    Delete a vtn Tenant1