Update Robot Framework format - step 16 46/102346/8
authorSangwook Ha <sangwook.ha@verizon.com>
Sat, 10 Sep 2022 03:36:09 +0000 (20:36 -0700)
committerSangwook Ha <sangwook.ha@verizon.com>
Fri, 7 Oct 2022 02:12:08 +0000 (19:12 -0700)
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/unimgr
- csit/suites/usc
- csit/suites/vpnservice
- csit/suites/vtn
- csit/suites/yangtools

JIRA: INTTEST-132
Change-Id: I6d5ed935cde554663d5712895f7cab0a506c02f7
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>
62 files changed:
csit/suites/unimgr/uni_legato/010_unimanager_epl.robot
csit/suites/unimgr/uni_legato/020_unimanager_eplan.robot
csit/suites/unimgr/uni_operations/010_unimanager_restconf.robot
csit/suites/unimgr/uni_operations/020_unimanager_cli.robot
csit/suites/usc/__init__.robot
csit/suites/usc/tcp/100__basic.robot
csit/suites/usc/tcp/110_TCP/Test.robot
csit/suites/usc/tcp/110_TCP/__init__.robot
csit/suites/usc/tcp/200_Multiple_Sessions_TCP/Test.robot
csit/suites/usc/tcp/200_Multiple_Sessions_TCP/__init__.robot
csit/suites/usc/tcp/300_Callhome_TCP/__init__.robot
csit/suites/usc/tcp/300_Callhome_TCP/test.robot
csit/suites/usc/tcp/__init__.robot
csit/suites/usc/udp/110_UDP/Test.robot
csit/suites/usc/udp/110_UDP/__init__.robot
csit/suites/usc/udp/200_Multiple_Sessions_UDP/Test.robot
csit/suites/usc/udp/200_Multiple_Sessions_UDP/__init__.robot
csit/suites/usc/udp/300_Callhome_UDP/Test.robot
csit/suites/usc/udp/300_Callhome_UDP/__init__.robot
csit/suites/usc/udp/__init__.robot
csit/suites/vpnservice/010__verify_feature.robot
csit/suites/vpnservice/020__configure_vpn.robot
csit/suites/vpnservice/030__configure_2_switches.robot
csit/suites/vpnservice/__init__.robot
csit/suites/vtn/VTN_C_LAUNCH/020__vtn_coordinator.robot
csit/suites/vtn/VTN_C_LAUNCH/__init__.robot
csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
csit/suites/vtn/VTN_C_OF10/050__vtn_vbr_flowfilter.robot
csit/suites/vtn/VTN_C_OF10/060__vtn_vbrif_flowfilter.robot
csit/suites/vtn/VTN_C_OF10/070__vtn_flowfilter.robot
csit/suites/vtn/VTN_C_OF10/080__vlan_vtn.robot
csit/suites/vtn/VTN_C_OF10/__init__.robot
csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
csit/suites/vtn/VTN_C_OF13/050__vtn_vbr_flowfilter.robot
csit/suites/vtn/VTN_C_OF13/060__vtn_vbrif_flowfilter.robot
csit/suites/vtn/VTN_C_OF13/070__vtn_flowfilter.robot
csit/suites/vtn/VTN_C_OF13/__init__.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_macmap.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_dataflow.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter_out.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbridge_portmapping_test.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vbrif_vlanmap.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_vlanmap.robot
csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot
csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
csit/suites/vtn/VTN_Mgr_OF13/010__flowcondition_test.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_macmap.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_dataflow.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter_out.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbridge_portmapping_test.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vbrif_vlanmap.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_vlanmap_dataflow.robot
csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot
csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
csit/suites/yangtools/yang-model-validator/yang-model-validator.robot

index e8df6d938b534a00e0940f87ffb4d29ead81bf36..8f3c28da5da14aa73c5a906fbf8ecf3ed22000c6 100644 (file)
@@ -1,19 +1,23 @@
 *** Settings ***
-Documentation     Test suite for legato topology of 1 switch
-Suite Setup       Setup Test Environment
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           SSHLibrary
-Library           Collections
-Library           OperatingSystem
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/MininetKeywords.robot
-Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../variables/Variables.robot
+Documentation       Test suite for legato topology of 1 switch
+
+Library             RequestsLibrary
+Library             SSHLibrary
+Library             Collections
+Library             OperatingSystem
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../libraries/MininetKeywords.robot
+Resource            ../../../libraries/TemplatedRequests.robot
+Resource            ../../../variables/Variables.robot
+
+Suite Setup         Setup Test Environment
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${UniMgr_variables_DIR}    ${CURDIR}/../../../variables/unimgr
-${options}        --topo single,2
+${UniMgr_variables_DIR}     ${CURDIR}/../../../variables/unimgr
+${options}                  --topo single,2
+
 
 *** Test Cases ***
 Check no connectivity before creating service
@@ -23,13 +27,27 @@ Check no connectivity before creating service
 Create epl service
     [Documentation]    Create point to point service between the eth ports
     ${interface}    Create List    s1-eth1    s1-eth2
-    Wait Until Keyword Succeeds    12s    2s    Check For Elements At URI    ${CONFIG_API}/mef-interfaces:mef-interfaces/    ${interface}
-    ${body}=    OperatingSystem.Get File    ${UniMgr_variables_DIR}/add_epl.json
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_API}/mef-services:mef-services/    headers=${HEADERS_YANG_JSON}    data=${body}
+    Wait Until Keyword Succeeds
+    ...    12s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${CONFIG_API}/mef-interfaces:mef-interfaces/
+    ...    ${interface}
+    ${body}    OperatingSystem.Get File    ${UniMgr_variables_DIR}/add_epl.json
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_API}/mef-services:mef-services/
+    ...    headers=${HEADERS_YANG_JSON}
+    ...    data=${body}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    eth1    eth2
-    Wait Until Keyword Succeeds    56s    8s    Check For Elements At URI    ${CONFIG_API}/elan:elan-interfaces/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    56s
+    ...    8s
+    ...    Check For Elements At URI
+    ...    ${CONFIG_API}/elan:elan-interfaces/
+    ...    ${elements}
 
 Check ping between h1-h2 after service creation
     [Documentation]    Verify ping between the hosts h1 - h2
@@ -38,7 +56,10 @@ Check ping between h1-h2 after service creation
 
 Delete epl service
     [Documentation]    Delete the evc point to point & verify no ping
-    ${resp}    RequestsLibrary.Delete Request    session    ${CONFIG_API}/mef-services:mef-services/    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${CONFIG_API}/mef-services:mef-services/
+    ...    headers=${HEADERS_YANG_JSON}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
@@ -46,6 +67,7 @@ Check no connectivity after deleting service
     [Documentation]    Verify no ping after deleteing the eplan service
     Wait Until Keyword Succeeds    8s    2s    MininetKeywords.Verify Mininet No Ping    h1    h2
 
+
 *** Keywords ***
 Setup Test Environment
     [Documentation]    Establish the Opendayligh session and prepair 1 Mininet VMs
index a1fb1cf46347b10619a1588ed8ea397b43df29a8..949c518d542d2948c4dc2366fec994a02ef2e83e 100644 (file)
@@ -1,19 +1,23 @@
 *** Settings ***
-Documentation     Test suite for legato topology of 1 switch
-Suite Setup       Setup Test Environment
-Suite Teardown    Delete All Sessions
-Library           RequestsLibrary
-Library           SSHLibrary
-Library           Collections
-Library           OperatingSystem
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/MininetKeywords.robot
-Resource          ../../../libraries/TemplatedRequests.robot
-Resource          ../../../variables/Variables.robot
+Documentation       Test suite for legato topology of 1 switch
+
+Library             RequestsLibrary
+Library             SSHLibrary
+Library             Collections
+Library             OperatingSystem
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../libraries/MininetKeywords.robot
+Resource            ../../../libraries/TemplatedRequests.robot
+Resource            ../../../variables/Variables.robot
+
+Suite Setup         Setup Test Environment
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${UniMgr_variables_DIR}    ${CURDIR}/../../../variables/unimgr
-${options}        --topo single,5
+${UniMgr_variables_DIR}     ${CURDIR}/../../../variables/unimgr
+${options}                  --topo single,5
+
 
 *** Test Cases ***
 Check no connectivity before creating service
@@ -23,13 +27,27 @@ Check no connectivity before creating service
 Create epl service
     [Documentation]    Create multi point to multi point service between the eth ports
     ${interface}    Create List    s1-eth1    s1-eth2
-    Wait Until Keyword Succeeds    10s    2s    Check For Elements At URI    ${CONFIG_API}/mef-interfaces:mef-interfaces/    ${interface}
-    ${body}=    OperatingSystem.Get File    ${UniMgr_variables_DIR}/add_eplan.json
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_API}/mef-services:mef-services/    headers=${HEADERS_YANG_JSON}    data=${body}
+    Wait Until Keyword Succeeds
+    ...    10s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${CONFIG_API}/mef-interfaces:mef-interfaces/
+    ...    ${interface}
+    ${body}    OperatingSystem.Get File    ${UniMgr_variables_DIR}/add_eplan.json
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_API}/mef-services:mef-services/
+    ...    headers=${HEADERS_YANG_JSON}
+    ...    data=${body}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    eth3    eth4    eth5
-    Wait Until Keyword Succeeds    56s    8s    Check For Elements At URI    ${CONFIG_API}/elan:elan-interfaces/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    56s
+    ...    8s
+    ...    Check For Elements At URI
+    ...    ${CONFIG_API}/elan:elan-interfaces/
+    ...    ${elements}
 
 Check ping between h3-h4 after service creation
     [Documentation]    Verify ping between the hosts h3 - h4
@@ -48,7 +66,10 @@ Check ping between h3-h5 after service creation
 
 Delete epl service
     [Documentation]    Delete the evc multi point to multi point & verify no ping
-    ${resp}    RequestsLibrary.Delete Request    session    ${CONFIG_API}/mef-services:mef-services/    headers=${HEADERS_YANG_JSON}
+    ${resp}    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${CONFIG_API}/mef-services:mef-services/
+    ...    headers=${HEADERS_YANG_JSON}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
 
@@ -56,6 +77,7 @@ Check no connectivity after deleting service
     [Documentation]    Verify no ping after deleteing the eplan service
     Wait Until Keyword Succeeds    8s    2s    MininetKeywords.Verify Mininet No Ping    h3    h4
 
+
 *** Keywords ***
 Setup Test Environment
     [Documentation]    Establish the Opendayligh session and prepair 1 Mininet VMs
index cf01a97f5551f6b0d481bb7189ee57477348ea06..fd66163ca114bc6da26b0cd23820af06d3c82588 100644 (file)
 *** Settings ***
-Documentation     Test suite for all Uni Manager operations
-Suite Setup       Setup Unimgr Test Environment
-Suite Teardown    Delete All Sessions
-Library           OperatingSystem
-Library           String
-Library           Collections
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/UnimgrKeywords.robot
-Resource          ../../../libraries/TemplatedRequests.robot
+Documentation       Test suite for all Uni Manager operations
+
+Library             OperatingSystem
+Library             String
+Library             Collections
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../libraries/UnimgrKeywords.robot
+Resource            ../../../libraries/TemplatedRequests.robot
+
+Suite Setup         Setup Unimgr Test Environment
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${DEFAULT_LINUX_PROMPT}    ${EMPTY}
-${Mininet1_IP}    ${TOOLS_SYSTEM_IP}
-${Mininet2_IP}    ${TOOLS_SYSTEM_2_IP}
-${UNI1_MAC}       68:5b:35:bb:f8:3e
-${UNI2_MAC}       52:7b:25:cb:a7:3c
-${Evc_topo_API}    topology/unimgr:evc/link/evc:%2F%2F1
-${Uni_topo_API}    topology/unimgr:uni/node/uni:%2F%2F
-${UniMgr_variables_DIR}    ${CURDIR}/../../../variables/unimgr
+${DEFAULT_LINUX_PROMPT}     ${EMPTY}
+${Mininet1_IP}              ${TOOLS_SYSTEM_IP}
+${Mininet2_IP}              ${TOOLS_SYSTEM_2_IP}
+${UNI1_MAC}                 68:5b:35:bb:f8:3e
+${UNI2_MAC}                 52:7b:25:cb:a7:3c
+${Evc_topo_API}             topology/unimgr:evc/link/evc:%2F%2F1
+${Uni_topo_API}             topology/unimgr:uni/node/uni:%2F%2F
+${UniMgr_variables_DIR}     ${CURDIR}/../../../variables/unimgr
+
 
 *** Test Cases ***
 Create source and destination UNIs at the OVS instances using Restconf API
     [Documentation]    Create source and destination UNIs
