Tidied updated tests. 02/34902/1
authorJozef Behran <jbehran@cisco.com>
Thu, 18 Feb 2016 13:32:32 +0000 (14:32 +0100)
committerJozef Behran <jbehran@cisco.com>
Thu, 18 Feb 2016 13:32:32 +0000 (14:32 +0100)
Change-Id: I6b22374cb3d232ac1eb19907db840cf3d03e453b
Signed-off-by: Jozef Behran <jbehran@cisco.com>
30 files changed:
csit/libraries/KarafKeywords.robot
csit/libraries/OVSDB.robot
csit/libraries/TsdrUtils.robot
csit/libraries/UnimgrKeywords.robot
csit/libraries/VtnMaKeywords.robot
csit/suites/alto/basic/020_simple_IRD.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/000_setup.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/005_wait_for_connections.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/010_set_odl.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/015_wait_for_flows.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/031_track_icmp_h35_2_h36_2.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/032_track_icmp_h35_2_h35_3.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/033_track_icmp_h35_4_h36_4.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/034_track_icmp_h36_5_h35_2.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/035_track_curl_h35_2_h36_2.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/036_track_curl_h35_3_h36_4.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/998_clean_odl.robot
csit/suites/groupbasedpolicy/GBPSFC/6-node/demo-symmetric-chain/999_teardown.robot
csit/suites/ovsdb/Southbound_Cluster/010__Ovsdb_Southbound_Cluster.robot
csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
csit/suites/tsdr/Cassandra/070_Netflow.robot
csit/suites/tsdr/HBase/070_Netflow.robot
csit/suites/tsdr/HSQLDB/070_Netflow.robot
csit/suites/unimgr/uni_operations/010_unimanager_restconf.robot
csit/suites/unimgr/uni_operations/020_unimanager_cli.robot
csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager_flowfilter.robot
csit/suites/vtn/VTN_Mgr_OF10/020__vtn_pathmap_pathpolicy.robot
csit/suites/vtn/VTN_Mgr_OF13/010__flowcondition_test.robot
csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
csit/suites/vtn/VTN_Mgr_OF13/020__vtn_pathmap_pathpolicy.robot

index f1390b3c8937d3111c115e571dd512c0ec74a80f..f1cc295755a3754a111b9595baf87351249ca309 100644 (file)
@@ -32,7 +32,7 @@ Issue Command On Karaf Console
 Check For Elements On Karaf Command Output Message
     [Arguments]    ${cmd}    ${elements}    ${controller}=${ODL_SYSTEM_IP}    ${karaf_port}=${KARAF_SHELL_PORT}    ${timeout}=5
     [Documentation]    Will execute the command using Issue Command On Karaf Console then check for the given elements
-    ...                in the command output message
+    ...    in the command output message
     ${output}    Issue Command On Karaf Console    ${cmd}    ${controller}    ${karaf_port}    ${timeout}
     : FOR    ${i}    IN    @{elements}
     \    Should Contain    ${output}    ${i}
index fd97261a7df42f5b07252357ed6062a54ab3dc5b..ec50a5a8f7d17b41b74165a562fae968a13170eb 100644 (file)
@@ -84,8 +84,8 @@ Get OVSDB UUID
     : FOR    ${node}    IN    @{node_list}
     \    ${node_id}=    Get From Dictionary    ${node}    node-id
     \    ${node_uuid}=    Replace String    ${node_id}    ovsdb://uuid/    ${EMPTY}
-    # Since bridges are also listed as nodes, but will not have the extra "ovsdb:connection-info data, we need to
-    # use "Run Keyword And Ignore Error" below.
+    \    # Since bridges are also listed as nodes, but will not have the extra "ovsdb:connection-info data, we need to
+    \    # use "Run Keyword And Ignore Error" below.
     \    ${status}    ${connection_info}    Run Keyword And Ignore Error    Get From Dictionary    ${node}    ovsdb:connection-info
     \    ${status}    ${remote_ip}    Run Keyword And Ignore Error    Get From Dictionary    ${connection_info}    remote-ip
     \    ${uuid}=    Set Variable If    '${remote_ip}' == '${ovs_system_ip}'    ${node_uuid}    ${uuid}
index 312441d29d30a933b825e77058f3b04115791dd0..891c2e48fa65adf2e6f696a86b59095e39ff60d7 100644 (file)
@@ -63,7 +63,6 @@ Ping Pair Hosts
     Write    pingpair ${host1} ${host2}
     Read Until    mininet>
 
-
 Ping Pair Hosts Hbase
     [Arguments]    ${pattern}
     [Documentation]    Ping between h1 and h2 and check Hbase
@@ -82,7 +81,7 @@ Ping Pair Hosts HSQLDB
     [Arguments]    ${pattern}
     [Documentation]    Iperf between h1 and h2 and check Cassandra
     Ping Pair Hosts    h1    h2
-    ${query_output}=   Issue Command On Karaf Console    tsdr:list NETFLOW | wc -l
+    ${query_output}=    Issue Command On Karaf Console    tsdr:list NETFLOW | wc -l
     Should Match Regexp    ${query_output}    ${pattern}
 
 Stop Tsdr Suite
@@ -264,7 +263,6 @@ Verify the Metrics Attributes on Cassandra Client
     ${metric_count}=    Get From List    ${split_line}    3
     [Return]    ${metric_count}
 
-
 Form Portstats Query Pattern
     [Arguments]    ${metric}    ${node}    ${port}    ${attribute}
     [Documentation]    Used for geneating openflow metrics Queries for Cassandra.
@@ -285,7 +283,6 @@ Create Temporary Key Info
     ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    cat ${CASSANDRA_DB_PATH}${val_table}|grep "${pattern}"
     [Return]    ${output}
 
-
 Verify Metric Val File
     [Documentation]    Returns Value for metric matching particular keya,keyb
     @{metricval}=    Read File and Return Split Lines    ${CASSANDRA_DB_PATH}${temp_metric_val}
@@ -303,7 +300,6 @@ Verify Metric log File
     [Return]    ${contents}
 
 Grep From File
-
     [Arguments]    ${file}    ${pattern}
     [Documentation]    Use cat to grep from the file and return the output
     ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    cat ${file} | ${pattern}
@@ -613,12 +609,11 @@ Write SNMP config
 Bringup Netflow
     [Documentation]    Brings up basic netflow setup .
     Verify Feature Is Installed    odl-tsdr-netflow-statistics-collector
-    Wait Until Keyword Succeeds    24x    10 sec    Check Karaf Log Has Messages     NetFlow Data Colletor Initialized
+    Wait Until Keyword Succeeds    24x    10 sec    Check Karaf Log Has Messages    NetFlow Data Colletor Initialized
     Start Tsdr Suite
     Ping All Hosts
     Configure Netflow
 
-
 Collect Data from SNMP Agent
     [Arguments]    ${SNMP_IP}=127.0.0.1    ${SNMP_AGENT_COMM}=${SNMP_COMMUNITY}
     [Documentation]    Poll for SNMP Agent OID
@@ -658,7 +653,7 @@ Collect Data from SNMP Agent
     \    ${ifOperStatus}=    Get From Dictionary    ${OPER_STATUS}    ${ifOperStatus1}
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfOutDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfOutDiscards
     \    Append To List    ${SNMP_VALUES}    ${ifOutDiscards}
-    \    Append To List    ${SNMP_ENTRY}     grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInDiscards
+    \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInDiscards | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInDiscards
     \    Append To List    ${SNMP_VALUES}    ${ifInDiscards}
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfInOctets | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfInOctets
     \    Append To List    ${SNMP_VALUES}    ${ifInOctets}
@@ -685,4 +680,3 @@ Collect Data from SNMP Agent
     \    Append To List    ${SNMP_ENTRY}    grep NID=${SNMP_IP} | grep DC=SNMPINTERFACES | grep MN=IfOperStatus | grep RK=ifIndex:${ifindex},ifName:Iso88023Csmacd,SnmpMetric:IfOperStatus
     \    Append To List    ${SNMP_VALUES}    ${ifOperStatus}
     [Return]    ${SNMP_ENTRY}    ${SNMP_VALUES}
