X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FVtnMaKeywords.robot;h=78a1a6d46a14a9836d726cfe1d24d1d98cfe6840;hb=da091711b7737bebb144ade6b0ef1cd9f4de104b;hp=39a2ed4cbf1de7d6853fe99c26b92d40bf3c46dd;hpb=2b1be2ae215a794356a6e67fdd42460ef80e2c4a;p=integration%2Ftest.git diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index 39a2ed4cbf..78a1a6d46a 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -14,10 +14,14 @@ ${vlan_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan ${vlan_topo_13} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan_vtn_test.py --topo vlantopo --switch ovsk,protocols=OpenFlow13 ${VERSION_VTN} controller/nb/v2/vtn/version ${VTN_INVENTORY} restconf/operational/vtn-inventory:vtn-nodes -${DUMPFLOWS_OF10} dpctl dump-flows -O OpenFlow10 -${DUMPFLOWS_OF13} dpctl dump-flows -O OpenFlow13 +${DUMPFLOWS_OF10} dpctl dump-flows -OOpenFlow10 +${DUMPFLOWS_OF13} dpctl dump-flows -OOpenFlow13 +${FF_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s3 +${FF_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s3 +${DROP_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s2 +${DROP_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s2 ${index} 7 -@{inet_actions} nw_src=10.0.0.1 nw_dst=10.0.0.3 +@{inet_actions} mod_nw_src:192.0.0.1 mod_nw_dst:192.0.0.2 @{BRIDGE1_DATAFLOW} "reason":"PORTMAPPED" "tenant-name":"Tenant1" "bridge-name":"vBridge1" "interface-name":"if2" @{BRIDGE2_DATAFLOW} "reason":"PORTMAPPED" "tenant-name":"Tenant1" "bridge-name":"vBridge2" "interface-name":"if3" ${vlanmap_bridge1} 200 @@ -31,9 +35,12 @@ ${pathpolicy_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custo @{PATHMAP_ATTR} "index":"1" "condition":"flowcond_path" "policy":"1" ${policy_id} 1 ${in_port} 1 +${filter_index} 1 +@{inet_action} set_field:192.0.0.1->ip_src set_field:192.0.0.2->ip_dst ${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 +@{icmp_action} mod_tp_dst:1 mod_tp_src:3 +${drop_action} actions=drop @{PATHPOLICY_ATTR} "id":1 "port-desc":"openflow:4,2,s4-eth2" ${custom} ${CURDIR}/${CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH} @@ -237,8 +244,8 @@ Remove a portmap Verify FlowMacAddress [Arguments] ${host1} ${host2} ${OF_VERSION} [Documentation] Verify the source and destination mac address. - Run Keyword If '${OF_VERSION}' == 'OF10' Verify Flows On OpenFlow ${host1} ${host2} ${DUMPFLOWS_OF10} - ... ELSE VerifyFlowsOnOpenFlow ${host1} ${host2} ${DUMPFLOWS_OF13} + Run Keyword If '${OF_VERSION}' == 'OF10' Verify Flows On OpenFlow ${host1} ${host2} ${FF_DUMPFLOWS_OF10} + ... ELSE VerifyFlowsOnOpenFlow ${host1} ${host2} ${FF_DUMPFLOWS_OF13} Verify Flows On OpenFlow [Arguments] ${host1} ${host2} ${DUMPFLOWS} @@ -249,8 +256,8 @@ Verify Flows On OpenFlow Verify RemovedFlowMacAddress [Arguments] ${host1} ${host2} ${OF_VERSION} [Documentation] Verify the removed source and destination mac address. - Run Keyword If '${OF_VERSION}' == 'OF10' Verify Removed Flows On OpenFlow ${host1} ${host2} ${DUMPFLOWS_OF10} - ... ELSE VerifyRemovedFlowsOnOpenFlow ${host1} ${host2} ${DUMPFLOWS_OF13} + Run Keyword If '${OF_VERSION}' == 'OF10' Verify Removed Flows On OpenFlow ${host1} ${host2} ${FF_DUMPFLOWS_OF10} + ... ELSE Verify Removed Flows On OpenFlow ${host1} ${host2} ${FF_DUMPFLOWS_OF13} Verify Removed Flows On OpenFlow [Arguments] ${host1} ${host2} ${DUMPFLOWS} @@ -289,18 +296,36 @@ Add a vtn flowfilter ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:set-flow-filter data={"input": {"tenant-name": "${vtn_name}",${vtnflowfilter_data}}} Should Be Equal As Strings ${resp.status_code} 200 +Remove a vtn flowfilter + [Arguments] ${vtn_name} ${filter_index} + [Documentation] Delete a vtn flowfilter + ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:remove-flow-filter data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}"}} + Should Be Equal As Strings ${resp.status_code} 200 + Add a vbr flowfilter [Arguments] ${vtn_name} ${vBridge_name} ${vbrflowfilter_data} [Documentation] Create a flowfilter for a vbr ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:set-flow-filter data={"input": {"tenant-name": "${vtn_name}", "bridge-name": "${vBridge_name}", ${vbrflowfilter_data}}} Should Be Equal As Strings ${resp.status_code} 200 +Remove a vbr flowfilter + [Arguments] ${vtn_name} ${vBridge_name} ${filter_index} + [Documentation] Delete a vbr flowfilter + ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:remove-flow-filter data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}","bridge-name": "${vBridge_name}"}} + Should Be Equal As Strings ${resp.status_code} 200 + Add a vbrif flowfilter [Arguments] ${vtn_name} ${vBridge_name} ${interface_name} ${vbrif_flowfilter_data} [Documentation] Create a flowfilter for a vbrif ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:set-flow-filter data={"input": {"tenant-name": ${vtn_name}, "bridge-name": "${vBridge_name}","interface-name":"${interface_name}",${vbrif_flowfilter_data}}} Should Be Equal As Strings ${resp.status_code} 200 +Remove a vbrif flowfilter + [Arguments] ${vtn_name} ${vBridge_name} ${interface_name} ${filter_index} + [Documentation] Delete a vbrif flowfilter + ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-filter:remove-flow-filter data={"input": {"indices": ["${filter_index}"], "tenant-name": "${vtn_name}","bridge-name": "${vBridge_name}","interface-name": "${interface_name}"}} + Should Be Equal As Strings ${resp.status_code} 200 + Verify Flow Entries for Flowfilter [Arguments] ${dumpflows} @{flowfilter_actions} [Documentation] Verify switch flow entry using flowfilter for a vtn