-    [Tags]    UniMgr UNIs Create
+    [Tags]    unimgr unis create
     ${uniSource}    Get Add Uni Json    ${Mininet1_IP}    ${UNI1_MAC}
     ${uniDest}    Get Add Uni Json    ${Mininet2_IP}    ${UNI2_MAC}
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet1_IP}    data=${uniSource}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet1_IP}
+    ...    data=${uniSource}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet2_IP}    data=${uniDest}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet2_IP}
+    ...    data=${uniDest}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    ${Mininet1_IP}    ${Mininet2_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/
+    ...    ${elements}
 
 Update UNI Speed
     [Documentation]    Update the Unis source and destenation speed
-    [Tags]    UniMgr UNIs Speed
+    [Tags]    unimgr unis speed
     ${speedJson}    OperatingSystem.Get File    ${UniMgr_variables_DIR}/uni_speed.json
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet1_IP}/cl-unimgr-mef:speed    data=${speedJson}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet1_IP}/cl-unimgr-mef:speed
+    ...    data=${speedJson}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet2_IP}/cl-unimgr-mef:speed    data=${speedJson}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet2_IP}/cl-unimgr-mef:speed
+    ...    data=${speedJson}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    speed-10G
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/
+    ...    ${elements}
 
 Create EVC tunnel between the Unis
     [Documentation]    Create EVC between Unis
-    [Tags]    UniMgr EVC Create
+    [Tags]    unimgr evc create
     ${evc}    Get Add Evc Json    ${Mininet1_IP}    ${Mininet2_IP}
     ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Evc_topo_API}    data=${evc}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    evc://1
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/unimgr:evc/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${OPERATIONAL_TOPO_API}/topology/unimgr:evc/
+    ...    ${elements}
 
 Update EVC Ingress and Egress Speed
     [Documentation]    Update the EVC connection Ingress and Egress Speed
-    [Tags]    UniMgr EVC Speed
+    [Tags]    unimgr evc speed
     ${ingressJson}    OperatingSystem.Get File    ${UniMgr_variables_DIR}/evc_ingress_speed.json
     ${egressJson}    OperatingSystem.Get File    ${UniMgr_variables_DIR}/evc_egress_speed.json
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Evc_topo_API}/cl-unimgr-mef:ingress-bw    data=${ingressJson}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Evc_topo_API}/cl-unimgr-mef:ingress-bw
+    ...    data=${ingressJson}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
-    ${resp}    RequestsLibrary.Put Request    session    ${CONFIG_TOPO_API}/${Evc_topo_API}/cl-unimgr-mef:egress-bw    data=${egressJson}
+    ${resp}    RequestsLibrary.Put Request
+    ...    session
+    ...    ${CONFIG_TOPO_API}/${Evc_topo_API}/cl-unimgr-mef:egress-bw
+    ...    data=${egressJson}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    speed-1G
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements At URI    ${OPERATIONAL_TOPO_API}/topology/unimgr:evc/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements At URI
+    ...    ${OPERATIONAL_TOPO_API}/topology/unimgr:evc/
+    ...    ${elements}
 
 Delete EVC tunnel between the Unis
     [Documentation]    Delete EVC
-    [Tags]    UniMgr EVC Delete
+    [Tags]    unimgr evc delete
     ${resp}    RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/${Evc_topo_API}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    evc://1
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements Not At URI    ${CONFIG_TOPO_API}/topology/unimgr:evc/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements Not At URI
+    ...    ${CONFIG_TOPO_API}/topology/unimgr:evc/
+    ...    ${elements}
 
 Delete UNIs source and destination
     [Documentation]    Delete both UNIs source and destination