-
index 9129c07e8345aadfd841780eb504a8d003be3159..8678131a9e7f2dfa6f9637bbe2fa4bafae6061b8 100644 (file)
@@ -1,11 +1,11 @@
 *** Settings ***
-Documentation    Unimgr keywords defination that will be used in Unimgr suite.
-Library    OperatingSystem
-Library    SSHLibrary
-Library    String
-Resource    ../../../libraries/OVSDB.robot
-Resource    ../../../libraries/Utils.robot
-Variables    ../../../variables/Variables.py
+Documentation     Unimgr keywords defination that will be used in Unimgr suite.
+Library           OperatingSystem
+Library           SSHLibrary
+Library           String
+Resource          ../../../libraries/OVSDB.robot
+Resource          ../../../libraries/Utils.robot
+Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${Bridge_Name}    ovsbr0
@@ -15,8 +15,8 @@ ${UniMgr_Variables_DIR}    ../variables/unimgr
 Setup Unimgr Test Environment
     [Documentation]    Establish the Opendayligh session and prepair the Mininet VMs
     Create Session    session    http://${CONTROLLER}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS}
-    Prepair Unimgr Test Environment     ${TOOLS_SYSTEM_IP}
-    Prepair Unimgr Test Environment     ${TOOLS_SYSTEM_2_IP}
+    Prepair Unimgr Test Environment    ${TOOLS_SYSTEM_IP}
+    Prepair Unimgr Test Environment    ${TOOLS_SYSTEM_2_IP}
 
 Prepair Unimgr Test Environment
     [Arguments]    ${Mininet_IP}
@@ -25,7 +25,7 @@ Prepair Unimgr Test Environment
     Run Command On Remote System    ${Mininet_IP}    sudo ovs-vsctl del-br ${Bridge_Name}
     Run Command On Remote System    ${Mininet_IP}    sudo ovs-vsctl set-manager ptcp:${OVSDBPORT}
     ${stdout}=    Run Command On Remote System    ${Mininet_IP}    sudo ovs-vsctl show
-    Should Contain     ${stdout}    "ptcp:${OVSDBPORT}"
+    Should Contain    ${stdout}    "ptcp:${OVSDBPORT}"
 
 Get Add Uni Json
     [Arguments]    ${IP-Address}    ${MAC-Address}
@@ -41,4 +41,4 @@ Get Add Evc Json
     ${Json}    OperatingSystem.Get File    ${UniMgr_Variables_DIR}/add_evc.json
     ${temp}    Replace String    ${Json}    {uni1-ip}    ${UNI1-IP}
     ${evcJson}    Replace String    ${temp}    {uni2-ip}    ${UNI2-IP}
-    [Return]    ${evcJson}
\ No newline at end of file
+    [Return]    ${evcJson}
index 6a8b1e7d88450114b73877e492f9e61d3dfca4ad..a987cdb301a8e63fa556397516afe1968e04ddc2 100644 (file)
@@ -16,7 +16,7 @@ ${VTN_INVENTORY}    restconf/operational/vtn-inventory:vtn-nodes
 ${DUMPFLOWS_OF10}    dpctl dump-flows -O OpenFlow10
 ${DUMPFLOWS_OF13}    dpctl dump-flows -O OpenFlow13
 ${index}          7
-@{inet_actions}    nw_src=10.0.0.1   nw_dst=10.0.0.3
+@{inet_actions}    nw_src=10.0.0.1    nw_dst=10.0.0.3
 @{BRIDGE1_DATAFLOW}    "reason":"PORTMAPPED"    "virtual-node-path":{"bridge-name":"vBridge1","tenant-name":"Tenant1","interface-name":"if2"}
 @{BRIDGE2_DATAFLOW}    "reason":"PORTMAPPED"    "virtual-node-path":{"bridge-name":"vBridge2","tenant-name":"Tenant1","interface-name":"if3"}
 ${vlanmap_bridge1}    200
@@ -31,8 +31,8 @@ ${pathpolicy_topo_10}    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custo
 ${policy_id}      1
 ${in_port}        1
 ${dscp_action}    set_field:32->nw_tos_shifted
-${dscp_flow}    mod_nw_tos:128
-@{icmp_action}    nw_src=10.0.0.1   nw_dst=10.0.0.3
+${dscp_flow}      mod_nw_tos:128
+@{icmp_action}    nw_src=10.0.0.1    nw_dst=10.0.0.3
 @{PATHPOLICY_ATTR}    "id":1    "port-desc":"openflow:4,2,s4-eth2"
 ${custom}         ${CURDIR}/${CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH}
 
@@ -301,19 +301,19 @@ Add a vbrif flowfilter
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Verify Flow Entries for Flowfilter
-    [Arguments]   ${dumpflows}   @{flowfilter_actions}
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
     [Documentation]    Verify switch flow entry using flowfilter for a vtn
-    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry   ${dumpflows}   @{flowfilter_actions}
+    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry    ${dumpflows}    @{flowfilter_actions}
     Should Be Equal As Strings    ${booleanValue}    True
 
 Verify Removed Flow Entry for Inet Drop Flowfilter
-    [Arguments]   ${dumpflows}   @{flowfilter_actions}
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
     [Documentation]    Verify removed switch flow entry using flowfilter drop for a vtn
-    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry   ${dumpflows}   @{flowfilter_actions}
+    ${booleanValue}=    Run Keyword And Return Status    Verify Actions on Flow Entry    ${dumpflows}    @{flowfilter_actions}
     Should Be Equal As Strings    ${booleanValue}    True
 
 Verify Actions on Flow Entry
-    [Arguments]   ${dumpflows}   @{flowfilter_actions}
+    [Arguments]    ${dumpflows}    @{flowfilter_actions}
     [Documentation]    check flow action elements by giving dumpflows in mininet
     write    ${dumpflows}
     ${result}    Read Until    mininet>
index 613356e83cf2f70e3123e04df489dc417b84fd47..88df14f06388b114b366e41bf7b7a3c6be96a511 100644 (file)
@@ -12,8 +12,8 @@ ${THE_FIRST_IRD_RESOURCE_ID}    hello
 ${THE_SECOND_IRD_RESOURCE_ID}    world
 ${RESOURCE_IN_FIRST_IRD}    test-model-networkmap
 ${RESOURCE_IN_SECOND_IRD}    test-model-filtered-costmap
-${BASE_URL}
-${RANDOM_CONTEXT_ID}
+${BASE_URL}       ${EMPTY}
+${RANDOM_CONTEXT_ID}    ${EMPTY}
 
 *** Test Cases ***
 Check the simple IRD information
@@ -34,13 +34,15 @@ Create two IRDs
 
 Add one IRD configuration entry in one IRD instance
     [Documentation]    Add one IRD configuration entry in an IRD whose name is hello. Link IRD entry to one existed resource.
-    Wait Until Keyword Succeeds    5s    1s    Add An IRD Configuration Entry    ${THE_FIRST_IRD_RESOURCE_ID}    ${DEFAULT_CONTEXT_ID}    ${RESOURCE_IN_FIRST_IRD}    ${BASE_URL}
-    Wait Until Keyword Succeeds    5s    1s    Add An IRD Configuration Entry    ${THE_SECOND_IRD_RESOURCE_ID}    ${DEFAULT_CONTEXT_ID}    ${RESOURCE_IN_SECOND_IRD}    ${BASE_URL}
+    Wait Until Keyword Succeeds    5s    1s    Add An IRD Configuration Entry    ${THE_FIRST_IRD_RESOURCE_ID}    ${DEFAULT_CONTEXT_ID}    ${RESOURCE_IN_FIRST_IRD}
+    ...    ${BASE_URL}
+    Wait Until Keyword Succeeds    5s    1s    Add An IRD Configuration Entry    ${THE_SECOND_IRD_RESOURCE_ID}    ${DEFAULT_CONTEXT_ID}    ${RESOURCE_IN_SECOND_IRD}
+    ...    ${BASE_URL}
 
 *** Keywords ***
 Check GET Response Code Equals 200
     [Arguments]    ${uri_without_ip_port}
