X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FVtnMaKeywords.robot;h=7869a1ba3052fb6ff5ee7d274436329fd2d71355;hb=aff5ab67e558c98f530161ff014704512aade695;hp=83241135bbf1c71366556dd5f7762b2b40614b2d;hpb=560088bee640f46d8ea5769e3d1f261b2d95850c;p=integration%2Ftest.git diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index 83241135bb..7869a1ba30 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -6,15 +6,18 @@ Library Collections Library json Library RequestsLibrary Variables ../variables/Variables.py +Variables ../variables/vtn/Modules.py Resource ./Utils.robot Resource ./KarafKeywords.robot +Resource ./MininetKeywords.robot Resource ./TemplatedRequests.robot +Resource DataModels.robot *** Variables *** -${vlan_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan_vtn_test.py --topo vlantopo -${vlan_topo_13} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom vlan_vtn_test.py --topo vlantopo --switch ovsk,protocols=OpenFlow13 +${vlan_topo} --custom vlan_vtn_test.py --topo vlantopo ${VERSION_VTN} controller/nb/v2/vtn/version ${VTN_INVENTORY} restconf/operational/vtn-inventory:vtn-nodes +${ENTITY_OWNERS} restconf/operational/entity-owners:entity-owners ${DUMPFLOWS_OF10} dpctl dump-flows -OOpenFlow10 ${DUMPFLOWS_OF13} dpctl dump-flows -OOpenFlow13 ${FF_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s3 @@ -35,14 +38,14 @@ ${vlanmap_bridge2} 300 @{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 -${pathpolicy_topo_10} sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --custom topo-3sw-2host_multipath.py --topo pathpolicytopo --switch ovsk,protocols=OpenFlow10 +${pathpolicy_topo} --custom topo-3sw-2host_multipath.py --topo pathpolicytopo @{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->ip_dscp +${dscp_be_action} set_field:32->nw_tos_shifted ${dscp_flow} mod_nw_tos:128 @{icmp_action} mod_tp_dst:1 mod_tp_src:3 ${drop_action} actions=drop @@ -63,7 +66,7 @@ Start SuiteVtnMa SSHLibrary.Execute Command sudo sed -i "$ i log4j.logger.org.opendaylight.vtn = TRACE" ${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg Create Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_YANG_JSON} BuiltIn.Wait_Until_Keyword_Succeeds 30 3 Fetch vtn list - Start Suite + Start Mininet Start SuiteVtnMaTest [Documentation] Start VTN Manager Test Suite @@ -90,15 +93,11 @@ Fetch vtn switch inventory Collect Debug Info [Documentation] Check if Switch is detected. - ${resp_odl_inventory}= RequestsLibrary.Get Request session ${OPERATIONAL_NODES_API} - ${resp_vtn_inventory}= RequestsLibrary.Get Request session ${VTN_INVENTORY_NODE_API} write ${DUMPFLOWS_OF10} ${result} Read Until mininet> write ${DUMPFLOWS_OF13} ${result} Read Until mininet> - Log ${resp_odl_inventory.content} - Log ${resp_vtn_inventory.content} - Should Be Equal As Strings ${resp_vtn_inventory.status_code} 200 + Get Model Dump ${ODL_SYSTEM_IP} ${vtn_data_models} Add a Topology wait [Arguments] ${topo_wait} @@ -154,23 +153,24 @@ Verify Data Flows Start PathSuiteVtnMaTest [Documentation] Start VTN Manager Test Suite and Mininet Start SuiteVtnMaTest - Start Mininet ${TOOLS_SYSTEM_IP} ${pathpolicy_topo_13} ${custom} + MininetKeywords.Start Mininet Single Controller ${TOOLS_SYSTEM_IP} ${ODL_SYSTEM_IP} ${pathpolicy_topo} ${custom} ofversion=13 Start PathSuiteVtnMaTestOF10 [Documentation] Start VTN Manager Test Suite and Mininet in Open Flow 10 Specification Start SuiteVtnMaTest - Start Mininet ${TOOLS_SYSTEM_IP} ${pathpolicy_topo_10} ${custom} + MininetKeywords.Start Mininet Single Controller ${TOOLS_SYSTEM_IP} ${ODL_SYSTEM_IP} ${pathpolicy_topo} ${custom} ofversion=10 Stop PathSuiteVtnMaTest [Documentation] Cleanup/Shutdown work at the completion of all tests. Delete All Sessions - Stop Mininet ${mininet_conn_id} + MininetKeywords.Stop Mininet And Exit DataFlowsForBridge [Arguments] ${resp} @{BRIDGE_DATAFLOW} [Documentation] Verify whether the required attributes exists. - : FOR ${dataflowElement} IN @{BRIDGE_DATAFLOW} - \ should Contain ${resp.content} ${dataflowElement} + FOR ${dataflowElement} IN @{BRIDGE_DATAFLOW} + should Contain ${resp.text} ${dataflowElement} + END Add a pathmap [Arguments] ${pathmap_data} @@ -181,8 +181,9 @@ Add a pathmap Get a pathmap [Documentation] Get a pathmap for a vtn. ${resp}= RequestsLibrary.Get Request session restconf/operational/vtn-path-map:global-path-maps - : FOR ${pathElement} IN @{PATHMAP_ATTR} - \ should Contain ${resp.content} ${pathElement} + FOR ${pathElement} IN @{PATHMAP_ATTR} + should Contain ${resp.text} ${pathElement} + END Add a pathpolicy [Arguments] ${pathpolicy_data} @@ -194,8 +195,9 @@ Get a pathpolicy [Arguments] ${pathpolicy_id} [Documentation] Get a pathpolicy for a vtn. ${resp}= RequestsLibrary.Get Request session restconf/operational/vtn-path-policy:vtn-path-policies/vtn-path-policy/${pathpolicy_id} - : FOR ${pathpolicyElement} IN @{PATHPOLICY_ATTR} - \ should Contain ${resp.content} ${pathpolicyElement} + FOR ${pathpolicyElement} IN @{PATHPOLICY_ATTR} + should Contain ${resp.text} ${pathpolicyElement} + END Delete a pathmap [Arguments] ${tenant_path} @@ -251,8 +253,10 @@ Start vlan_topo [Arguments] ${OF} [Documentation] Create custom topology for vlan functionality Install Package On Ubuntu System vlan - Run Keyword If '${OF}' == 'OF13' Start Mininet ${TOOLS_SYSTEM_IP} ${vlan_topo_13} ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH} - ... ELSE IF '${OF}' == 'OF10' Start Mininet ${TOOLS_SYSTEM_IP} ${vlan_topo_10} ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH} + Run Keyword If '${OF}' == 'OF13' MininetKeywords.Start Mininet Single Controller ${TOOLS_SYSTEM_IP} ${ODL_SYSTEM_IP} ${vlan_topo} ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH} + ... ofversion=13 + ... ELSE IF '${OF}' == 'OF10' MininetKeywords.Start Mininet Single Controller ${TOOLS_SYSTEM_IP} ${ODL_SYSTEM_IP} ${vlan_topo} + ... ${CURDIR}/${CREATE_VLAN_TOPOLOGY_FILE_PATH} ofversion=10 Get flow [Arguments] ${vtn_name} @@ -374,8 +378,9 @@ Verify Actions on Flow Entry [Documentation] check flow action elements by giving dumpflows in mininet write ${dumpflows} ${result} Read Until mininet> - : FOR ${flowElement} IN @{flowfilter_actions} - \ should Contain ${result} ${flowElement} + FOR ${flowElement} IN @{flowfilter_actions} + should Contain ${result} ${flowElement} + END Add a flowcondition [Arguments] ${flowcond_name} ${flowconditiondata}