-    [Tags]    UniMgr UNI Delete
+    [Tags]    unimgr uni delete
     ${resp}    RequestsLibrary.Delete Request    session    ${CONFIG_TOPO_API}/${Uni_topo_API}${Mininet1_IP}
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
@@ -94,4 +141,9 @@ Delete UNIs source and destination
     Log    ${resp.content}
     Should Contain    ${ALLOWED_STATUS_CODES}    ${resp.status_code}
     ${elements}    Create List    ${Mininet1_IP}    ${Mininet2_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements Not At URI    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements Not At URI
+    ...    ${OPERATIONAL_TOPO_API}/topology/unimgr:uni/
+    ...    ${elements}
index d9d591ab415a42371cb035e755e8484c8ddd732b..a7f70626716ba37c46ca02c23aea7dc337d1e0ec 100644 (file)
 *** Settings ***
-Documentation     Test suite for all Uni Manager operations
-Suite Setup       Setup Unimgr Test Environment
-Suite Teardown    Delete All Sessions
-Library           OperatingSystem
-Library           String
-Library           Collections
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           ../../../libraries/Common.py
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/Utils.robot
-Resource          ../../../libraries/KarafKeywords.robot
-Resource          ../../../libraries/UnimgrKeywords.robot
+Documentation       Test suite for all Uni Manager operations
+
+Library             OperatingSystem
+Library             String
+Library             Collections
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             ../../../libraries/Common.py
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../libraries/KarafKeywords.robot
+Resource            ../../../libraries/UnimgrKeywords.robot
+
+Suite Setup         Setup Unimgr Test Environment
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${DEFAULT_LINUX_PROMPT}    ${EMPTY}
-${Mininet1_IP}    ${TOOLS_SYSTEM_IP}
-${Mininet2_IP}    ${TOOLS_SYSTEM_2_IP}
-${UNI1_MAC}       68:5b:35:bb:f8:3e
-${UNI2_MAC}       52:7b:25:cb:a7:3c
+${DEFAULT_LINUX_PROMPT}     ${EMPTY}
+${Mininet1_IP}              ${TOOLS_SYSTEM_IP}
+${Mininet2_IP}              ${TOOLS_SYSTEM_2_IP}
+${UNI1_MAC}                 68:5b:35:bb:f8:3e
+${UNI2_MAC}                 52:7b:25:cb:a7:3c
+
 
 *** Test Cases ***
 Create source and destination UNIs at the OVS instances using Restconf API
     [Documentation]    Create source and destination UNIs
-    [Tags]    UniMgr UNIs Create
+    [Tags]    unimgr unis create
     ${elements}    Create List    ${Mininet1_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-add -ip ${Mininet1_IP} -ma ${UNI1_MAC}    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-add -ip ${Mininet1_IP} -ma ${UNI1_MAC}
+    ...    ${elements}
     ${elements}    Create List    ${Mininet2_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-add -ip ${Mininet2_IP} -ma ${UNI2_MAC}    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-add -ip ${Mininet2_IP} -ma ${UNI2_MAC}
+    ...    ${elements}
 
 List All UNIs
     [Documentation]    List all existing UNIs in the config data store
-    [Tags]    UniMgr
+    [Tags]    unimgr
     ${elements}    Create List    ${Mininet1_IP}    ${Mininet2_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-list -c    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-list -c
+    ...    ${elements}
 
 Show UNI
     [Documentation]    Show the information of the created Unis from the operational data store
-    [Tags]    UniMgr
+    [Tags]    unimgr
     ${elements}    Create List    ${Mininet1_IP}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-show ${Mininet1_IP}    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-show ${Mininet1_IP}
+    ...    ${elements}
 
 Update the Unis Speed
     [Documentation]    Update Created Unis speed
-    [Tags]    UniMgr
+    [Tags]    unimgr
     ${elements}    Create List    ${Mininet1_IP} updated
-    Check For Elements On Karaf Command Output Message    uni-update -ip ${Mininet1_IP} -ma ${UNI1_MAC} -s 10G    ${elements}
+    Check For Elements On Karaf Command Output Message
+    ...    uni-update -ip ${Mininet1_IP} -ma ${UNI1_MAC} -s 10G
+    ...    ${elements}
     ${element}    Create List    Speed10G
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-show ${Mininet1_IP}    ${element}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-show ${Mininet1_IP}
+    ...    ${element}
 
 Delete UNIs source and destination
     [Documentation]    Delete both UNIs source and destination.
-    [Tags]    UniMgr UNI Delete
+    [Tags]    unimgr uni delete
     ${elements}    Create List    Uni successfully removed
     Check For Elements On Karaf Command Output Message    uni-remove ${Mininet1_IP}    ${elements}
     Check For Elements On Karaf Command Output Message    uni-remove ${Mininet2_IP}    ${elements}
     ${elements}    Create List    No uni found
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-show ${Mininet1_IP}    ${elements}
-    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-show ${Mininet2_IP}    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-show ${Mininet1_IP}
+    ...    ${elements}
+    Wait Until Keyword Succeeds
+    ...    16s
+    ...    2s
+    ...    Check For Elements On Karaf Command Output Message
+    ...    uni-show ${Mininet2_IP}
+    ...    ${elements}
index 45b74bd844e02112b599c1e7f6ac1dc3058dfdc0..5b9a7a869c23bef5f0463e1d6327220dd35a694d 100644 (file)
@@ -1,3 +1,4 @@
 *** Settings ***
-Suite Setup       Download Tools
-Resource          ../../libraries/UscUtils.robot
+Resource        ../../libraries/UscUtils.robot
+
+Suite Setup     Download Tools
index 0619a1ed10254d6a5d65cf2c0310cccd87694833..a5125f527cf4b5ffa369fcf1ffe4c48f066d603c 100644 (file)
@@ -1,14 +1,18 @@
 *** Settings ***
-Documentation     Test suite for quicking testing if the environme setup is correct
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Default Tags      TCP_BASIC
-Library           Collections
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           json
-Variables         ../../../variables/Variables.py
-Resource          ../../../libraries/UscUtils.robot
+Documentation       Test suite for quicking testing if the environme setup is correct
+
+Library             Collections
+Library             OperatingSystem
+Library             RequestsLibrary
+Library             json
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
+Default Tags        tcp_basic
+
 
 *** Test Cases ***
 View Channel
index de06ef185656eaef1c72cb08350c3df83b76795b..77bf60a6231975bed09f9215d122adb128569607 100644 (file)
@@ -1,20 +1,27 @@
 *** Settings ***
-Documentation     Test suite for an USC TLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           OperatingSystem
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for an USC TLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add an USC TLS channel
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    tcp=true    port=${ECHO_SERVER_PORT}    remote=false
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    tcp=true
+    ...    port=${ECHO_SERVER_PORT}
+    ...    remote=false
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     ${data}    json.dumps    ${input}
@@ -37,7 +44,11 @@ Check added Channel
 
 Send Messages
     [Documentation]    Send test messages multiple times to multiple sessions
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${ECHO_SERVER_PORT}    tcp=true    content=${TEST_MESSAGE}
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    port=${ECHO_SERVER_PORT}
+    ...    tcp=true
+    ...    content=${TEST_MESSAGE}
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     FOR    ${index}    IN RANGE    0    ${NUM_OF_MESSAGES}
index 59a7e95f17401c4c9aef738081ede10a5ad38776..7ea9e6cf6ac5cdd6698c28c4e221c0a07a8ae4e5 100644 (file)
@@ -1,9 +1,7 @@
 *** Settings ***
-Documentation     Test suite for an USC TLS channel
-Suite Setup       Start TCP
-Suite Teardown    Stop Agent_Echo
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for an USC TLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start TCP
+Suite Teardown      Stop Agent_Echo
index baa824cd0a227657efe92ac07ff06028a4185140..df43b6d920c32e7a50b6aa006a41f59fde164f2b 100644 (file)
@@ -1,23 +1,28 @@
 *** Settings ***
-Documentation     Test suite for multiple sessions in an USC TLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           OperatingSystem
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for multiple sessions in an USC TLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
 
-*** Variables ***
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add multiple USC TLS channels
     FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-        ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${port_index}    tcp=true    remote=false
+        ${content}    Create Dictionary
+        ...    hostname=${TOOLS_SYSTEM_IP}
+        ...    port=${port_index}
+        ...    tcp=true
+        ...    remote=false
         ${channel}    Create Dictionary    channel=${content}
         ${input}    Create Dictionary    input=${channel}
         ${data}    json.dumps    ${input}
@@ -43,7 +48,11 @@ Check added Channel
 Send Messages
     [Documentation]    Send test messages multiple times
     FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-        ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${port_index}    tcp=true    content=${TEST_MESSAGE}
+        ${content}    Create Dictionary
+        ...    hostname=${TOOLS_SYSTEM_IP}
+        ...    port=${port_index}
+        ...    tcp=true
+        ...    content=${TEST_MESSAGE}
         ${channel}    Create Dictionary    channel=${content}
         ${input}    Create Dictionary    input=${channel}
         Send Now    ${input}
@@ -98,6 +107,7 @@ Check Channel
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    "topology"
 
+
 *** Keywords ***
 Send Now
     [Arguments]    ${body}
index 829b4295e4aef07b141622a3041a8a6237348805..b9e34a1a269371becb67acb5b7bbe66a5f74ff92 100644 (file)
@@ -1,10 +1,9 @@
 *** Settings ***
-Documentation     Test suite for multiple sessions in an USC TLS channel
-Suite Setup       Start Multiple_Sessions_TCP
-Suite Teardown    Stop One_Agent_Multiple_Echo
-Force Tags        Multiple Sessions TCP
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for multiple sessions in an USC TLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start Multiple_Sessions_TCP
+Suite Teardown      Stop One_Agent_Multiple_Echo
+
+Force Tags          multiple sessions tcp
index eec604c2e50dae0ddb8488d446bc45bab2d59bad..79989ca84febe7ee3fed3b8c04f1226efc46149b 100644 (file)
@@ -1,9 +1,7 @@
 *** Settings ***
-Documentation     Test suite for callhome TLS channel
-Suite Setup       Start CALLHOME_TCP
-Suite Teardown    Stop Agent_Echo
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for callhome TLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start CALLHOME_TCP
+Suite Teardown      Stop Agent_Echo
index 80fd13fb80123afb1094e568328a10f97d54fc6e..6b46628337ecdf18b77aefc4fa394871388a3ed8 100644 (file)
@@ -1,20 +1,27 @@
 *** Settings ***
-Documentation     Test suite for callhome TLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           Collections
-Library           OperatingSystem
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for callhome TLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add an USC TLS callhome channel
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    tcp=true    port=${ECHO_SERVER_PORT}    remote=false
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    tcp=true
+    ...    port=${ECHO_SERVER_PORT}
+    ...    remote=false
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     ${data}    json.dumps    ${input}
@@ -38,7 +45,11 @@ Check added Channel
 
 Send Messages
     [Documentation]    Send test messages multiple times
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${ECHO_SERVER_PORT}    tcp=true    content=${TEST_MESSAGE}
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    port=${ECHO_SERVER_PORT}
+    ...    tcp=true
+    ...    content=${TEST_MESSAGE}
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     FOR    ${index}    IN RANGE    0    ${NUM_OF_MESSAGES}
index 7392e44bc1f94023d551101a0790184f83dd3476..bc4c7928a2163ae924fa5b5ea8a382d6a026acf6 100644 (file)
@@ -1,4 +1,6 @@
 *** Settings ***
-Suite Setup       Download Tools
-Force Tags        TCP
-Resource          ../../../libraries/UscUtils.robot
+Resource        ../../../libraries/UscUtils.robot
+
+Suite Setup     Download Tools
+
+Force Tags      tcp
index 412aa7906d4012cdbb27bbad130e0e570c05c1db..295e91c338790fa3460e71b42b517cdbebb39fc5 100644 (file)
@@ -1,20 +1,27 @@
 *** Settings ***
-Documentation     Test suite for an USC DTLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Test Timeout      1min
-Library           Collections
-Library           OperatingSystem
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for an USC DTLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+Test Timeout        1min
+
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add an USC DTLS channel
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    tcp=false    port=${ECHO_SERVER_PORT}    remote=false
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    tcp=false
+    ...    port=${ECHO_SERVER_PORT}
+    ...    remote=false
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     ${data}    json.dumps    ${input}
@@ -37,7 +44,11 @@ Check added Channel
 
 Send Messages
     [Documentation]    Send test messages multiple times to multiple sessions
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${ECHO_SERVER_PORT}    tcp=false    content=${TEST_MESSAGE}
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    port=${ECHO_SERVER_PORT}
+    ...    tcp=false
+    ...    content=${TEST_MESSAGE}
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     FOR    ${index}    IN RANGE    0    ${NUM_OF_MESSAGES}
index 8c0ccfb7c918ce9b1d92d797dc43dc7868dafad0..5e4711f1fa11d707554d80bca20c64f35d9ebeb2 100644 (file)
@@ -1,10 +1,9 @@
 *** Settings ***
-Documentation     Test suite for an USC DTLS channel
-Suite Setup       Start UDP
-Suite Teardown    Stop Agent_Echo
-Force Tags        110_UDP
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for an USC DTLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start UDP
+Suite Teardown      Stop Agent_Echo
+
+Force Tags          110_udp
index 533389fbf5d04954b4c71cdbcac4cf86dff15c73..f9014d9d89db53bcd59ae3424381b98604d3707a 100644 (file)
@@ -1,24 +1,29 @@
 *** Settings ***
-Documentation     Test suite for multiple sessions in an USC TLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Test Timeout      1min
-Library           Collections
-Library           OperatingSystem
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for multiple sessions in an USC TLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+Test Timeout        1min
 
-*** Variables ***
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add multiple USC DTLS channels
     FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-        ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${port_index}    tcp=false    remote=false
+        ${content}    Create Dictionary
+        ...    hostname=${TOOLS_SYSTEM_IP}
+        ...    port=${port_index}
+        ...    tcp=false
+        ...    remote=false
         ${channel}    Create Dictionary    channel=${content}
         ${input}    Create Dictionary    input=${channel}
         ${data}    json.dumps    ${input}
@@ -44,7 +49,11 @@ Check added Channel
 Send Messages
     [Documentation]    Send test messages multiple times
     FOR    ${port_index}    IN    @{LIST_ECHO_SERVER_PORT}
-        ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${port_index}    tcp=false    content=${TEST_MESSAGE}
+        ${content}    Create Dictionary
+        ...    hostname=${TOOLS_SYSTEM_IP}
+        ...    port=${port_index}
+        ...    tcp=false
+        ...    content=${TEST_MESSAGE}
         ${channel}    Create Dictionary    channel=${content}
         ${input}    Create Dictionary    input=${channel}
         Send Now    ${input}
@@ -100,6 +109,7 @@ Check Channel
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Contain    ${resp.content}    "topology"
 
+
 *** Keywords ***
 Send Now
     [Arguments]    ${body}
index 1e8623ea2bd1944eb071e66c2eb6cd06b7e7a621..db5514246cd55cbea767c7eeb367ee131e972f64 100644 (file)
@@ -1,10 +1,9 @@
 *** Settings ***
-Documentation     Test suite for multiple sessions in an USC DTLS channel
-Suite Setup       Start Multiple_Sessions_UDP
-Suite Teardown    Stop One_Agent_Multiple_Echo
-Force Tags        Multiple_Sessions_UDP
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for multiple sessions in an USC DTLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start Multiple_Sessions_UDP
+Suite Teardown      Stop One_Agent_Multiple_Echo
+
+Force Tags          multiple_sessions_udp
index 40869064ff7fd1105eb485723033acf42387f7ce..cca158b16167c7dacfd1ccb4c7937d5128a402b1 100644 (file)
@@ -1,21 +1,28 @@
 *** Settings ***
-Documentation     Test suite for callhome DTLS channel
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Test Timeout      1 minute
-Library           Collections
-Library           OperatingSystem
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           json
-Library           ../../../../libraries/Common.py
-Variables         ../../../../variables/Variables.py
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for callhome DTLS channel
+
+Library             Collections
+Library             OperatingSystem
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             json
+Library             ../../../../libraries/Common.py
+Variables           ../../../../variables/Variables.py
+Resource            ../../../../libraries/UscUtils.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+Test Timeout        1 minute
+
 
 *** Test Cases ***
 Add Channel
     [Documentation]    Add an USC TLS callhome channel
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    tcp=false    port=${ECHO_SERVER_PORT}    remote=false
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    tcp=false
+    ...    port=${ECHO_SERVER_PORT}
+    ...    remote=false
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     ${data}    json.dumps    ${input}
@@ -39,7 +46,11 @@ Check added Channel
 
 Send Messages
     [Documentation]    Send test messages multiple times
-    ${content}    Create Dictionary    hostname=${TOOLS_SYSTEM_IP}    port=${ECHO_SERVER_PORT}    tcp=false    content=${TEST_MESSAGE}
+    ${content}    Create Dictionary
+    ...    hostname=${TOOLS_SYSTEM_IP}
+    ...    port=${ECHO_SERVER_PORT}
+    ...    tcp=false
+    ...    content=${TEST_MESSAGE}
     ${channel}    Create Dictionary    channel=${content}
     ${input}    Create Dictionary    input=${channel}
     FOR    ${index}    IN RANGE    0    ${NUM_OF_MESSAGES}
index e0ae8b5d7d32cc427b533c76afd3bc85ae15e87c..1501ef39fcdb5682956d6220090a9d9a8f4b0784 100644 (file)
@@ -1,10 +1,9 @@
 *** Settings ***
-Documentation     Test suite for callhome DTLS channel
-Suite Setup       Start CALLHOME_UDP
-Suite Teardown    Stop Agent_Echo
-Force Tags        UDP_CALLHOME
-Resource          ../../../../libraries/UscUtils.robot
+Documentation       Test suite for callhome DTLS channel
 
-*** Variables ***
+Resource            ../../../../libraries/UscUtils.robot
 
-*** Keywords ***
+Suite Setup         Start CALLHOME_UDP
+Suite Teardown      Stop Agent_Echo
+
+Force Tags          udp_callhome
index fcac8a354f1bcaab39f826c23d824b1065a60606..236273aa83fc8d4182c5cee4c940a82d9d411f9d 100644 (file)
@@ -1,4 +1,6 @@
 *** Settings ***
-Suite Setup       Download Tools
-Force Tags        UDP
-Resource          ../../../libraries/UscUtils.robot
+Resource        ../../../libraries/UscUtils.robot
+
+Suite Setup     Download Tools
+
+Force Tags      udp
index f91d0df288dcaf40e3e0fecc50292dc9d98fb6ce..44a3a9113c08a5caf75225dcfb4b6dedac9c742f 100644 (file)
@@ -1,28 +1,54 @@
 *** Settings ***
-Documentation     Test Suite that, verifies the features and corresponding bundles are installed.
-Resource          ../../libraries/KarafKeywords.robot
+Documentation       Test Suite that, verifies the features and corresponding bundles are installed.
+
+Resource            ../../libraries/KarafKeywords.robot
+
 
 *** Variables ***
-@{FEATURE_LIST}    odl-vpnservice-api    odl-vpnservice-impl    odl-vpnservice-impl-rest    odl-vpnservice-impl-ui    odl-vpnservice-core
-@{BUNDLE_LIST}    org.opendaylight.vpnservice.vpnmanager-impl    org.opendaylight.vpnservice.interfacemgr-impl    org.opendaylight.vpnservice.nexthopmgr-impl    org.opendaylight.vpnservice.idmanager-impl    org.opendaylight.vpnservice.fibmanager-impl    org.opendaylight.vpnservice.bgpmanager-impl    org.opendaylight.vpnservice.model-bgp
-@{MESSAGE_STRING_LIST}    VpnserviceProvider Session Initiated    InterfacemgrProvider Session Initiated    NexthopmgrProvider Session Initiated    IDManagerserviceProvider Session Initiated    FibManagerProvider Session Initiated    BgpManager Session Initiated
+@{FEATURE_LIST}
+...                         odl-vpnservice-api
+...                         odl-vpnservice-impl
+...                         odl-vpnservice-impl-rest
+...                         odl-vpnservice-impl-ui
+...                         odl-vpnservice-core
+@{BUNDLE_LIST}
+...                         org.opendaylight.vpnservice.vpnmanager-impl
+...                         org.opendaylight.vpnservice.interfacemgr-impl
+...                         org.opendaylight.vpnservice.nexthopmgr-impl
+...                         org.opendaylight.vpnservice.idmanager-impl
+...                         org.opendaylight.vpnservice.fibmanager-impl
+...                         org.opendaylight.vpnservice.bgpmanager-impl
+...                         org.opendaylight.vpnservice.model-bgp
+@{MESSAGE_STRING_LIST}
+...                         VpnserviceProvider Session Initiated
+...                         InterfacemgrProvider Session Initiated
+...                         NexthopmgrProvider Session Initiated
+...                         IDManagerserviceProvider Session Initiated
+...                         FibManagerProvider Session Initiated
+...                         BgpManager Session Initiated
+
 
 *** Test Cases ***
 Verify if the VPN Service features are installed for vpnservice
     [Documentation]    Executes command "feature list -i | grep <feature_name>" in karaf console and checks if output \ contain \ the specific features.
-    [Tags]    Verify Feature
+    [Tags]    verify feature
     FOR    ${feature}    IN    @{FEATURE_LIST}
         Verify Feature Is Installed    ${feature}
     END
 
 Verify if the VPN Service bundles are loaded
     [Documentation]    Executes command "bundle:list -s | grep <bundle name>" and checks in the output for the specific bundles
-    [Tags]    Verify VPN bundles
+    [Tags]    verify vpn bundles
     FOR    ${bundle}    IN    @{BUNDLE_LIST}
         Verify Bundle Is Installed    ${bundle}
     END
 
 Verify if the sessions for bundles got initiated
     [Documentation]    Executes"log:display | grep vpnservice" command in karaf console and verifies the logs for session initiation
-    [Tags]    Verify Session
-    Wait Until Keyword Succeeds    240 seconds    30 seconds    Check Karaf Log Has Messages    vpnservice    @{MESSAGE_STRING_LIST}
+    [Tags]    verify session
+    Wait Until Keyword Succeeds
+    ...    240 seconds
+    ...    30 seconds
+    ...    Check Karaf Log Has Messages
+    ...    vpnservice
+    ...    @{MESSAGE_STRING_LIST}
index 15d1a02c60896d8a6b91a1c87e96c69b53d578e3..72b0249ac4ca5f88fc5ebfe52c1690fae8bed68f 100644 (file)
@@ -1,36 +1,60 @@
 *** Settings ***
-Documentation     Test Suite for vpn instance
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Library           OperatingSystem
-Library           String
-Library           RequestsLibrary
-Variables         ../../variables/Variables.py
-Library           Collections
-Resource          CompareStream.robot
+Documentation       Test Suite for vpn instance
+
+Library             OperatingSystem
+Library             String
+Library             RequestsLibrary
+Variables           ../../variables/Variables.py
+Library             Collections
+Resource            CompareStream.robot
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${REST_CON}       /restconf/config/
-@{vpn_inst_values}    testVpn1    1000:1    1000:1,2000:1    3000:1,4000:1
-@{vm_int_values}    s1-eth1    l2vlan    openflow:1:1
-@{vm_vpnint_values}    s1-eth1    testVpn1    10.0.0.1    12:f8:57:a8:b9:a1
-${VPN_CONFIG_DIR}    ${CURDIR}/../../variables/vpnservice
+${REST_CON}             /restconf/config/
+@{vpn_inst_values}      testVpn1    1000:1    1000:1,2000:1    3000:1,4000:1
+@{vm_int_values}        s1-eth1    l2vlan    openflow:1:1
+@{vm_vpnint_values}     s1-eth1    testVpn1    10.0.0.1    12:f8:57:a8:b9:a1
+${VPN_CONFIG_DIR}       ${CURDIR}/../../variables/vpnservice
+
 
 *** Test Cases ***
 Create VPN Instance
     [Documentation]    Creates VPN Instance through restconf
-    [Tags]    Post
+    [Tags]    post
     ${body}    OperatingSystem.Get File    ${VPN_CONFIG_DIR}/vpn_instance.json
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn:vpn-instances/    data=${body}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/    data=${body}
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-instances/
+    ...    data=${body}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/
+    ...    data=${body}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify VPN instance
     [Documentation]    Verifies the vpn instance is created
-    [Tags]    Get
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/    headers=${ACCEPT_XML}
+    [Tags]    get
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}
     FOR    ${value}    IN    @{vpn_inst_values}
@@ -39,15 +63,18 @@ Verify VPN instance
 
 Create ietf vm interface
     [Documentation]    Creates ietf interface through the restconf
-    [Tags]    Post
+    [Tags]    post
     ${body}    OperatingSystem.Get File    ${VPN_CONFIG_DIR}/vm_interface.json
     ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}ietf-interfaces:interfaces/    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify ietf vm interface
     [Documentation]    Verifies ietf interface created
-    [Tags]    Get
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}/    headers=${ACCEPT_XML}
+    [Tags]    get
+    ${resp}    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}
     FOR    ${value}    IN    @{vm_int_values}