-    ${resp}    RequestsLibrary.Get Request   session    ${uri_without_ip_port}
+    ${resp}    RequestsLibrary.Get Request    session    ${uri_without_ip_port}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Create An IRD
@@ -52,5 +54,5 @@ Create An IRD
 Add An IRD Configuration Entry
     [Arguments]    ${IRD_id}    ${context_id}    ${resource_id}    ${base_url}
     ${body}    Set Variable    {"ird-configuration-entry":{"entry-id":"${resource_id}","instance":"/alto-resourcepool:context[alto-resourcepool:context-id='${context_id}']/alto-resourcepool:resource[alto-resourcepool:resource-id='${resource_id}']","path":"${base_url}/${resource_id}"}}
-    ${resp}    RequestsLibrary.Put Request     session    /${ALTO_CONFIG_IRD_INSTANCE_CONFIG}/${IRD_id}/ird-configuration-entry/${resource_id}    data=${body}
+    ${resp}    RequestsLibrary.Put Request    session    /${ALTO_CONFIG_IRD_INSTANCE_CONFIG}/${IRD_id}/ird-configuration-entry/${resource_id}    data=${body}
     should Be Equal As Strings    ${resp.status_code}    200
index 7f08c82414f12915dd7d41cd517bd4679ea4ca8b..fffd7b9b7bbaca72a76c9060a2d3bf0fa5260c30 100644 (file)
@@ -4,4 +4,4 @@ Resource          ../GBPSFC_6node.robot
 
 *** Test Cases ***
 Initialize Nodes
-     Setup Nodes    ${GBPSFCs}    ${CURDIR}/init_scripts
+    Setup Nodes    ${GBPSFCs}    ${CURDIR}/init_scripts
index b76169e37bc61ed89444155eaa4b3662bed74010..944105675bcc7a6e2a75257bb4e3ef832b08c408 100644 (file)
@@ -1,19 +1,18 @@
 *** Settings ***
 Documentation     Waiting for manager and switch connections.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/ConnUtils.robot
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Testcases ***
-
 Wait For Manager Connected on GBPSFC2
     Switch Connection    GPSFC2_CONNECTION
-    Wait Until Keyword Succeeds  2 min  3s    Manager is Connected
+    Wait Until Keyword Succeeds    2 min    3s    Manager is Connected
 
 Wait For Manager Connected on GBPSFC4
     Switch Connection    GPSFC4_CONNECTION
-    Wait Until Keyword Succeeds  4x  5s    Manager is Connected
+    Wait Until Keyword Succeeds    4x    5s    Manager is Connected
index ea59ffbfe6bc7d4223b369d85561fd2cad3174d7..80cdc88410b3ddf58db0fd2265d180b997db6cff 100644 (file)
@@ -13,30 +13,29 @@ Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Put Service Functions
     [Documentation]    Register Service Functions to ODL
     ${json_to_edit}    OperatingSystem.Get File    ${SF_FILE}
-    ${edited_json}     Replace String    ${json_to_edit}    _SF1    ${GBPSFC3}
-    ${edited_json}     Replace String    ${edited_json}    _SF2    ${GBPSFC5}
+    ${edited_json}    Replace String    ${json_to_edit}    _SF1    ${GBPSFC3}
+    ${edited_json}    Replace String    ${edited_json}    _SF2    ${GBPSFC5}
     Add Elements To URI And Verify    ${SF_PATH}    ${edited_json}    ${HEADERS_YANG_JSON}
 
 Put Service Function Forwarders
     [Documentation]    Register Service Function Forwarders to ODL
     ${json_to_edit}    OperatingSystem.Get File    ${SFF_FILE}
-    ${edited_json}     Replace String    ${json_to_edit}    _SFF1    ${GBPSFC2}
-    ${edited_json}     Replace String    ${edited_json}    _SFF2    ${GBPSFC4}
+    ${edited_json}    Replace String    ${json_to_edit}    _SFF1    ${GBPSFC2}
+    ${edited_json}    Replace String    ${edited_json}    _SFF2    ${GBPSFC4}
     Add Elements To URI And Verify    ${SFF_PATH}    ${edited_json}    ${HEADERS_YANG_JSON}
 
-
 Wait For Manager and Switch Connected on GBPSFC2
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC2}
     Utils.Flexible Mininet Login
-    Wait Until Keyword Succeeds  2min  3s  Manager and Switch Connected  sw_name=sw2
+    Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw2
     SSHLibrary.Close Connection
 
 Wait For Manager and Switch Connected on GBPSFC4
     [Documentation]    Making sure that manager is connected for further processing.
     SSHLibrary.Open Connection    ${GBPSFC4}
     Utils.Flexible Mininet Login
-    Wait Until Keyword Succeeds  2min  3s  Manager and Switch Connected  sw_name=sw4
+    Wait Until Keyword Succeeds    2min    3s    Manager and Switch Connected    sw_name=sw4
     SSHLibrary.Close Connection
 
 Put Service Function Chains
@@ -50,8 +49,8 @@ Put Service Function Paths
 Put Tunnels
     [Documentation]    Send tunnel augmentation to ODL
     ${json_to_edit}    OperatingSystem.Get File    ${TUNNELS_FILE}
-    ${edited_json}     Replace String    ${json_to_edit}    _CLASSIFIER1    ${GBPSFC1}
-    ${edited_json}     Replace String    ${edited_json}    _CLASSIFIER2    ${GBPSFC6}
+    ${edited_json}    Replace String    ${json_to_edit}    _CLASSIFIER1    ${GBPSFC1}
+    ${edited_json}    Replace String    ${edited_json}    _CLASSIFIER2    ${GBPSFC6}
     Add Elements To URI And Verify    ${TUNNELS_PATH}    ${edited_json}    ${HEADERS_YANG_JSON}
 
 Put Tenant
@@ -60,8 +59,8 @@ Put Tenant
 
 Register Endpoints
     [Documentation]    Endpoints registration
-    @{endpoint_files} =  OperatingSystem.List Files In Directory    ${ENDPOINTS_SYMM_DIR}    vethl*.*json    absolute
-    :FOR    ${endpoint_file}    IN    @{endpoint_files}
+    @{endpoint_files} =    OperatingSystem.List Files In Directory    ${ENDPOINTS_SYMM_DIR}    vethl*.*json    absolute
+    : FOR    ${endpoint_file}    IN    @{endpoint_files}
     \    Post Elements To URI From File    ${ENDPOINT_REG_PATH}    ${endpoint_file}    ${HEADERS_YANG_JSON}
     ${resp}    RequestsLibrary.Get Request    session    ${ENDPOINTS_OPER_PATH}
-    Log    ${resp.content}
\ No newline at end of file
+    Log    ${resp.content}
index 6011f49384eef47ebb7576f6cb475f7d9e3e8d4b..4d9c40e922ab465e6baca904b0ec312cd0dc2bc2 100644 (file)
@@ -1,5 +1,7 @@
 *** Settings ***
-Documentation     Documentation     Waiting for flows to appear on switches.
+Documentation     Documentation Waiting for flows to appear on switches.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/Utils.robot
 Resource          ../../../../../libraries/GBP/ConnUtils.robot
@@ -8,11 +10,8 @@ Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Variables         ../../../../../variables/Variables.py
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Testcases ***
-
 Wait For Flows on GBPSFC1
     [Documentation]    Waiting for flows to appear on OVS switch.
     Switch Connection    GPSFC1_CONNECTION
@@ -42,4 +41,3 @@ Wait For Flows on GBPSFC6
     [Documentation]    Waiting for flows to appear on OVS switch.
     Switch Connection    GPSFC6_CONNECTION
     Wait For Flows On Switch    ${GBPSFC6}    sw6
-
index c9aafcc7114363b2ab77c476807d9ec0e2bab9f8..adadb436f18907cf0a03b3743bd95c4f5958259d 100644 (file)
@@ -1,21 +1,19 @@
 *** Settings ***
-Documentation    Deep icmp traffic inspection.
-...    Nodes are located on the same VM in different subnets and are members of the same EPG.
+Documentation     Deep icmp traffic inspection.
+...               Nodes are located on the same VM in different subnets and are members of the same EPG.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Ping Once from h35_2 to h36_2
     [Documentation]    Test icmp request.
