X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FVtnMaKeywords.robot;h=cdcdc0f8d727824b922f906371e03791e5a5a89b;hb=026e7e3bd08f0457d8840cd6e5134ffbdcd789dd;hp=20183afa5ac8001a7ae0fe13484d764987c53dad;hpb=344cbb5400084ae443b8eb10d4c2e27b6d014dc4;p=integration%2Ftest.git diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index 20183afa5a..cdcdc0f8d7 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -16,13 +16,13 @@ ${VTN_INVENTORY} restconf/operational/vtn-inventory:vtn-nodes ${DUMPFLOWS_OF10} dpctl dump-flows -O OpenFlow10 ${DUMPFLOWS_OF13} dpctl dump-flows -O OpenFlow13 ${index} 7 -@{FLOWELMENTS} nw_src=10.0.0.1 nw_dst=10.0.0.3 actions=drop -@{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"} +@{inet_actions} nw_src=10.0.0.1 nw_dst=10.0.0.3 +@{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 ${vlanmap_bridge2} 300 -@{VLANMAP_BRIDGE1_DATAFLOW} "reason":"VLANMAPPED" "virtual-node-path":{"bridge-name":"vBridge1_vlan","tenant-name":"Tenant1","vlan-map-id":"ANY.200"} -@{VLANMAP_BRIDGE2_DATAFLOW} "reason":"VLANMAPPED" "virtual-node-path":{"bridge-name":"vBridge2_vlan","tenant-name":"Tenant1","vlan-map-id":"ANY.300"} +@{VLANMAP_BRIDGE1_DATAFLOW} "reason":"VLANMAPPED" "tenant-name":"Tenant1" "bridge-name":"vBridge1_vlan" +@{VLANMAP_BRIDGE2_DATAFLOW} "reason":"VLANMAPPED" "tenant-name":"Tenant1" "bridge-name":"vBridge2_vlan" ${out_before_pathpolicy} output:2 ${out_after_pathpolicy} output:3 ${pathpolicy_topo_13} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom topo-3sw-2host_multipath.py --topo pathpolicytopo --switch ovsk,protocols=OpenFlow13 @@ -30,6 +30,9 @@ ${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 +${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 @{PATHPOLICY_ATTR} "id":1 "port-desc":"openflow:4,2,s4-eth2" ${custom} ${CURDIR}/${CREATE_PATHPOLICY_TOPOLOGY_FILE_PATH} @@ -103,7 +106,7 @@ Add a vlanmap Verify Data Flows [Arguments] ${vtn_name} ${vBridge_name} [Documentation] Verify the reason and physical data flows for the specified vtn and vbridge - ${resp}= RequestsLibrary.Get Request session restconf/operational/vtn-flow-impl:vtn-flows/vtn-flow-table/${vtn_name} + ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow:get-data-flow data={"input":{"tenant-name":"${vtn_name}","mode":"UPDATESTATS"}} Run Keyword If '${vBridge_name}' == 'vBridge1' DataFlowsForBridge ${resp} @{BRIDGE1_DATAFLOW} ... ELSE IF '${vBridge_name}' == 'vBridge2' DataFlowsForBridge ${resp} @{BRIDGE2_DATAFLOW} ... ELSE IF '${vBridge_name}' == 'vBridge1_vlan' DataFlowsForBridge ${resp} @{VLANMAP_BRIDGE1_DATAFLOW} @@ -272,6 +275,13 @@ Verify macaddress Should Contain ${result} ${sourcemacaddress} Should Contain ${result} ${destmacaddress} +Verify flowactions + [Arguments] ${actions} ${DUMPFLOWS} + [Documentation] Verify the flowfilter actions after ping in the dumpflows + write ${DUMPFLOWS} + ${result} Read Until mininet> + Should Contain ${result} ${actions} + Add a vtn flowfilter [Arguments] ${vtn_name} ${vtnflowfilter_data} [Documentation] Create a flowfilter for a vtn @@ -290,27 +300,30 @@ Add a vbrif flowfilter ${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 -Verify Flow Entry for Inet Flowfilter +Verify Flow Entries for Flowfilter + [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 - Should Not Be Equal As Strings ${booleanValue} True + ${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} [Documentation] Verify removed switch flow entry using flowfilter drop for a vtn - ${booleanValue}= Run Keyword And Return Status Verify Actions on Flow Entry + ${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} [Documentation] check flow action elements by giving dumpflows in mininet - write ${DUMPFLOWS_OF13} + write ${dumpflows} ${result} Read Until mininet> - : FOR ${flowElement} IN @{FLOWELMENTS} + : FOR ${flowElement} IN @{flowfilter_actions} \ should Contain ${result} ${flowElement} Add a flowcondition - [Arguments] ${flowcond_name} + [Arguments] ${flowcond_name} ${flowconditiondata} [Documentation] Create a flowcondition using Restconfig Api - ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-condition:set-flow-condition data={"input":{"operation":"SET","present":"false","name":"${flowcond_name}", "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"}]}} + ${resp}= RequestsLibrary.Post Request session restconf/operations/vtn-flow-condition:set-flow-condition data={"input":{"operation":"SET","present":"false","name":"${flowcond_name}",${flowconditiondata}}} Should Be Equal As Strings ${resp.status_code} 200 Get flowconditions