@@ -56,17 +83,37 @@ Verify ietf vm interface
 
 Create VPN interface
     [Documentation]    Creates vpn interface for the corresponding ietf interface
-    [Tags]    Post
+    [Tags]    post
     ${body}    OperatingSystem.Get File    ${VPN_CONFIG_DIR}/vm_vpninterface.json
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn:vpn-interfaces/    data=${body}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/    data=${body}
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-interfaces/
+    ...    data=${body}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/
+    ...    data=${body}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify VPN interface
     [Documentation]    Verifies the vpn interface created
-    [Tags]    Get
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn:vpn-interfaces/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/    headers=${ACCEPT_XML}
+    [Tags]    get
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}
     FOR    ${value}    IN    @{vm_vpnint_values}
@@ -75,67 +122,115 @@ Verify VPN interface
 
 Verify FIB entry after create
     [Documentation]    Verifies the fib entry for the corresponding vpn interface
-    [Tags]    Get
+    [Tags]    get
     Wait Until Keyword Succeeds    5s    1s    Ensure The Fib Entry Is Present    ${vm_vpnint_values[2]}
 
 Delete vm vpn interface
     [Documentation]    Deletes the vpn interface
-    [Tags]    Delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}l3vpn:vpn-interfaces/
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/
+    [Tags]    delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-interfaces/
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleteing vm vpn interface
     [Documentation]    Verifies vpn interface after delete
-    [Tags]    Verify after delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn:vpn-interfaces/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/    headers=${ACCEPT_XML}
+    [Tags]    verify after delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete VPN Instance
     [Documentation]    Deletes the VPN Instance
-    [Tags]    Delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Delete Requestt    session    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    [Tags]    delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Requestt
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting the vpn instance
     [Documentation]    Verifies after deleting the vpn instance
-    [Tags]    Verfiy after delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/    headers=${ACCEPT_XML}
+    [Tags]    verfiy after delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}l3vpn-instances-interfaces:vpn-instances/vpn-instance/${vpn_inst_values[0]}/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete vm ietf interface
     [Documentation]    Deletes the ietf interface
-    [Tags]    Delete
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}
+    [Tags]    delete
+    ${resp}    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting vm ietf interface
     [Documentation]    Verifies ietf interface after delete
-    [Tags]    Verify after delete
-    ${resp}    RequestsLibrary.Get Request    session    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}    headers=${ACCEPT_XML}
+    [Tags]    verify after delete
+    ${resp}    RequestsLibrary.Get Request
+    ...    session
+    ...    ${REST_CON}ietf-interfaces:interfaces/interface/${vm_int_values[0]}
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Verify FIB entry after delete
     [Documentation]    Verifies the fib entry is deleted for the corresponding vpn interface
-    [Tags]    Get
+    [Tags]    get
     Wait Until Keyword Succeeds    5s    1s    Ensure The Fib Entry Is Removed    ${vm_vpnint_values[2]}
 
+
 *** Keywords ***
 Ensure The Fib Entry Is Present
-    [Arguments]    ${prefix}
     [Documentation]    Will succeed if the fib entry is present for the vpn
-    ${resp}    RequestsLibrary.Get Request    session    /restconf/operational/odl-fib:fibEntries/    headers=${ACCEPT_XML}
+    [Arguments]    ${prefix}
+    ${resp}    RequestsLibrary.Get Request
+    ...    session
+    ...    /restconf/operational/odl-fib:fibEntries/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     Log    ${resp.content}
     Should Contain    ${resp.content}    ${prefix}
     Should Contain    ${resp.content}    label
 
 Ensure the Fib Entry Is Removed
-    [Arguments]    ${prefix}
     [Documentation]    Will succeed if the fib entry is removed for the vpn
-    ${resp}    RequestsLibrary.Get Request    session    /restconf/operational/odl-fib:fibEntries/    headers=${ACCEPT_XML}
+    [Arguments]    ${prefix}
+    ${resp}    RequestsLibrary.Get Request
+    ...    session
+    ...    /restconf/operational/odl-fib:fibEntries/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    200
     Should Not Contain    ${resp.content}    ${prefix}
index 5890cef8eb827562ef1b9e8c834c11a77ff1f027..f238c6402dbd5c402f432fbfe8a6ccd2540776ab 100644 (file)
@@ -1,23 +1,47 @@
 *** Settings ***
-Documentation     Test Suite for vpn instance
-Suite Setup       Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-Suite Teardown    Delete All Sessions
-Variables         ../../variables/vpnservice/configureSwitches.py    ${TOOLS_SYSTEM_IP}    ${TOOLS_SYSTEM_2_IP}
-Library           SSHLibrary
-Variables         ../../variables/Variables.py
-Resource          ../../libraries/Utils.robot
-Library           RequestsLibrary
+Documentation       Test Suite for vpn instance
+
+Variables           ../../variables/vpnservice/configureSwitches.py    ${TOOLS_SYSTEM_IP}    ${TOOLS_SYSTEM_2_IP}
+Library             SSHLibrary
+Variables           ../../variables/Variables.py
+Resource            ../../libraries/Utils.robot
+Library             RequestsLibrary
+
+Suite Setup         Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
+Suite Teardown      Delete All Sessions
+
 
 *** Variables ***
-${REST_CON}       /restconf/config
-@{vpn_inst_values}    testVpn1    100:1    200:1    300:1    testVpn2    400:1    500:1
-...               600:1
-@{ietf_int_values}    s1-eth1    s1-eth2    s1-gre1    s2-eth1    s2-eth2    s2-gre1
-@{vpn_int_values}    s1-eth1    testVpn1    10.0.0.1    00:00:00:00:00:01    s1-eth2    10.0.0.2    00:00:00:00:00:02
-...               s2-eth1    10.0.0.3    00:00:00:00:00:03    testVpn2    s2-eth2    10.0.0.4    00:00:00:00:00:04
-${REST_OPER}      /restconf/operational
-@{NODE_ELEMENTS}    openflow:1    openflow:1:1    openflow:1:2    openflow:1:3    openflow:2    openflow:2:1    openflow:2:2
-...               openflow:2:3
+${REST_CON}             /restconf/config
+@{vpn_inst_values}      testVpn1    100:1    200:1    300:1    testVpn2    400:1    500:1
+...                     600:1
+@{ietf_int_values}      s1-eth1    s1-eth2    s1-gre1    s2-eth1    s2-eth2    s2-gre1
+@{vpn_int_values}
+...                     s1-eth1
+...                     testVpn1
+...                     10.0.0.1
+...                     00:00:00:00:00:01
+...                     s1-eth2
+...                     10.0.0.2
+...                     00:00:00:00:00:02
+...                     s2-eth1
+...                     10.0.0.3
+...                     00:00:00:00:00:03
+...                     testVpn2
+...                     s2-eth2
+...                     10.0.0.4
+...                     00:00:00:00:00:04
+${REST_OPER}            /restconf/operational
+@{NODE_ELEMENTS}
+...                     openflow:1
+...                     openflow:1:1
+...                     openflow:1:2
+...                     openflow:1:3
+...                     openflow:2
+...                     openflow:2:1
+...                     openflow:2:2
+...                     openflow:2:3
+
 
 *** Test Cases ***
 Veirfy The Switches