-    Set Test Variables    client_name=h35_2   client_ip=10.0.35.2    server_name=h36_2    server_ip=10.0.36.2
-    ...   ether_type=0x0800    proto=1
+    Set Test Variables    client_name=h35_2    client_ip=10.0.35.2    server_name=h36_2    server_ip=10.0.36.2    ether_type=0x0800    proto=1
     Switch Connection    GPSFC1_CONNECTION
     Ping from Docker    ${CLIENT_NAME}    ${SERVER_IP}
 
@@ -26,18 +24,16 @@ Start Endless Ping from h35_2 to h36_2
 Find ICMP Req from h35_2 to h36_2 on GBPSFC6
     [Documentation]    Inspecting icmp req on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    proto=${PROTO}
 
 Find ICMP Resp from h36_2 to h35_2 on GBPSFC6
     [Documentation]    Inspecting icmp resp on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    proto=${PROTO}
 
 Stop Endless Ping from h35_2 to h36_2
     [Documentation]    Stoping of endless pinging after traffic inspection finishes.
     Switch Connection    GPSFC1_CONNECTION
-    Stop Endless Ping from Docker to Address   ${CLIENT_NAME}    ${SERVER_IP}
-
-
+    Stop Endless Ping from Docker to Address    ${CLIENT_NAME}    ${SERVER_IP}
index 8722c8e2ea4739b7e65f550305dfb23289647b07..c998a4df3a470e13b21f482eec9104cb858a869a 100644 (file)
@@ -1,21 +1,19 @@
 *** Settings ***
-Documentation    Deep icmp traffic inspection.
-...    Nodes are located on the same VM in the same subnet and are members of the same EPG.
+Documentation     Deep icmp traffic inspection.
+...               Nodes are located on the same VM in the same subnet and are members of the same EPG.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Ping Once from h35_2 to h35_3
     [Documentation]    Test icmp request.
-    Set Test Variables    client_name=h35_2   client_ip=10.0.35.2    server_name=h35_3    server_ip=10.0.35.3
-    ...   ether_type=0x0800    proto=1
+    Set Test Variables    client_name=h35_2    client_ip=10.0.35.2    server_name=h35_3    server_ip=10.0.35.3    ether_type=0x0800    proto=1
     Switch Connection    GPSFC1_CONNECTION
     Ping from Docker    ${CLIENT_NAME}    ${SERVER_IP}
 
@@ -26,18 +24,16 @@ Start Endless Ping from h35_2 to h35_3
 Find ICMP Req from h35_2 to h35_3 on GBPSFC6
     [Documentation]    Inspecting icmp req on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=5    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=5    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    proto=${PROTO}
 
 Find ICMP Resp from h35_3 to h35_2 on GBPSFC6
     [Documentation]    Inspecting icmp resp on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=5    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=5    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    proto=${PROTO}
 
 Stop Endless Ping from h35_2 to h35_3
     [Documentation]    Stoping of endless pinging after traffic inspection finishes.
     Switch Connection    GPSFC1_CONNECTION
-    Stop Endless Ping from Docker to Address   ${CLIENT_NAME}    ${SERVER_IP}
-
-
+    Stop Endless Ping from Docker to Address    ${CLIENT_NAME}    ${SERVER_IP}
index 5e35a189812fb90f1eb22860b827823867ca8fc3..f8cfd097f94b6e09bde91e399fa6c5c93c2236f5 100644 (file)
@@ -1,21 +1,19 @@
 *** Settings ***
-Documentation    Deep icmp traffic inspection.
-...    Nodes are located on the same VM, in different subnets and are members of the same EPG.
+Documentation     Deep icmp traffic inspection.
+...               Nodes are located on the same VM, in different subnets and are members of the same EPG.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Ping from h36_4 to h35_4
     [Documentation]    Test icmp request.
-    Set Test Variables    client_name=h36_4   client_ip=10.0.36.4    server_name=h35_4    server_ip=10.0.35.4
-    ...   ether_type=0x0800    proto=1
+    Set Test Variables    client_name=h36_4    client_ip=10.0.36.4    server_name=h35_4    server_ip=10.0.35.4    ether_type=0x0800    proto=1
     Switch Connection    GPSFC6_CONNECTION
     Ping from Docker    ${CLIENT_NAME}    ${SERVER_IP}
 
@@ -26,18 +24,16 @@ Start Endless Ping from h36_4 to h35_4
 Find ICMP Req from h36_4 to h35_4 on GBPSFC6
     [Documentation]    Inspecting icmp req on GBPSFC6.
     Switch Connection    GPSFC6_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=4    eth_type=0x0800    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=4    eth_type=0x0800    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    proto=${PROTO}
 
 Find ICMP Resp from h35_4 to h36_4 on GBPSFC6
     [Documentation]    Inspecting icmp resp on GBPSFC6.
     Switch Connection    GPSFC6_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=6    eth_type=0x0800    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=6    eth_type=0x0800    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    proto=${PROTO}
 
 Stop Endless Ping from h36_4 to h35_4
     [Documentation]    Stoping of endless pinging after traffic inspection finishes.
     Switch Connection    GPSFC6_CONNECTION
-    Stop Endless Ping from Docker to Address   ${CLIENT_NAME}    ${SERVER_IP}
-
-
+    Stop Endless Ping from Docker to Address    ${CLIENT_NAME}    ${SERVER_IP}
index 74b64122f29b2db6370978d09c61ef3d7ff02f66..b313ebc2125dbd5e1ea2a6f0be5aa32eb8071105 100644 (file)
@@ -1,21 +1,20 @@
 *** Settings ***
-Documentation    Deep icmp traffic inspection.
-...    Nodes are located on different VMs in different subnets and are members of different EPGs.
+Documentation     Deep icmp traffic inspection.
+...               Nodes are located on different VMs in different subnets and are members of different EPGs.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Ping from h36_5 to h35_2
     [Documentation]    Test icmp request.
-    Set Test Variables    client_name=h36_5   client_ip=10.0.36.5    server_name=h35_2    server_ip=10.0.35.2
-    ...   ether_type=0x0800    proto=1    vxlan_port=3
+    Set Test Variables    client_name=h36_5    client_ip=10.0.36.5    server_name=h35_2    server_ip=10.0.35.2    ether_type=0x0800    proto=1
+    ...    vxlan_port=3
     Switch Connection    GPSFC6_CONNECTION
     Ping from Docker    ${CLIENT_NAME}    ${SERVER_IP}
 
@@ -26,30 +25,28 @@ Start Endless Ping from h36_5 to h35_2
 Find ICMP Req from h36_5 to h35_2 on GBPSFC6
     [Documentation]    Inspecting icmp req on GBPSFC6.
     Switch Connection    GPSFC6_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=7    out_port=${VXLAN_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC1}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=7    out_port=${VXLAN_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    next_hop_ip=${GBPSFC1}    proto=${PROTO}
 
 Find ICMP Req from h36_5 to h35_2 on GBPSFC1
     [Documentation]    Inspecting icmp req on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_PORT}    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
-    ...    outer_src_ip=${GBPSFC6}    outer_dst_ip=${GBPSFC1}    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_PORT}    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    outer_src_ip=${GBPSFC6}
+    ...    outer_dst_ip=${GBPSFC1}    proto=${PROTO}
 
 Find ICMP Resp from h35_2 to h36_5 on GBPSFC1
     [Documentation]    Inspecting icmp resp on GBPSFC1.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=${VXLAN_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC6}    proto=${PROTO}
+    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=${VXLAN_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    next_hop_ip=${GBPSFC6}    proto=${PROTO}
 
 Find ICMP Resp from h35_2 to h36_5 on GBPSFC6
     [Documentation]    Inspecting icmp resp on GBPSFC6.
     Switch Connection    GPSFC6_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_PORT}    out_port=7    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
-    ...    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC6}    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_PORT}    out_port=7    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    outer_src_ip=${GBPSFC1}
+    ...    outer_dst_ip=${GBPSFC6}    proto=${PROTO}
 
 Stop Endless Ping from h36_5 to h35_2
     [Documentation]    Stoping of endless pinging after traffic inspection finishes.
     Switch Connection    GPSFC6_CONNECTION