@@ -26,126 +50,286 @@ Veirfy The Switches
 
 Create VPN Instances
     [Documentation]    Creates VPN Instances through restconf
-    [Tags]    Post
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}/l3vpn:vpn-instances/    data=${vpn_instances}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/    data=${vpn_instances}
+    [Tags]    post
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-instances/
+    ...    data=${vpn_instances}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/
+    ...    data=${vpn_instances}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify VPN instances
     [Documentation]    Verifies the vpn instances in the datastores
-    [Tags]    Get
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_CON}/l3vpn:vpn-instances/    ${vpn_inst_values}
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_OPER}/l3vpn:vpn-instances/    ${vpn_inst_values}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/    ${vpn_inst_values}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_OPER}/l3vpn-instances-interfaces:vpn-instances/    ${vpn_inst_values}
+    [Tags]    get
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CON}/l3vpn:vpn-instances/
+    ...    ${vpn_inst_values}
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/l3vpn:vpn-instances/
+    ...    ${vpn_inst_values}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/
+    ...    ${vpn_inst_values}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/l3vpn-instances-interfaces:vpn-instances/
+    ...    ${vpn_inst_values}
 
 Create ietf interfaces
     [Documentation]    Creates ietf interfaces through the restconf
-    [Tags]    Post
-    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}/ietf-interfaces:interfaces/    data=${ietf_interfaces}
+    [Tags]    post
+    ${resp}=    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}/ietf-interfaces:interfaces/
+    ...    data=${ietf_interfaces}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify ietf interfaces
     [Documentation]    Verifies ietf interfaces created in datastores
-    [Tags]    Get
-    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_CON}/ietf-interfaces:interfaces/    ${ietf_int_values}
-    Wait Until Keyword Succeeds    5s    1s    Check For Elements At URI    ${REST_OPER}/ietf-interfaces:interfaces-state/    ${ietf_int_values}
+    [Tags]    get
+    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CON}/ietf-interfaces:interfaces/
+    ...    ${ietf_int_values}
+    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/ietf-interfaces:interfaces-state/
+    ...    ${ietf_int_values}
     @{state}=    Create List    down
-    Wait Until Keyword Succeeds    2s    1s    Check For Elements Not At URI    ${REST_OPER}/ietf-interfaces:interfaces-state/    ${state}
+    Wait Until Keyword Succeeds
+    ...    2s
+    ...    1s
+    ...    Check For Elements Not At URI
+    ...    ${REST_OPER}/ietf-interfaces:interfaces-state/
+    ...    ${state}
 
 Create VPN interfaces
     [Documentation]    Creates vpn interface for the corresponding ietf interface
-    [Tags]    Post
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}/l3vpn:vpn-interfaces/    data=${vpn_instances}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Post Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/    data=${vpn_instances}
+    [Tags]    post
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-interfaces/
+    ...    data=${vpn_instances}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Post Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/
+    ...    data=${vpn_instances}
     Should Be Equal As Strings    ${resp.status_code}    204
 
 Verify VPN interfaces
     [Documentation]    Verifies the vpn interfaces created in datastores
-    [Tags]    Get
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_CON}/l3vpn:vpn-interfaces/    ${vpn_int_values}
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_OPER}/l3vpn:vpn-interfaces/    ${vpn_int_values}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/    ${vpn_int_values}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_OPER}/l3vpn-instances-interfaces:vpn-interfaces/    ${vpn_int_values}
+    [Tags]    get
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CON}/l3vpn:vpn-interfaces/
+    ...    ${vpn_int_values}
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/l3vpn:vpn-interfaces/
+    ...    ${vpn_int_values}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/
+    ...    ${vpn_int_values}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/l3vpn-instances-interfaces:vpn-interfaces/
+    ...    ${vpn_int_values}
 
 Verify FIB entries after create
     [Documentation]    Verifies the fib entries in the operational DS for the corresponding vpn interfaces
-    [Tags]    Get
+    [Tags]    get
     @{fib_entries1}=    Create List    ${vpn_int_values[2]}    ${vpn_int_values[8]}
     @{fib_entries2}=    Create List    ${vpn_int_values[5]}    ${vpn_int_values[12]}
-    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_OPER}/odl-fib:fibEntries/vrfTables/${vpn_inst_values[1]}    ${fib_entries1}
-    Wait Until Keyword Succeeds    3s    1s    Check For Elements At URI    ${REST_OPER}/odl-fib:fibEntries/vrfTables/${vpn_inst_values[5]}    ${fib_entries2}
+    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/odl-fib:fibEntries/vrfTables/${vpn_inst_values[1]}
+    ...    ${fib_entries1}
+    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements At URI
+    ...    ${REST_OPER}/odl-fib:fibEntries/vrfTables/${vpn_inst_values[5]}
+    ...    ${fib_entries2}
 
 Verify flows
     [Documentation]    Verify flows in the switches
     [Tags]    verify in switch
-    @{flow_elements}    Create List    ${vpn_int_values[2]}    ${vpn_int_values[5]}    ${vpn_int_values[8]}    ${vpn_int_values[12]}
+    @{flow_elements}=    Create List
+    ...    ${vpn_int_values[2]}
+    ...    ${vpn_int_values[5]}
+    ...    ${vpn_int_values[8]}
+    ...    ${vpn_int_values[12]}
     Wait Until Keyword Succeeds    6s    2s    Ensure Flows Are Present    ${mininet1_conn_id_1}    ${flow_elements}
     Wait Until Keyword Succeeds    6s    2s    Ensure Flows Are Present    ${mininet2_conn_id_1}    ${flow_elements}
 
 Verify groups
     [Documentation]    Verify groups in the switches
     [Tags]    verify in switch
-    @{group_elements1}    Create List    ${vpn_int_values[3]}    ${vpn_int_values[6]}
-    @{group_elements2}    Create List    ${vpn_int_values[9]}    ${vpn_int_values[13]}
-    Wait Until Keyword Succeeds    5s    1s    Ensure Groups Are Present    ${mininet1_conn_id_1}    ${group_elements1}    3
-    Wait Until Keyword Succeeds    5s    1s    Ensure Groups Are Present    ${mininet2_conn_id_1}    ${group_elements2}    3
+    @{group_elements1}=    Create List    ${vpn_int_values[3]}    ${vpn_int_values[6]}
+    @{group_elements2}=    Create List    ${vpn_int_values[9]}    ${vpn_int_values[13]}
+    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Ensure Groups Are Present
+    ...    ${mininet1_conn_id_1}
+    ...    ${group_elements1}
+    ...    3
+    Wait Until Keyword Succeeds
+    ...    5s
+    ...    1s
+    ...    Ensure Groups Are Present
+    ...    ${mininet2_conn_id_1}
+    ...    ${group_elements2}
+    ...    3
 
 Verify ping
     [Documentation]    Verifies the ping between the two hosts. Ping should succeed between hosts in same vpn, (h1,h3) and (h2,h4).Ping between hosts in different vpns should fail (h1,h2) & (h3,h4). The commented out section is to be uncommented when ovs supports mpls over gre in datapath
     [Tags]    verify in switch
     Switch Connection    ${mininet1_conn_id_1}
     Write    h1 ping h2 -c 5
-    ${result}    Read Until    mininet>
+    ${result}=    Read Until    mininet>
     Log    ${result}
     Should Contain    ${result}    100% packet loss
 
 Delete vpn interfaces
     [Documentation]    Deletes the vpn interfaces
-    [Tags]    Delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/l3vpn:vpn-interfaces/
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/
+    [Tags]    delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-interfaces/
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting vpn interfaces
     [Documentation]    Verifies if vpn interfaces are deleted
-    [Tags]    Verify after delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.get Request    session    ${REST_CON}/l3vpn:vpn-interfaces/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.get Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/    headers=${ACCEPT_XML}
+    [Tags]    verify after delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.get Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.get Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-interfaces/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete ietf interfaces
     [Documentation]    Deletes the ietf interfaces
-    [Tags]    Delete
-    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/ietf-interfaces:interfaces/
+    [Tags]    delete
+    ${resp}=    RequestsLibrary.Delete Request    session    ${REST_CON}/ietf-interfaces:interfaces/
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting ietf interfaces
     [Documentation]    Verifies if ietf interfaces are deleted
-    [Tags]    Verify after delete
-    ${resp}    RequestsLibrary.get Request    session    ${REST_CON}/ietf-interfaces:interfaces/    headers=${ACCEPT_XML}
+    [Tags]    verify after delete
+    ${resp}=    RequestsLibrary.get Request
+    ...    session
+    ...    ${REST_CON}/ietf-interfaces:interfaces/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Delete VPN Instances
     [Documentation]    Deletes the VPN Instances
-    [Tags]    Delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/l3vpn:vpn-instances/
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.Delete Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/
+    [Tags]    delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-instances/
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.Delete Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify after deleting the vpn instances
     [Documentation]    Verifies after deleting the vpn instances
-    [Tags]    Verfiy after delete
-    CompareStream.Run_Keyword_If_Less_Than_Magnesium    ${resp}    RequestsLibrary.get Request    session    ${REST_CON}/l3vpn:vpn-instances/    headers=${ACCEPT_XML}
-    CompareStream.Run_Keyword_If_At_Least_Magnesium    ${resp}    RequestsLibrary.get Request    session    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/    headers=${ACCEPT_XML}
+    [Tags]    verfiy after delete
+    CompareStream.Run_Keyword_If_Less_Than_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.get Request
+    ...    session
+    ...    ${REST_CON}/l3vpn:vpn-instances/
+    ...    headers=${ACCEPT_XML}
+    CompareStream.Run_Keyword_If_At_Least_Magnesium
+    ...    ${resp}
+    ...    RequestsLibrary.get Request
+    ...    session
+    ...    ${REST_CON}/l3vpn-instances-interfaces:vpn-instances/
+    ...    headers=${ACCEPT_XML}
     Should Be Equal As Strings    ${resp.status_code}    404
 
 Verify FIB entries after delete
     [Documentation]    Verifies if the fib entries are deleted in the operational DS
-    [Tags]    Get
-    @{fib_entries}=    Create List    ${vpn_int_values[2]}    ${vpn_int_values[5]}    ${vpn_int_values[8]}    ${vpn_int_values[12]}
-    Wait Until Keyword Succeeds    3s    1s    Check For Elements Not At URI    ${REST_OPER}/odl-fib:fibEntries/    ${fib_entries}
+    [Tags]    get
+    @{fib_entries}=    Create List
+    ...    ${vpn_int_values[2]}
+    ...    ${vpn_int_values[5]}
+    ...    ${vpn_int_values[8]}
+    ...    ${vpn_int_values[12]}
+    Wait Until Keyword Succeeds
+    ...    3s
+    ...    1s
+    ...    Check For Elements Not At URI
+    ...    ${REST_OPER}/odl-fib:fibEntries/
+    ...    ${fib_entries}
 
 Verify flows after delete
     [Documentation]    Verify if the flows are deleted from the switch
@@ -154,10 +338,11 @@ Verify flows after delete
     Wait Until Keyword Succeeds    12s    2s    Ensure Flows Are Removed    ${mininet1_conn_id_1}
     Wait Until Keyword Succeeds    12s    2s    Ensure Flows Are Removed    ${mininet2_conn_id_1}
 
+
 *** Keywords ***
 Ensure Flows Are Present
-    [Arguments]    ${conn_id}    ${flow_elements}
     [Documentation]    Succeeds if the flows for vpn service are present
+    [Arguments]    ${conn_id}    ${flow_elements}
     Switch Connection    ${conn_id}
     Write    dpctl dump-flows -O OpenFlow13
     ${output}=    Read Until    mininet>
@@ -171,8 +356,8 @@ Ensure Flows Are Present
     END
 
 Ensure Groups Are Present