-    Stop Endless Ping from Docker to Address   ${CLIENT_NAME}    ${SERVER_IP}
-
-
+    Stop Endless Ping from Docker to Address    ${CLIENT_NAME}    ${SERVER_IP}
index 41cfbe63e1347a7664f4492dd3cc5a4c7d38cd21..a665d17812c08c8da6690498f7945fc62a43be51 100644 (file)
 *** Settings ***
-Documentation    Deep inspection of HTTP traffic on symmetric chain.
-...    Nodes are located on the same VM.
+Documentation     Deep inspection of HTTP traffic on symmetric chain.
+...               Nodes are located on the same VM.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Start HTTP on h36_2 on Port 80
     [Documentation]    Starting HTTP service on docker container.
-    Set Test Variables    client_name=h35_2   client_ip=10.0.35.2    server_name=h36_2    server_ip=10.0.36.2
-    ...   service_port=80    ether_type=0x0800    proto=6    vxlan_gpe_port=2
+    Set Test Variables    client_name=h35_2    client_ip=10.0.35.2    server_name=h36_2    server_ip=10.0.36.2    service_port=80    ether_type=0x0800
+    ...    proto=6    vxlan_gpe_port=2
     Switch Connection    GPSFC1_CONNECTION
     Start HTTP Service on Docker    ${SERVER_NAME}    ${SERVICE_PORT}
 
 Curl h36_2 from h35_2
-    [Documentation]     Test HTTP request from a docker container to serving docker container.
-    Curl from Docker    ${CLIENT_NAME}      ${SERVER_IP}    service_port=${SERVICE_PORT}
+    [Documentation]    Test HTTP request from a docker container to serving docker container.
+    Curl from Docker    ${CLIENT_NAME}    ${SERVER_IP}    service_port=${SERVICE_PORT}
 
 Start Endless Curl on h35_2 on port 80
     [Documentation]    Starting endless HTTP session for traffic inspection.
-    Start Endless Curl from Docker    ${CLIENT_NAME}      ${SERVER_IP}    ${SERVICE_PORT}    sleep=1
+    Start Endless Curl from Docker    ${CLIENT_NAME}    ${SERVER_IP}    ${SERVICE_PORT}    sleep=1
 
 On GBPSFC1 Send HTTP req h35_2-h36_2 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsi=255    proto=${PROTO}   dst_port=${SERVICE_PORT}
+    ${flow}    Inspect Classifier Outbound    in_port=4    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    next_hop_ip=${GBPSFC2}    nsi=255    proto=${PROTO}    dst_port=${SERVICE_PORT}
     ${nsp_35_2-nsp_36_2}    GET NSP Value From Flow    ${flow}
     Set Global Variable    ${NSP_path1}    ${nsp_35_2-nsp_36_2}
 
 On GBPSFC2 Send HTTP req h35_2-h36_2 to GBPSFC3
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path1}    nsi=255    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path1}    nsi=255    proto=${PROTO}
 
 On GBPSFC3 Send HTTP req h35_2-h36_2 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC3_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path1}    received_nsi=255
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path1}    received_nsi=255
 
 On GBPSFC2 Send HTTP req h35_2-h36_2 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
 
 On GBPSFC4 Send HTTP req h35_2-h36_2 to GBPSFC5
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
 
 On GBPSFC5 Send HTTP req h35_2-h36_2 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC5_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    received_nsi=254
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    received_nsi=254
 
 On GBPSFC4 Send HTTP req h35_2-h36_2 to GBPSFC1
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
 
 On GBPSFC1 Send HTTP req h35_2-h36_2 to h36_2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
-    ...    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    outer_src_ip=${GBPSFC4}
+    ...    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
 
 On GBPSFC1 Send HTTP resp h36_2-h35_2 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsi=255    proto=${PROTO}   src_port=${SERVICE_PORT}
+    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    next_hop_ip=${GBPSFC4}    nsi=255    proto=${PROTO}    src_port=${SERVICE_PORT}
     ${nsp_36_2-nsp_35_2}    GET NSP Value From Flow    ${flow}
     Set Global Variable    ${NSP_path2}    ${nsp_36_2-nsp_35_2}
 
 On GBPSFC4 Send HTTP resp h36_2-h35_2 to GBPSFC5
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path2}    nsi=255    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path2}    nsi=255    proto=${PROTO}
 
 On GBPSFC5 Send HTTP resp h36_2-h35_2 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC5_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path2}    received_nsi=255
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path2}    received_nsi=255
 
 On GBPSFC4 Send HTTP resp h36_2-h35_2 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
 
 On GBPSFC2 Send HTTP resp h36_2-h35_2 to GBPSFC3
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
 
 On GBPSFC3 Send HTTP resp h36_2-h35_2 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC3_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    received_nsi=254
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    received_nsi=254
 
 On GBPSFC2 Send HTTP resp h36_2-h35_2 to GBPSFC1
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
 
 On GBPSFC1 Send HTTP resp h36_2-h35_2 to h35_2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
-    ...    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=4    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    outer_src_ip=${GBPSFC2}
+    ...    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
 
 Compare NSPs
     [Documentation]    Verifying that different paths were taken.
@@ -139,4 +138,3 @@ Stop Endless Curl on h35_2 on port 80
 Stop HTTP on h36_2 on Port 80
     [Documentation]    Stopping HTTP service on the docker container.
     Stop HTTP Service on Docker    ${SERVER_NAME}
-
index f4b9e8478aacd5c71888d3c5ce2844ca8e583553..26f2e77040d8370bb7d85c1486e304d32b200600 100644 (file)
@@ -1,26 +1,25 @@
 *** Settings ***
-Documentation    Deep inspection of HTTP traffic on symmetric chain.
-...    Nodes are located on different VMs.
+Documentation     Deep inspection of HTTP traffic on symmetric chain.
+...               Nodes are located on different VMs.
+Suite Setup       Start Connections
+Suite Teardown    Close Connections
 Library           SSHLibrary
 Resource          ../../../../../libraries/GBP/OpenFlowUtils.robot
 Resource          ../Variables.robot
 Resource          ../Connections.robot
-Suite Setup       Start Connections
-Suite Teardown    Close Connections
 
 *** Variables ***
 
 *** Testcases ***
-
 Start HTTP on h36_4 on Port 80
     [Documentation]    Starting HTTP service on docker container.
-    Set Test Variables    client_name=h35_3   client_ip=10.0.35.3    server_name=h36_4    server_ip=10.0.36.4
-    ...    service_port=80    ether_type=0x0800    proto=6    vxlan_gpe_port=2
+    Set Test Variables    client_name=h35_3    client_ip=10.0.35.3    server_name=h36_4    server_ip=10.0.36.4    service_port=80    ether_type=0x0800
+    ...    proto=6    vxlan_gpe_port=2
     Switch Connection    GPSFC6_CONNECTION
     Start HTTP Service on Docker    ${SERVER_NAME}    ${SERVICE_PORT}
 
 Curl h36_4 from h35_3
-    [Documentation]     Test HTTP request from a docker container to serving docker container.
+    [Documentation]    Test HTTP request from a docker container to serving docker container.
     Switch Connection    GPSFC1_CONNECTION
     Curl from Docker    ${CLIENT_NAME}    ${SERVER_IP}    service_port=${SERVICE_PORT}
 
@@ -31,102 +30,102 @@ Start Endless Curl on h35_3 on port 80
 On GBPSFC1 Send HTTP req h35_3-h36_4 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=5    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
-    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsi=255    proto=${PROTO}   dst_port=${SERVICE_PORT}
+    ${flow}    Inspect Classifier Outbound    in_port=5    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
+    ...    next_hop_ip=${GBPSFC2}    nsi=255    proto=${PROTO}    dst_port=${SERVICE_PORT}
     ${nsp_35_3-nsp_36_4}    GET NSP Value From Flow    ${flow}
     Set Global Variable    ${NSP_path1}    ${nsp_35_3-nsp_36_4}
 
 On GBPSFC2 Send HTTP req h35_3-h36_4 to GBPSFC3
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path1}    nsi=255    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC1}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path1}    nsi=255    proto=${PROTO}
 
 On GBPSFC3 Send HTTP req h35_3-h36_4 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC3_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path1}    received_nsi=255
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path1}    received_nsi=255
 
 On GBPSFC2 Send HTTP req h35_3-h36_4 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
 
 On GBPSFC4 Send HTTP req h35_3-h36_4 to GBPSFC5
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path1}    nsi=254    proto=${PROTO}
 
 On GBPSFC5 Send HTTP req h35_3-h36_4 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC5_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    received_nsi=254
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path1}    received_nsi=254
 
 On GBPSFC4 Send HTTP req h35_3-h36_4 to GBPSFC6
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC6}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}
+    ...    inner_dst_ip=${SERVER_IP}    next_hop_ip=${GBPSFC6}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
 
 On GBPSFC6 Send HTTP req h35_3-h36_4 to h36_4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC6_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}
-    ...    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC6}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=6    eth_type=${ETHER_TYPE}    inner_src_ip=${CLIENT_IP}    inner_dst_ip=${SERVER_IP}    outer_src_ip=${GBPSFC4}
+    ...    outer_dst_ip=${GBPSFC6}    nsp=${NSP_path1}    nsi=253    proto=${PROTO}
 
 On GBPSFC6 Send HTTP resp h36_4-h35_3 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC6_CONNECTION
-    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
-    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsi=255    proto=${PROTO}   src_port=${SERVICE_PORT}
+    ${flow}    Inspect Classifier Outbound    in_port=6    out_port=${VXLAN_GPE_PORT}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
+    ...    next_hop_ip=${GBPSFC4}    nsi=255    proto=${PROTO}    src_port=${SERVICE_PORT}
     ${nsp_36_4-nsp_35_3}    GET NSP Value From Flow    ${flow}
     Set Global Variable    ${NSP_path2}    ${nsp_36_4-nsp_35_3}
 
 On GBPSFC4 Send HTTP resp h36_4-h35_3 to GBPSFC5
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC6}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path2}    nsi=255    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC6}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC5}    nsp=${NSP_path2}    nsi=255    proto=${PROTO}
 
 On GBPSFC5 Send HTTP resp h36_4-h35_3 to GBPSFC4
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC5_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path2}    received_nsi=255
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC5}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC4}    nsp=${NSP_path2}    received_nsi=255
 
 On GBPSFC4 Send HTTP resp h36_4-h35_3 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC4_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC5}    outer_dst_ip=${GBPSFC4}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
 
 On GBPSFC2 Send HTTP resp h36_4-h35_3 to GBPSFC3
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC4}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC3}    nsp=${NSP_path2}    nsi=254    proto=${PROTO}
 
 On GBPSFC3 Send HTTP resp h36_4-h35_3 to GBPSFC2
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC3_CONNECTION
-    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    received_nsi=254
+    Inspect Service Function    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC3}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC2}    nsp=${NSP_path2}    received_nsi=254
 
 On GBPSFC2 Send HTTP resp h36_4-h35_3 to GBPSFC1
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC2_CONNECTION
-    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}
-    ...    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
+    Inspect Service Function Forwarder    in_port=${VXLAN_GPE_PORT}    out_port=${VXLAN_GPE_PORT}    outer_src_ip=${GBPSFC3}    outer_dst_ip=${GBPSFC2}    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}
+    ...    inner_dst_ip=${CLIENT_IP}    next_hop_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
 
 On GBPSFC1 Send HTTP resp h36_4-h35_3 to h35_3
     [Documentation]    HTTP traffic inspection.
     Switch Connection    GPSFC1_CONNECTION
-    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=5    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}
-    ...    outer_src_ip=${GBPSFC2}    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
+    Inspect Classifier Inbound    in_port=${VXLAN_GPE_PORT}    out_port=5    eth_type=${ETHER_TYPE}    inner_src_ip=${SERVER_IP}    inner_dst_ip=${CLIENT_IP}    outer_src_ip=${GBPSFC2}
+    ...    outer_dst_ip=${GBPSFC1}    nsp=${NSP_path2}    nsi=253    proto=${PROTO}
 
 Compare NSPs
     [Documentation]    Verifying that different paths were taken.
@@ -141,4 +140,3 @@ Stop HTTP on h36_4 on Port 80
     [Documentation]    Stopping HTTP service on the docker container.
     Switch Connection    GPSFC6_CONNECTION
     Stop HTTP Service on Docker    ${SERVER_NAME}
-
index 4863d83b2e6f84122a008eec0a4e660406b74281..fe4f6789854c6b1cbf5a01588761e488bb613d93 100644 (file)
@@ -12,7 +12,6 @@ Resource          ../../../../../libraries/GBP/RestconfUtils.robot
 Resource          ../Variables.robot
 
 *** Test Cases ***
-
 Delete Service Function Paths
     [Documentation]    Delete Service Function Paths from ODL
     [Tags]    GBPSFCTEAR
@@ -52,5 +51,4 @@ Delete OVSDB Topology If Present
     [Documentation]    Delete OVSDB topology from ODL
     [Tags]    GBPSFCTEAR
     ${resp}    RequestsLibrary.Get Request    session    ${TOPOLOGY_PATH}
-    Run Keyword If    ${resp.status_code} == 200
-    ...    Remove All Elements At URI And Verify    ${TOPOLOGY_PATH}
+    Run Keyword If    ${resp.status_code} == 200    Remove All Elements At URI And Verify    ${TOPOLOGY_PATH}
index 8e0e181702affd39a31da421535f4ceb603695cd..c2bf1d770fe04ad0eb45274d68cb6b0c24340b32 100644 (file)
@@ -6,13 +6,11 @@ Variables         ../../../../../variables/Variables.py
 Resource          ../Variables.robot
 Resource          ../GBPSFC_6node.robot
 
-
 *** Variables ***
-${timeout} =     10s
-
+${timeout}        10s
 
 *** Test Cases ***
 Teardown Suite
     Log    Teardown suite in symetric-chain
-    :FOR    ${GBPSFC}    IN    @{GBPSFCs}
+    : FOR    ${GBPSFC}    IN    @{GBPSFCs}
     \    GBPSFC_6node.Teardown Node    ${GBPSFC}    ${CURDIR}    timeout=${timeout}
index 08691249eb67a9045b2958235c58b1038a94de06..fc36c395dd1de8b3ea4d5059dc96b77932d943c7 100644 (file)
@@ -219,5 +219,3 @@ Delete the Bridge In Old Owner and Verify After Recover
 Delete Bridge Via Rest Call And Verify In Old Owner After Recover
     [Documentation]    This request will delete the bridge node from the config data store and operational data store.
     Delete Bridge Via Rest Call And Verify    ${original_cluster_list}    ${original_owner}
-
-
index ea82c3c82e52489f33349bec0682446d246e0bab..d94b311e8016900c5ee41f2977ea2de1347755e6 100644 (file)
@@ -51,10 +51,10 @@ Init Variables
 
 Init Variables Master
     [Documentation]    Sets variables specific to latest(master) version
-    Set Suite Variable    ${SFC_API}            /restconf/config/service-function:service-functions
+    Set Suite Variable    ${SFC_API}    /restconf/config/service-function:service-functions
     Set Suite Variable    ${SFC_FUNCTIONS_FILE} ${CURDIR}/../../../variables/sfc/master/service-functions.json
 
 Init Variables Lithium
     [Documentation]    Sets variables specific to Lithium version
-    Set Suite Variable    ${SFC_API}            /restconf/config/service-function:service-functions
+    Set Suite Variable    ${SFC_API}    /restconf/config/service-function:service-functions
     Set Suite Variable    ${SFC_FUNCTIONS_FILE} ${CURDIR}/../../../variables/sfc/lithium/service-functions.json
index 2eff1d23bf4138f1bfc195c301c2bf694705c05a..9a0f10afb5391ba27ad14fde2f079f472d603762 100644 (file)
@@ -11,24 +11,22 @@ Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${IP_1}    10.0.0.1
-${IP_2}    10.0.0.2
-${NODE_ID}    127.0.0.1
+${IP_1}           10.0.0.1
+${IP_2}           10.0.0.2
+${NODE_ID}        127.0.0.1
 ${engine_type}    11