-    [Arguments]    ${conn_id}    ${group_elements}    ${gre_port_id}
     [Documentation]    Succeeds if the groups for the vpn service are present
+    [Arguments]    ${conn_id}    ${group_elements}    ${gre_port_id}
     Switch Connection    ${conn_id}
     Write    dpctl dump-groups -O OpenFlow13
     ${output}=    Read Until    mininet>
@@ -183,8 +368,8 @@ Ensure Groups Are Present
     END
 
 Ensure Flows Are Removed
-    [Arguments]    ${conn_id}
     [Documentation]    Succeeds if the flows are removed from the switch
+    [Arguments]    ${conn_id}
     Switch Connection    ${conn_id}
     Write    dpctl dump-flows -O OpenFlow13
     ${output}=    Read Until    mininet>
@@ -195,8 +380,8 @@ Ensure Flows Are Removed
     Should Not contain    ${output}    table=21
 
 Ensure Groups Are Removed
-    [Arguments]    ${conn_id}
     [Documentation]    Succeeds if the group entries are removed from switch
+    [Arguments]    ${conn_id}
     Switch Connection    ${conn_id}
     Write    dpctl dump-groups -O OpenFlow13
     ${output}=    Read Until    mininet>
index c0186da7504688aae803e3d821fd18e2865461a2..13702a5f0f9b37c105c2c5457a575162fa97ab7d 100644 (file)
@@ -1,15 +1,21 @@
 *** Settings ***
-Documentation     Test suite for Inventory Scalability
-Suite Setup       Start Suite
-Suite Teardown    Stop Suite
-Library           SSHLibrary
-Library           ../../libraries/Common.py
-Variables         ../../variables/Variables.py
-Resource          ../../libraries/Utils.robot
+Documentation       Test suite for Inventory Scalability
+
+Library             SSHLibrary
+Library             ../../libraries/Common.py
+Variables           ../../variables/Variables.py
+Resource            ../../libraries/Utils.robot
+
+Suite Setup         Start Suite
+Suite Teardown      Stop Suite
+
 
 *** Variables ***
-${start1}         sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch1 --switch ovsk,protocols=OpenFlow13
-${start2}         sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch2 --switch ovsk,protocols=OpenFlow13
+${start1}
+...             sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch1 --switch ovsk,protocols=OpenFlow13
+${start2}
+...             sudo mn \ --controller=remote,ip=${ODL_SYSTEM_IP} --custom custom.py --topo Switch2 --switch ovsk,protocols=OpenFlow13
+
 
 *** Keywords ***
 Start Suite
@@ -26,8 +32,9 @@ Start Suite
     ${mininet1_conn_id_2}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout= 30s
     Set Global Variable    ${mininet1_conn_id_2}
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Execute Command    sudo ovs-vsctl add-port s1 s1-gre1 -- set interface s1-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_2_IP} options:local_ip=${TOOLS_SYSTEM_IP}
-    ${output}    Execute Command    sudo ovs-vsctl show
+    Execute Command
+    ...    sudo ovs-vsctl add-port s1 s1-gre1 -- set interface s1-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_2_IP} options:local_ip=${TOOLS_SYSTEM_IP}
+    ${output}=    Execute Command    sudo ovs-vsctl show
     Log    ${output}
     Execute Command    sudo ovs-ofctl add-flow s1 -O OpenFlow13 arp,actions=FLOOD
     ${mininet2_conn_id_1}=    Open Connection    ${TOOLS_SYSTEM_2_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=30s
@@ -40,8 +47,9 @@ Start Suite
     ${mininet2_conn_id_2}=    Open Connection    ${TOOLS_SYSTEM_2_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout= 30s
     Set Global Variable    ${mininet2_conn_id_2}
     Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
-    Execute Command    sudo ovs-vsctl add-port s2 s2-gre1 -- set interface s2-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_IP} options:local_ip=${TOOLS_SYSTEM_2_IP}
-    ${output}    Execute Command    sudo ovs-vsctl show
+    Execute Command
+    ...    sudo ovs-vsctl add-port s2 s2-gre1 -- set interface s2-gre1 type=gre options:remote_ip=${TOOLS_SYSTEM_IP} options:local_ip=${TOOLS_SYSTEM_2_IP}
+    ${output}=    Execute Command    sudo ovs-vsctl show
     Log    ${output}
     Execute Command    sudo ovs-ofctl add-flow s2 -O OpenFlow13 arp,actions=FLOOD
 
index d2444a727837af7eca78b68a5dcb447605a9223f..9332529614f2c8ac2e8bbc0d2deab3ce720bdb0b 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Test if VTNC is ready
index 10d1c3da5399203fda4cd762445f26708ddcb8c0..a6f71d5c94147865f5a630eee05323edd98c1176 100644 (file)
@@ -1,6 +1,8 @@
 *** Settings ***
-Documentation     Test suite for VTNC Launch
-Suite Setup       Start SuiteVtnCo
-Suite Teardown    Stop SuiteVtnCo
-Library           SSHLibrary
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTNC Launch
+
+Library             SSHLibrary
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCo
+Suite Teardown      Stop SuiteVtnCo
index ecd9168f3ce4c3c09f1d8bd43d04f569749dee8d..a2a6363710477df1b8db8ba3ca24a5ba601a8cf7 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index 0a2c3911381f29ae21f78875b9eda38278787df1..c5dda0f7742694bea935fe2003e841f674030cee 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index b982353c334c074ec513db7129d62aa6b545d7a5..8087e054580c63fa466b0d5de0ab6986fabd7082 100644 (file)
@@ -1,9 +1,12 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
-Resource          ../../../libraries/WaitForFailure.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+Resource            ../../../libraries/WaitForFailure.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller with Invalid IP
@@ -12,7 +15,12 @@ Add a ODL Controller with Invalid IP
 
 Verify the Controller Status is down
     [Documentation]    Check Controller status
-    WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout    12s    1s    Check Controller Status    odc_test    down
+    WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout
+    ...    12s
+    ...    1s
+    ...    Check Controller Status
+    ...    odc_test
+    ...    down
 
 Add a Vtn Tenant1
     [Documentation]    Create Vtn Tenant1
index bf3e2676e46952fa25fe27bf1b9e496e0f588d60..bb4d4c57125ca9b3f2ff8116d9c081b2dd6cca38 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index d08125e8097015cdce112578d06933c4eb9a80c4..a68de5aeff7af3896ab0c9df946c9a94b27894a3 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index 8c6a63adae66c3cb3b0d2816fbc0063ac4b719b9..61c10b96f0576f0f4bd90cb671d149028d2544ff 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index f272ee8d9c0c2d759b7695bda86d0985e5e976b5..a64c089efff3c8e80fb6a184a6af03ab4b49bf59 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index 5e0a503399d94725dc470551441699e5e34ff8ea..4ffc44ad359a56bd10d57823a53b9ce0f6ff3567 100644 (file)
@@ -1,11 +1,12 @@
 *** Settings ***
-Documentation     Test suite for AD-SAL NSF
-Suite Setup       Start Mininet
-Suite Teardown    Delete All Sessions
-Library           SSHLibrary
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for AD-SAL NSF
 
-*** Variables ***
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
+Library             SSHLibrary
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start Mininet
+Suite Teardown      Delete All Sessions
 
-*** Keywords ***
+
+*** Variables ***
+${start}    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2
index ecd9168f3ce4c3c09f1d8bd43d04f569749dee8d..a2a6363710477df1b8db8ba3ca24a5ba601a8cf7 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index 0a2c3911381f29ae21f78875b9eda38278787df1..c5dda0f7742694bea935fe2003e841f674030cee 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index b982353c334c074ec513db7129d62aa6b545d7a5..8087e054580c63fa466b0d5de0ab6986fabd7082 100644 (file)
@@ -1,9 +1,12 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
-Resource          ../../../libraries/WaitForFailure.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+Resource            ../../../libraries/WaitForFailure.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller with Invalid IP
@@ -12,7 +15,12 @@ Add a ODL Controller with Invalid IP
 
 Verify the Controller Status is down
     [Documentation]    Check Controller status
-    WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout    12s    1s    Check Controller Status    odc_test    down
+    WaitForFailure.Verify_Keyword_Does_Not_Fail_Within_Timeout
+    ...    12s
+    ...    1s
+    ...    Check Controller Status
+    ...    odc_test
+    ...    down
 
 Add a Vtn Tenant1
     [Documentation]    Create Vtn Tenant1
index bf3e2676e46952fa25fe27bf1b9e496e0f588d60..bb4d4c57125ca9b3f2ff8116d9c081b2dd6cca38 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index d08125e8097015cdce112578d06933c4eb9a80c4..a68de5aeff7af3896ab0c9df946c9a94b27894a3 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index 8c6a63adae66c3cb3b0d2816fbc0063ac4b719b9..61c10b96f0576f0f4bd90cb671d149028d2544ff 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Coordinator
-Suite Setup       Start SuiteVtnCoTest
-Suite Teardown    Stop SuiteVtnCoTest
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for VTN Coordinator
+
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start SuiteVtnCoTest
+Suite Teardown      Stop SuiteVtnCoTest
+
 
 *** Test Cases ***
 Add a ODL Controller
index b9d3b60c6675ced39c1d6239838fb68227f4bd05..91eb7e959c3217bfbea30e59ddd6b5ff44022647 100644 (file)
@@ -1,11 +1,12 @@
 *** Settings ***
-Documentation     Test suite for AD-SAL NSF mininet OF13
-Suite Setup       Start Mininet
-Suite Teardown    Stop Mininet
-Library           SSHLibrary
-Resource          ../../../libraries/VtnCoKeywords.robot
+Documentation       Test suite for AD-SAL NSF mininet OF13
 
-*** Variables ***
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+Library             SSHLibrary
+Resource            ../../../libraries/VtnCoKeywords.robot
+
+Suite Setup         Start Mininet
+Suite Teardown      Stop Mininet
 
-*** Keywords ***
+
+*** Variables ***
+${start}    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
index 82d1869e5e4964b26c30c57c762b52f6babcc6ea..2f8a3501a6d9a2f5e398809d17e687c3c59edef2 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
index 376fb8b7f7abc981e79050a8467d179a4476f4d7..4280063c91b41ecf957eb78429ef9fd75a7cce35 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager Data Flow using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager Data Flow using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
index 20f6418b920751932c5522dd3d9510452e280ebe..72847671f231eedd1bc18f7b8b6d630b3aa846bb 100644 (file)
@@ -1,18 +1,30 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.3/32"},"index":"1"}]
-${flowfilterInetdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
-${flowfilterInetdropdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
-${flowfilterIcmpCodedata}    "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
-${flowfilterTpsrcTpdstdata}    "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
-${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
-${flowfilterdlsrc}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-dl-src-action": {"address":"00:00:00:00:00:11"}}],"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+${flowconditiondata}
+...                             "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.3/32"},"index":"1"}]
+${flowfilterInetdata}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
+${flowfilterInetdropdata}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
+${flowfilterIcmpCodedata}
+...                             "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
+${flowfilterTpsrcTpdstdata}
+...                             "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
+${flowfilterDscpdata}
+...                             "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
+${flowfilterdlsrc}
+...                             "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-dl-src-action": {"address":"00:00:00:00:00:11"}}],"index":"1"}]
+${flowfiltervlanpcp}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -90,7 +102,12 @@ Add a vtn flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vtn flowfilter
     [Documentation]    Verify vtn flowfilter actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{inet_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{inet_actions}
 
 Remove vtn Flowfilter index
     [Documentation]    Remove a index of vtn flowfilter
@@ -103,7 +120,12 @@ Add a vbr flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{inet_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{inet_actions}
 
 Remove vbr Flowfilter index
     [Documentation]    Remove a index of vbr flowfilter
@@ -116,7 +138,12 @@ Add a vbrif flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{inet_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{inet_actions}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
@@ -131,7 +158,12 @@ Add a vtn flowfilter with Icmp code
 Verify icmp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{icmp_action}
 
 Remove vtn Flowfilter index which has ICMP
     [Documentation]    Remove a index of vtn flowfilter which have ICMP
@@ -147,7 +179,12 @@ Add a vbr flowfilter with Icmp code
 Verify icmp action for vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{icmp_action}
 
 Remove vbr Flowfilter index which has ICMP
     [Documentation]    Remove a index of vbr flowfilter which have ICMP
@@ -163,7 +200,12 @@ Add a vbrif flowfilter with Icmp code
 Verify icmp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    @{icmp_action}
 
 Remove vbrif Flowfilter index which has ICMP
     [Documentation]    Remove a index of vbrif flowfilter which have ICMP
index a4c97dff743555a62ac7e829e0ba4078afd2ed06..ca366ffc0ca89399d8447e036910070bdcd0dd85 100644 (file)
@@ -1,17 +1,28 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.3/32","destination-network":"10.0.0.1/32"},"index":"1"}]
-${flowfilterInetdata}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
-${flowfilterInetdropdata}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
-${flowfilterIcmpCodedata}    "output": "true", "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
-${flowfilterTpsrcTpdstdata}    "output": "true", "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
-${flowfilterDscpdata}    "output": "true", "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
-${flowfiltervlanpcp}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+${flowconditiondata}
+...                             "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.3/32","destination-network":"10.0.0.1/32"},"index":"1"}]
+${flowfilterInetdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
+${flowfilterInetdropdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
+${flowfilterIcmpCodedata}
+...                             "output": "true", "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
+${flowfilterTpsrcTpdstdata}
+...                             "output": "true", "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
+${flowfilterDscpdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
+${flowfiltervlanpcp}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -89,7 +100,12 @@ Add a vbrif flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_OUT_DUMPFLOWS_OF10}    @{inet_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_OUT_DUMPFLOWS_OF10}
+    ...    @{inet_actions}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
index 0eb967f29e0386e59c13ad4047d088b727ddaedd..4c4fa250ef99052570feabfee538fbe5024636cf 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -75,7 +78,7 @@ Get flow
 
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
-    [Tags]    Switch
+    [Tags]    switch
     Wait_Until_Keyword_Succeeds    20s    1s    Verify FlowMacAddress    h2    h4    OF10
 
 Remove Portmap for If1
index bda2825aa158804eeb8b3b95741c20a21ab44879..48010f992330304534c21b97b9f22085602f553b 100644 (file)
@@ -1,12 +1,18 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
+${flowfiltervlanpcp}
+...                     "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Start topology
@@ -64,7 +70,12 @@ Add a vbrif flowfilter with vlanpcp
 
 Verify vlanpcp of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    ${vlanpcp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    ${vlanpcp_action}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
index c043deb47cd6dbdf2672e5074c2ac01ba536eb9a..93c7d3e9676760c77b5300baba12a03d18300d48 100644 (file)
@@ -1,12 +1,18 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF10
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
+${flowfiltervlanpcp}
+...                     "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Start topology
@@ -80,7 +86,12 @@ Add a vtn flowfilter with vlanpcp
 
 Verify vlanpcp of vtn flowfilter
     [Documentation]    Verify vtn flowfilter actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    ${vlanpcp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    ${vlanpcp_action}
 
 Remove vtn Flowfilter index
     [Documentation]    Remove a index of vtn flowfilter
@@ -93,7 +104,12 @@ Add a vbr flowfilter with vlanpcp
 
 Verify vlanpcp of vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF10}    ${vlanpcp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF10}
+    ...    ${vlanpcp_action}
 
 Remove vbr Flowfilter index
     [Documentation]    Remove a index of vbr flowfilter
index 65ad51af6e5b80842445b060ed2a08c2c75a3fda..6f5694026a0d5f77c244de0b9fc55ded46495633 100644 (file)
@@ -1,13 +1,20 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager PathPolicy using OF10
-Suite Setup       Start PathSuiteVtnMaTestOF10
-Suite Teardown    Stop PathSuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager PathPolicy using OF10
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start PathSuiteVtnMaTestOF10
+Suite Teardown      Stop PathSuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]
-${pathmapdata}    {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
-${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]
+${pathmapdata}
+...                     {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
+${pathpolicydata}
+...                     {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
+
 
 *** Test Cases ***
 Check if switch1 detected
index 2fae223cedcc69a21da14f8bcaac9cc73ce758e3..f11ed355dbd9753f8cc3e405e08df05b1f2b97d2 100644 (file)
@@ -1,9 +1,12 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager (OF10)
-Suite Setup       Start SuiteVtnMa
-Suite Teardown    Stop SuiteVtnMa
-Test Teardown     Collect Debug Info
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager (OF10)
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMa
+Suite Teardown      Stop SuiteVtnMa
+Test Teardown       Collect Debug Info
+
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow10
+${start}    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow10
index 8ed2d447d34013216b256029b34d61c0fda6bf4c..2b58b038020594b07bc883cb055a070ab75afd3d 100644 (file)
@@ -1,11 +1,16 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.3/32"},"index":"1"}]
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.3/32"},"index":"1"}]
+
 
 *** Test Cases ***
 Add a flowcondition in restconfig
index 82d1869e5e4964b26c30c57c762b52f6babcc6ea..2f8a3501a6d9a2f5e398809d17e687c3c59edef2 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
index d34deafaac4b57e1ba2d155d2f7187119624397b..f558a66f57cdf54f935c28eff859aa4a170b9fbd 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager Data Flow using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager Data Flow using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
index 36a38b26e517dca4f115e87b61ea06611ff1df9d..65de0c7724b7ac10c4190acbc174b44a02d07ac4 100644 (file)
@@ -1,19 +1,31 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
-Resource          ../../../libraries/Utils.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+Resource            ../../../libraries/Utils.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.3/32"},"index":"1"}]
-${flowfilterInetdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
-${flowfilterInetdropdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
-${flowfilterIcmpCodedata}    "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
-${flowfilterTpsrcTpdstdata}    "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
-${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
-${flowfilterdlsrc}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-dl-src-action": {"address":"00:00:00:00:00:11"}}],"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+${flowconditiondata}
+...                             "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.3/32"},"index":"1"}]
+${flowfilterInetdata}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
+${flowfilterInetdropdata}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
+${flowfilterIcmpCodedata}
+...                             "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
+${flowfilterTpsrcTpdstdata}
+...                             "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
+${flowfilterDscpdata}
+...                             "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
+${flowfilterdlsrc}
+...                             "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-dl-src-action": {"address":"00:00:00:00:00:11"}}],"index":"1"}]
+${flowfiltervlanpcp}
+...                             "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -91,7 +103,12 @@ Add a vtn flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vtn flowfilter
     [Documentation]    Verify vtn flowfilter actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{inet_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{inet_action}
     [Teardown]    Run Keywords    Report_Failure_Due_To_Bug    6643
     ...    AND    Collect Debug Info
 
@@ -106,7 +123,12 @@ Add a vbr flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{inet_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{inet_action}
 
 Remove vbr Flowfilter index
     [Documentation]    Remove a index of vbr flowfilter
@@ -119,7 +141,12 @@ Add a vbrif flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{inet_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{inet_action}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
@@ -133,7 +160,12 @@ Add a vtn flowfilter with Icmp code
 Verify icmp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{icmp_action}
 
 Remove vtn Flowfilter index which has ICMP
     [Documentation]    Remove a index of vtn flowfilter which have ICMP
@@ -147,7 +179,12 @@ Add a vbr flowfilter with Icmp code
 Verify icmp action for vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{icmp_action}
 
 Remove vbr Flowfilter index which has ICMP
     [Documentation]    Remove a index of vbr flowfilter which have ICMP
@@ -161,7 +198,12 @@ Add a vbrif flowfilter with Icmp code
 Verify icmp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
     [Tags]    exclude
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    @{icmp_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    @{icmp_action}
 
 Remove vbrif Flowfilter index which has ICMP
     [Documentation]    Remove a index of vbrif flowfilter which have ICMP
index 47bab78df7548098192b13da9a281e311058aeab..90764804c209d378113fc805c32061da455ae285 100644 (file)
@@ -1,17 +1,28 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.3/32","destination-network":"10.0.0.1/32"},"index":"1"}]
-${flowfilterInetdata}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
-${flowfilterInetdropdata}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
-${flowfilterIcmpCodedata}    "output": "true", "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
-${flowfilterTpsrcTpdstdata}    "output": "true", "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
-${flowfilterDscpdata}    "output": "true", "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
-${flowfiltervlanpcp}    "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+${flowconditiondata}
+...                             "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.3/32","destination-network":"10.0.0.1/32"},"index":"1"}]
+${flowfilterInetdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"192.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"192.0.0.2/32"}}],"index": "1"}]
+${flowfilterInetdropdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-drop-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.2/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.4/32"}}],"index": "1"}]
+${flowfilterIcmpCodedata}
+...                             "output": "true", "vtn-flow-filter": [{"condition": "cond_1","index": "1", "vtn-pass-filter": {}, "vtn-flow-action": [{ "order": "1", "vtn-set-icmp-code-action":{"code": "1"}},{"order": "2","vtn-set-icmp-type-action": {"type": "3"}}]}]
+${flowfilterTpsrcTpdstdata}
+...                             "output": "true", "vtn-flow-filter": [{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-port-src-action": {"port": "5"}},{"order": "2","vtn-set-port-dst-action": {"port": "10"}}],"index": "1"}]
+${flowfilterDscpdata}
+...                             "output": "true", "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"index":"1"}]
+${flowfiltervlanpcp}
+...                             "output": "true", "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"3","vtn-set-icmp-code-action":{"code":"1"}},{"order":"4","vtn-set-vlan-pcp-action":{"vlan-pcp":"3"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -89,7 +100,12 @@ Add a vbrif flowfilter with inet4src and inet4dst
 
 Verify inet4src and inet4dst of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for inet4src and inet4dst
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_OUT_DUMPFLOWS_OF13}    @{inet_action}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_OUT_DUMPFLOWS_OF13}
+    ...    @{inet_action}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
index e346d7f21bb98bdeec765405bd9dda79b8300d3f..7186895962ad9bcc4892e11337b00d5fdbb65f72 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -75,7 +78,7 @@ Get flow
 
 Verify FlowMacAddress
     [Documentation]    Checking Flows on switch
-    [Tags]    Switch
+    [Tags]    switch
     BuiltIn.Wait_Until_Keyword_Succeeds    20    1    Verify FlowMacAddress    h2    h4    OF13
 
 Remove Portmap for If1
index 38734ceb8e36df1dd8e05f341950d48bca71557a..2c8abf6e017364265671bbf3903450b6bb6a1419 100644 (file)
@@ -1,12 +1,18 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
+${flowfiltervlanpcp}
+...                     "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Start topology
@@ -64,7 +70,12 @@ Add a vbrif flowfilter with vlanpcp
 
 Verify vlanpcp of vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    ${vlanpcp_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    ${vlanpcp_actions}
 
 Remove vbrif Flowfilter index
     [Documentation]    Remove a index of vbrif flowfilter
index 7c63d3a2a510ae5155ff28dc99b9b694a2d26601..53b9c1f3d21b09cf2c19bd7454846c74b0b10ee0 100644 (file)
@@ -1,12 +1,18 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
-${flowfiltervlanpcp}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-inet-match":{"source-network":"10.0.0.1/32","destination-network":"10.0.0.5/32"},"index":"1"}]
+${flowfiltervlanpcp}
+...                     "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order":"1","vtn-set-vlan-pcp-action":{"vlan-pcp":"6"}}],"index":"1"}]
+
 
 *** Test Cases ***
 Start topology
@@ -80,7 +86,12 @@ Add a vtn flowfilter with vlanpcp
 
 Verify vlanpcp of vtn flowfilter
     [Documentation]    Verify vtn flowfilter actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    ${vlanpcp_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    ${vlanpcp_actions}
 
 Remove vtn Flowfilter index
     [Documentation]    Remove a index of vtn flowfilter
@@ -93,7 +104,12 @@ Add a vbr flowfilter with vlanpcp
 
 Verify vlanpcp of vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for vlanpcp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${FF_DUMPFLOWS_OF13}    ${vlanpcp_actions}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify Flow Entries for Flowfilter
+    ...    ${FF_DUMPFLOWS_OF13}
+    ...    ${vlanpcp_actions}
 
 Remove vbr Flowfilter index
     [Documentation]    Remove a index of vbr flowfilter
index 5f95d1e3402469bb3e5b03f40f7e061ea78f1a69..866acd1006ec48fca3cd9098bf7f7cbf478992da 100644 (file)
@@ -1,8 +1,11 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager Data Flows using OF13
-Suite Setup       Start SuiteVtnMaTest
-Suite Teardown    Stop SuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager Data Flows using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMaTest
+Suite Teardown      Stop SuiteVtnMaTest
+
 
 *** Test Cases ***
 Start topology
index 668999b5ab0ef36f71be257f988b56a5c2141cb1..59ea9fe23513f081b98a65094dcb244187ed77ea 100644 (file)
@@ -1,13 +1,20 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager PathPolicy using OF13
-Suite Setup       Start PathSuiteVtnMaTest
-Suite Teardown    Stop PathSuiteVtnMaTest
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager PathPolicy using OF13
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start PathSuiteVtnMaTest
+Suite Teardown      Stop PathSuiteVtnMaTest
+
 
 *** Variables ***
-${flowconditiondata}    "vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]
-${pathmapdata}    {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
-${pathpolicydata}    {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
+${flowconditiondata}
+...                     "vtn-flow-match":[{"vtn-ether-match":{"destination-address":"ba:bd:0f:e3:a8:c8","ether-type":"2048","source-address":"ca:9e:58:0c:1e:f0","vlan-id": "1"},"vtn-inet-match":{"source-network":"10.0.0.1/32","protocol":1,"destination-network":"10.0.0.2/32"},"index":"1"}]
+${pathmapdata}
+...                     {"input":{"tenant-name":"Tenant_path","path-map-list":[{"condition":"flowcond_path","policy":"1","index": "1","idle-timeout":"300","hard-timeout":"0"}]}}
+${pathpolicydata}
+...                     {"input":{"operation":"SET","id": "1","default-cost": "10000","vtn-path-cost": [{"port-desc":"openflow:1,3,s1-eth3","cost":"1000"},{"port-desc":"openflow:4,2,s4-eth2","cost":"1000"},{"port-desc":"openflow:3,3,s3-eth3","cost":"100000"}]}}
+
 
 *** Test Cases ***
 Check if switch1 detected
@@ -56,7 +63,13 @@ Ping h1 to h2 before path policy
 
 Verify flowEntryBeforePathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_before_pathpolicy}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify flowEntryPathPolicy
+    ...    OF13
+    ...    ${in_port}
+    ...    ${out_before_pathpolicy}
 
 Add a flowcondition flowcond_path
     [Documentation]    Create a flowcondition flowcond_path
@@ -80,7 +93,13 @@ Ping h1 to h2 after path policy
 
 Verify flowEntryAfterPathPolicy
     [Documentation]    Checking Flows on switch s1 and s3
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowEntryPathPolicy    OF13    ${in_port}    ${out_after_pathpolicy}
+    Wait_Until_Keyword_Succeeds
+    ...    20s
+    ...    1s
+    ...    Verify flowEntryPathPolicy
+    ...    OF13
+    ...    ${in_port}
+    ...    ${out_after_pathpolicy}
 
 Delete a pathmap
     [Documentation]    Delete a pathmap
index c5fe19f0cd8a754cefcfabe211f11250c88544d6..6e65c01b0a304f46984c52453a24865ce16cb9b8 100644 (file)
@@ -1,9 +1,12 @@
 *** Settings ***
-Documentation     Test suite for VTN Manager (OF13)
-Suite Setup       Start SuiteVtnMa
-Suite Teardown    Stop SuiteVtnMa
-Test Teardown     Collect Debug Info
-Resource          ../../../libraries/VtnMaKeywords.robot
+Documentation       Test suite for VTN Manager (OF13)
+
+Resource            ../../../libraries/VtnMaKeywords.robot
+
+Suite Setup         Start SuiteVtnMa
+Suite Teardown      Stop SuiteVtnMa
+Test Teardown       Collect Debug Info
+
 
 *** Variables ***
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
+${start}    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,2 --switch ovsk,protocols=OpenFlow13
index de832b6d308eff3481b8dc9f84958ce0a137e0af..764e6958030dd392a987a920b680478c047ebf4c 100644 (file)
@@ -1,52 +1,57 @@
 *** Settings ***
-Documentation     Suite for testing performance of yang-model-validator utility.
+Documentation       Suite for testing performance of yang-model-validator utility.
 ...
-...               Copyright (c) 2016,2017 Cisco Systems, Inc. and others. All rights reserved.
+...                 Copyright (c) 2016,2017 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
+...                 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
 ...
 ...
-...               This suite executes the yang-model-validator tool and will turn up any major
-...               breakages in that tool. Since yangtools is now a release integrated project
-...               and the version of the tool is static and unchanging per release, this suite
-...               does not need to run very often.
+...                 This suite executes the yang-model-validator tool and will turn up any major
+...                 breakages in that tool. Since yangtools is now a release integrated project
+...                 and the version of the tool is static and unchanging per release, this suite
+...                 does not need to run very often.
 ...
-...               Two main things to check for this suite and the yang-model-validator tool:
+...                 Two main things to check for this suite and the yang-model-validator tool:
 ...
-...               1) Does it work against the updated yang model repos (see YangCollection.robot)
-...               and report valid issues in those models. When the models are updated, does
-...               the tool still work as expected.
+...                 1) Does it work against the updated yang model repos (see YangCollection.robot)
+...                 and report valid issues in those models. When the models are updated, does
+...                 the tool still work as expected.
 ...
-...               2) What does the runtime of the tool look like as new versions of the tool are
-...               released? Does validation take significanltly shorter (an improvement) or
-...               longer (a regression)?
+...                 2) What does the runtime of the tool look like as new versions of the tool are
+...                 released? Does validation take significanltly shorter (an improvement) or
+...                 longer (a regression)?
 ...