-${engine_id}    11
-${nexthop}    0
-${port}    0
-${prot}    1
-${int1}    1
-${int2}    2
-${version}    5
-*** Test Cases ***
-
-
+${engine_id}      11
+${nexthop}        0
+${port}           0
+${prot}           1
+${int1}           1
+${int2}           2
+${version}        5
 
+*** Test Cases ***
 Verifying TSDR Data Store For Netflow Entries
     [Documentation]    Verify the Cassandra Data store to check if Netflow data is stored.
-    Copy TSDR tables     val_table=metriclog
+    Copy TSDR tables    val_table=metriclog
     ${metric_log}=    Verify the Metrics Syslog on Cassandra Client    grep DC=NETFLOW
     Should Contain    ${metric_log}    srcAddr=${IP_2}
     ${netflow}=    Create Temporary Key Info    srcAddr=${IP_2}    val_table=metriclog
@@ -51,7 +49,6 @@ Verifying TSDR Data Store For Netflow Entries
     Should Contain    ${netflow}    srcAS=0
     Should Contain    ${netflow}    dstMask=0
     Should Contain    ${netflow}    srcMask=0
-
     ${netflow}=    Create Temporary Key Info    srcAddr=${IP_1}    val_table=metriclog
     Should Contain    ${netflow}    srcAddr=${IP_1}
     Should Contain    ${netflow}    dstAddr=${IP_2}
@@ -73,7 +70,6 @@ Verifying TSDR Data Store For Netflow Entries
     Should Contain    ${netflow}    dstMask=0
     Should Contain    ${netflow}    srcMask=0
 
-
 *** Keywords ***
 Initialize Netflow
     [Documentation]    Initialize Netflow setup and start collecting the netflow samples.
@@ -81,7 +77,3 @@ Initialize Netflow
     Bringup Netflow
     Initialize Cassandra Tables Metricval    val_table=metriclog
     Wait Until Keyword Succeeds    36x    5 sec    Ping Pair Hosts Cassandra    \\d{2}
-
-
-
-
index 39b57a9b1f04a12453be8d2fc0e0f54c2c7a7366..cb2f55114eab4acd9d1e4b35e0dd37efe889c393 100644 (file)
@@ -11,20 +11,19 @@ Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${IP_1}    10.0.0.1
-${IP_2}    10.0.0.2
-${NODE_ID}    127.0.0.1
+${IP_1}           10.0.0.1
+${IP_2}           10.0.0.2
+${NODE_ID}        127.0.0.1
 ${engine_type}    11
-${engine_id}    11
-${nextHop}    0
-${port}    0
-${protocol}    1
-${int1}    1
-${int2}    2
-${version}    5
-*** Test Cases ***
-
+${engine_id}      11
+${nextHop}        0
+${port}           0
+${protocol}       1
+${int1}           1
+${int2}           2
+${version}        5
 
+*** Test Cases ***
 Verification of Full Record Text for Netflow Dumps
     [Documentation]    Verify the Netflow Record Text Hbase client
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1' , LIMIT => 10, FILTER => "ValueFilter( =, 'regexstring:srcAddr=${IP_2}' )" }
@@ -37,7 +36,6 @@ Verification of Full Record Text for Netflow Dumps
     Should Contain    ${out}    engine_id
     Should Contain    ${out}    input=${int2}
     Should Contain    ${out}    output=${int1}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1' , LIMIT => 10, FILTER => "ValueFilter( =, 'regexstring:srcAddr=${IP_1}' )" }
     Should Contain    ${out}    srcAddr=${IP_1}
     Should Contain    ${out}    dstAddr=${IP_2}
@@ -48,7 +46,6 @@ Verification of Full Record Text for Netflow Dumps
     Should Contain    ${out}    engine_id
     Should Contain    ${out}    input=${int1}
     Should Contain    ${out}    output=${int2}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW'
     Should Contain    ${out}    sysUpTime
     Should Contain    ${out}    flow_sequence
@@ -60,8 +57,6 @@ Verification of Full Record Text for Netflow Dumps
     Should Contain    ${out}    dstMask=0
     Should Contain    ${out}    srcMask=0
 
-
-
 Verification of Metric Record for Netflow Dumps
     [Documentation]    Verify the Netflow Metric Record Hbase client
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:dstAddr' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${IP_1}' )" }
@@ -74,36 +69,24 @@ Verification of Metric Record for Netflow Dumps
     Should Contain    ${out}    value=${IP_2}
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:input' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${int1}' )" }
     Should Contain    ${out}    value=${int1}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:output' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${int2}' )" }
     Should Contain    ${out}    value=${int2}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:input' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${int2}' )" }
     Should Contain    ${out}    value=${int2}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:output' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${int1}' )" }
     Should Contain    ${out}    value=${int1}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:flowDuration' , LIMIT => 10}
     Should Contain    ${out}    flowDuration
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:nextHop' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${nextHop}' )" }
     Should Contain    ${out}    value=${nextHop}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:version' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${version}' )" }
     Should Contain    ${out}    value=${version}
-
     ${out}=    Query the Data from HBaseClient    scan 'NETFLOW',{ COLUMNS => 'c1:protocol' , LIMIT => 10, FILTER => "ValueFilter( =, 'binaryprefix:${protocol}' )" }
     Should Contain    ${out}    value=${protocol}
 
-
 *** Keywords ***
 Initialize Netflow
     [Documentation]    Initialize Netflow setup and start collecting the netflow samples.
     Query the Data from HBaseClient    truncate 'NETFLOW'
     Bringup Netflow
     Wait Until Keyword Succeeds    36x    5 sec    Ping Pair Hosts Hbase    \\d{2} row
-
-
-
-
index 99b3dda00f896a764665c55f3490ee4813648720..448f1f332b4a730c35e01c3f0d83d811142b588f 100644 (file)
@@ -11,23 +11,22 @@ Resource          ../../../libraries/TsdrUtils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${IP_1}    10.0.0.1
-${IP_2}    10.0.0.2
-${NODE_ID}    127.0.0.1
+${IP_1}           10.0.0.1
+${IP_2}           10.0.0.2
+${NODE_ID}        127.0.0.1
 ${engine_type}    11
-${engine_id}    11
-${nexthop}    0
-${port}    0
-${prot}    1
-${int1}    1
-${int2}    2
-${version}    5
-*** Test Cases ***
-
+${engine_id}      11
+${nexthop}        0
+${port}           0
+${prot}           1
+${int1}           1
+${int2}           2
+${version}        5
 
+*** Test Cases ***
 Verification of Full Record Text for Netflow Dumps
     [Documentation]    Verify the Netflow Record Text Hbase client
-    ${out}=    Issue Command On Karaf Console     tsdr:list NETFLOW | grep srcAddr=${IP_2}
+    ${out}=    Issue Command On Karaf Console    tsdr:list NETFLOW | grep srcAddr=${IP_2}
     Should Contain    ${out}    srcPort=${port}
     Should Contain    ${out}    srcAddr=${IP_2}
     Should Contain    ${out}    dstAddr=${IP_1}
@@ -38,8 +37,7 @@ Verification of Full Record Text for Netflow Dumps
     Should Contain    ${out}    engine_id
     Should Contain    ${out}    input=${int2}
     Should Contain    ${out}    output=${int1}
-
-    ${out}=    Issue Command On Karaf Console     tsdr:list NETFLOW | grep srcAddr=${IP_1}
+    ${out}=    Issue Command On Karaf Console    tsdr:list NETFLOW | grep srcAddr=${IP_1}
     Should Contain    ${out}    srcAddr=${IP_1}
     Should Contain    ${out}    dstAddr=${IP_2}
     Should Contain    ${out}    dstPort=${port}
@@ -65,7 +63,3 @@ Initialize Netflow
     [Documentation]    Initialize Mininet topology and check if netflow data is getting collected
     Bringup Netflow
     Wait Until Keyword Succeeds    36x    5 sec    Ping Pair Hosts HSQLDB    2\\d+