-...               The set of Yang modules is large and fixed to specific commits from their relevant
-...               repos. That fixed point can be updated periodically in the YangCollection.robot
-...               library. Just be sure there is an apples to apples comparision (same exact repo
-...               state) between yangtools releases, so #2 above is known.
+...                 The set of Yang modules is large and fixed to specific commits from their relevant
+...                 repos. That fixed point can be updated periodically in the YangCollection.robot
+...                 library. Just be sure there is an apples to apples comparision (same exact repo
+...                 state) between yangtools releases, so #2 above is known.
 ...
-Suite Setup       Setup_Suite
-Test Setup        SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
-Test Teardown     Teardown_Test
-Default Tags      1node    yang-model-validator    critical
-Library           RequestsLibrary
-Library           SSHLibrary
-Library           String
-Resource          ${CURDIR}/../../../libraries/CompareStream.robot
-Resource          ${CURDIR}/../../../libraries/NexusKeywords.robot
-Resource          ${CURDIR}/../../../libraries/RemoteBash.robot
-Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
-Resource          ${CURDIR}/../../../libraries/SSHKeywords.robot
-Resource          ${CURDIR}/../../../libraries/TemplatedRequests.robot
-Resource          ${CURDIR}/../../../libraries/YangCollection.robot
+
+Library             RequestsLibrary
+Library             SSHLibrary
+Library             String
+Resource            ${CURDIR}/../../../libraries/CompareStream.robot
+Resource            ${CURDIR}/../../../libraries/NexusKeywords.robot
+Resource            ${CURDIR}/../../../libraries/RemoteBash.robot
+Resource            ${CURDIR}/../../../libraries/SetupUtils.robot
+Resource            ${CURDIR}/../../../libraries/SSHKeywords.robot
+Resource            ${CURDIR}/../../../libraries/TemplatedRequests.robot
+Resource            ${CURDIR}/../../../libraries/YangCollection.robot
+
+Suite Setup         Setup_Suite
+Test Setup          SetupUtils.Setup_Test_With_Logging_And_Fast_Failing
+Test Teardown       Teardown_Test
+
+Default Tags        1node    yang-model-validator    critical
+
 
 *** Variables ***
-${TEST_TOOL_NAME}    yang-model-validator
+${TEST_TOOL_NAME}                   yang-model-validator
 ${EXPLICIT_YANG_SYSTEM_TEST_URL}    ${EMPTY}
 
+
 *** Test Cases ***
 Kill_Odl
     [Documentation]    The ODL instance consumes resources, kill it.
@@ -68,13 +73,18 @@ Deploy_And_Start_Odl_Yang_Validator_Utility
     ${yang_path_option} =    Get_Yang_Model_Validator_Path_Option    ${YANG_MODEL_PATHS}
     FOR    ${yang_file}    IN    @{yang_files_to_validate}
         Log To Console    working on: ${yang_file}
-        ${logfile} =    NexusKeywords.Install_And_Start_Java_Artifact    component=yangtools    artifact=${TEST_TOOL_NAME}
-        ...    suffix=jar-with-dependencies    tool_options=${yang_path_option} -- ${yang_file}    explicit_url=${EXPLICIT_YANG_SYSTEM_TEST_URL}
+        ${logfile} =    NexusKeywords.Install_And_Start_Java_Artifact
+        ...    component=yangtools
+        ...    artifact=${TEST_TOOL_NAME}
+        ...    suffix=jar-with-dependencies
+        ...    tool_options=${yang_path_option} -- ${yang_file}
+        ...    explicit_url=${EXPLICIT_YANG_SYSTEM_TEST_URL}
         Wait_Until_Utility_Finishes
         Check_Return_Code
     END
     [Teardown]    BuiltIn.Run_Keyword_And_Ignore_Error    SSHLibrary.Get_File    ${logfile}
 
+
 *** Keywords ***
 Setup_Suite
     [Documentation]    Activate dependency Resources, create SSH connection.
@@ -88,10 +98,10 @@ Teardown_Test
     SetupUtils.Teardown_Test_Show_Bugs_And_Start_Fast_Failing_If_Test_Failed
 
 Get_Recursive_Dirs
-    [Arguments]    ${root}=.
     [Documentation]    Return list of sub-directories discovered recursively under ${root} relative to
     ...    the current working directory for a new shell spawned over the active SSH session.
     ...    This implementation returns absolute paths as that is easier.
+    [Arguments]    ${root}=.
     ${depth_1} =    SSHLibrary.List_Directories_In_Directory    path=${root}    absolute=True
     ${subtrees} =    BuiltIn.Create_List
     FOR    ${subdir}    IN    @{depth_1}
@@ -100,25 +110,25 @@ Get_Recursive_Dirs
         Collections.Append_To_List    ${subtrees}    ${tree}
     END
     ${flat_list} =    Collections.Combine_Lists    ${depth_1}    @{subtrees}
-    [Return]    ${flat_list}
+    RETURN    ${flat_list}
 
 Get_Yang_Files_From_Dirs
-    [Arguments]    ${dirs_to_process}
     [Documentation]    Return list of yang files from provided directories
+    [Arguments]    ${dirs_to_process}
     ${collected_yang_files} =    BuiltIn.Create_List
     FOR    ${dir}    IN    @{dirs_to_process}
         ${yang_files_in_dir} =    SSHLibrary.List_Files_In_Directory    path=${dir}    pattern=*.yang    absolute=True
         ${collected_yang_files} =    Collections.Combine_Lists    ${collected_yang_files}    ${yang_files_in_dir}
     END
-    [Return]    ${collected_yang_files}
+    RETURN    ${collected_yang_files}
 
 Get_Yang_Model_Validator_Path_Option
-    [Arguments]    ${yang_paths}
     [Documentation]    Return the path option for yang-model-validator from the provided list of YANG paths.
+    [Arguments]    ${yang_paths}
     ${separator} =    CompareStream.Set_Variable_If_At_Most_Sulfur    :    ${SPACE}
     ${path_option} =    Evaluate    "${separator}".join(${yang_paths})
     ${path_option} =    Catenate    SEPARATOR=${SPACE}    --path    ${path_option}
-    [Return]    ${path_option}
+    RETURN    ${path_option}
 
 Wait_Until_Utility_Finishes
     [Documentation]    Repeatedly send endline to keep session alive; pass on prompt, fail on timeout.