-
-
-
-
index 7afa0319a9ae00fc8095da013139e8207bf34c34..4cbb60d0229207ea45ee7866cf8f09abe1e00ecc 100644 (file)
@@ -13,16 +13,15 @@ Resource          ../../../libraries/Utils.robot
 Resource          ../../../libraries/UnimgrKeywords.robot
 
 *** Variables ***
-${DEFAULT_LINUX_PROMPT}
+${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
+${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
@@ -38,7 +37,6 @@ Create source and destination UNIs at the OVS instances using Restconf API
     ${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}
 
-
 Update UNI Speed
     [Documentation]    Update the Unis source and destenation speed
     [Tags]    UniMgr UNIs Speed
@@ -52,7 +50,6 @@ Update UNI Speed
     ${elements}    Create List    speed-10G
     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
@@ -77,7 +74,6 @@ Update EVC Ingress and Egress Speed
     ${elements}    Create List    speed-1G
     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
index 00ef6167609b8fad09b5ffce5e6a8c25a6d10fe8..fa823b2cefda214ad2adb2cc2165fd08a853956f 100644 (file)
@@ -14,11 +14,11 @@ Resource          ../../../libraries/KarafKeywords.robot
 Resource          ../../../libraries/UnimgrKeywords.robot
 
 *** Variables ***
-${DEFAULT_LINUX_PROMPT}
+${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
+${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
@@ -57,4 +57,4 @@ Delete UNIs source and destination
     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}
\ No newline at end of file
+    Wait Until Keyword Succeeds    16s    2s    Check For Elements On Karaf Command Output Message    uni-show ${Mininet2_IP}    ${elements}
index ded18605715be48b3b8f4824c295f3829e8ad6d6..4255839b0e4925f22f65a0a500dc5db9a86299ff 100644 (file)
@@ -6,18 +6,12 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** 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"}]
-
 ${flowfilterInetdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/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.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${flowfilterIcmpCodedata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${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"}]
-
-${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"}]
+${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"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
@@ -99,7 +93,7 @@ Verify inet4src and inet4dst of vtn flowfilter
 
 Add a vbr flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
-    Add a vbr flowfilter    Tenant1    vBridge1     ${flowfilterInetdata}
+    Add a vbr flowfilter    Tenant1    vBridge1    ${flowfilterInetdata}
     Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify inet4src and inet4dst of vbr flowfilter
@@ -122,7 +116,7 @@ Add a vtn flowfilter with Icmp code
 
 Verify icmp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}    @{icmp_action}
 
 Add a vbr flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
@@ -140,7 +134,7 @@ Add a vbrif flowfilter with Icmp code
 
 Verify icmp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF10}    @{icmp_action}
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
@@ -154,7 +148,7 @@ Add a vtn flowfilter with dscp
 
 Verify dscp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a vbr flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -163,7 +157,7 @@ Add a vbr flowfilter with dscp
 
 Verify dscp action for vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a vbrif flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -172,7 +166,7 @@ Add a vbrif flowfilter with dscp
 
 Verify dscp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_flow}    ${DUMPFLOWS_OF10}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_flow}    ${DUMPFLOWS_OF10}
 
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
index c6206f950c0505cd29efb90f222294a2a077505a..65ad51af6e5b80842445b060ed2a08c2c75a3fda 100644 (file)
@@ -5,7 +5,7 @@ Suite Teardown    Stop PathSuiteVtnMaTest
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** 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"}]
+${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"}]}}
 
index 473a8434505b52a7310fe96425dd94c55497a8e0..8ed2d447d34013216b256029b34d61c0fda6bf4c 100644 (file)
@@ -8,7 +8,6 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 ${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
     [Documentation]    Create a flowcondition cond_1 using restconfig api
     Add a flowcondition    cond_1    ${flowconditiondata}
index a04e3d7e67830ef14461e8553d697cba32513924..1101d272c51086cd5e3ae815aa31b13aa193754b 100644 (file)
@@ -6,18 +6,12 @@ Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** 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"}]
-
 ${flowfilterInetdata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/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.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${flowfilterIcmpCodedata}    "vtn-flow-filter":[{"condition":"cond_1","vtn-pass-filter":{},"vtn-flow-action":[{"order": "1","vtn-set-inet-src-action":{"ipv4-address":"10.0.0.1/32"}},{"order": "2","vtn-set-inet-dst-action":{"ipv4-address":"10.0.0.3/32"}}],"index": "1"}]
-
 ${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"}]
-
-${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"}]
+${flowfilterDscpdata}    "vtn-flow-filter":[{"condition": "cond_1","vtn-pass-filter": {},"vtn-flow-action": [{"order": "1","vtn-set-inet-dscp-action": {"dscp":"32"}}],"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
@@ -99,7 +93,7 @@ Verify inet4src and inet4dst of vtn flowfilter
 
 Add a vbr flowfilter with inet4src and inet4dst
     [Documentation]    Create a flowfilter with inet4 and Verify ping
-    Add a vbr flowfilter    Tenant1    vBridge1     ${flowfilterInetdata}
+    Add a vbr flowfilter    Tenant1    vBridge1    ${flowfilterInetdata}
     Wait_Until_Keyword_Succeeds    20s    1s    Mininet Ping Should Succeed    h1    h3
 
 Verify inet4src and inet4dst of vbr flowfilter
@@ -122,7 +116,7 @@ Add a vtn flowfilter with Icmp code
 
 Verify icmp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF13}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF13}    @{icmp_action}
 
 Add a vbr flowfilter with Icmp code
     [Documentation]    Create a flowfilter with icmp code and Verify ping
@@ -140,7 +134,7 @@ Add a vbrif flowfilter with Icmp code
 
 Verify icmp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for icmp code and type
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF13}     @{icmp_action}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify Flow Entries for Flowfilter    ${DUMPFLOWS_OF13}    @{icmp_action}
 
 Add a flowfilter with tpsrc and tpdst
     [Documentation]    Create a flowfilter with tpsrc and tpdst and Verify ping
@@ -154,7 +148,7 @@ Add a vtn flowfilter with dscp
 
 Verify dscp action for vtn flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_action}    ${DUMPFLOWS_OF13}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_action}    ${DUMPFLOWS_OF13}
 
 Add a vbr flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -163,7 +157,7 @@ Add a vbr flowfilter with dscp
 
 Verify dscp action for vbr flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_action}    ${DUMPFLOWS_OF13}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_action}    ${DUMPFLOWS_OF13}
 
 Add a vbrif flowfilter with dscp
     [Documentation]    Create a flowfilter with dscp and Verify ping
@@ -172,7 +166,7 @@ Add a vbrif flowfilter with dscp
 
 Verify dscp action for vbrif flowfilter
     [Documentation]    Verify actions in Flow Enties for dscp
-    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions     ${dscp_action}    ${DUMPFLOWS_OF13}
+    Wait_Until_Keyword_Succeeds    20s    1s    Verify flowactions    ${dscp_action}    ${DUMPFLOWS_OF13}
 
 Add a flowfilter with vlanpcp
     [Documentation]    Create a flowfilter with vlanpcp and Verify ping
@@ -187,7 +181,7 @@ Add a flowfilter with inet4 for drop
 Verify Removed Flow Entry For Inet After Drop Action
     [Documentation]    Verify no flows between the hosts after drop
     [Tags]    exclude
-    Verify Removed Flow Entry for Inet Drop Flowfilter   @{inet_actions}    ${DUMPFLOWS_OF13}
+    Verify Removed Flow Entry for Inet Drop Flowfilter    @{inet_actions}    ${DUMPFLOWS_OF13}
 
 Delete a flowcondition
     [Documentation]    Delete a flowcondition
index 226ac609662b6e9dbb1f53212fa989dffdc145b5..668999b5ab0ef36f71be257f988b56a5c2141cb1 100644 (file)
@@ -5,7 +5,7 @@ Suite Teardown    Stop PathSuiteVtnMaTest
 Resource          ../../../libraries/VtnMaKeywords.robot
 
 *** 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"}]
+${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"}]}}
 
@@ -56,7 +56,7 @@ 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