From b7f0c133f672b39b49e0480f71dd0629986bcf72 Mon Sep 17 00:00:00 2001 From: selias Date: Wed, 21 Jun 2017 18:52:10 +0200 Subject: HC Test: improve functional suite setup and teardown Restart the whole stack (VPP+Honeycomb+-ODL) in between test suites. Add generic suite setup and suite teardown keywords for all func suites Re-enable NSH_SFC suite, cleanup test failures Change-Id: I71025b4ed3a7c4912dcd7b62aedef6082357990c Signed-off-by: selias --- resources/libraries/robot/honeycomb/vxlan.robot | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'resources/libraries/robot/honeycomb/vxlan.robot') diff --git a/resources/libraries/robot/honeycomb/vxlan.robot b/resources/libraries/robot/honeycomb/vxlan.robot index b3bf083587..ed21d192c8 100644 --- a/resources/libraries/robot/honeycomb/vxlan.robot +++ b/resources/libraries/robot/honeycomb/vxlan.robot @@ -13,9 +13,7 @@ *** Settings *** | Library | resources.libraries.python.InterfaceUtil -| ... | WITH NAME | interfaceCLI | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords -| ... | WITH NAME | InterfaceAPI *** Keywords *** | Honeycomb sets interface VxLAN configuration @@ -32,7 +30,7 @@ | | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} -| | interfaceAPI.Create VxLAN interface | ${node} | ${interface} +| | Honeycomb Create VxLAN interface | ${node} | ${interface} | | ... | &{settings} | Honeycomb removes VxLAN tunnel settings @@ -47,7 +45,7 @@ | | ... | | ... | \| Honeycomb removes VxLAN tunnel \| ${nodes['DUT1']} \| vxlan_01 \| | | [Arguments] | ${node} | ${interface} -| | interfaceAPI.Delete interface | ${node} | ${interface} +| | Delete interface | ${node} | ${interface} | VxLAN Operational Data From Honeycomb Should Be | | [Documentation] | Retrieves interface VxLAN configuration through Honeycomb\ @@ -65,7 +63,7 @@ | | ... | 'dst':'192.168.0.3', 'vni':5, 'encap-vrf-id':0}} \| | | ... | | [Arguments] | ${node} | ${interface} | ${settings} -| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} +| | ${api_data}= | Get interface oper data | ${node} | ${interface} | | ${api_vxlan}= | Set Variable | ${api_data['v3po:vxlan']} | | :FOR | ${key} | IN | @{settings.keys()} | | | Should be equal | ${api_vxlan['${key}']} | ${settings['${key}']} @@ -111,7 +109,7 @@ | | ... | \|${nodes['DUT1']} \| vxlan_01 \| | | ... | | [Arguments] | ${node} | ${interface} -| | ${api_data}= | interfaceAPI.Get interface oper data | ${node} | ${interface} +| | ${api_data}= | Get interface oper data | ${node} | ${interface} | | Run keyword and expect error | *KeyError: 'v3po:vxlan' | Set Variable | | ... | ${api_data['v3po:vxlan']} @@ -149,7 +147,7 @@ | | ... | | [Arguments] | ${node} | ${interface} | ${settings} | | Run Keyword And Expect Error | HoneycombError: * Status code: 500. -| | ... | interfaceAPI.Configure interface vxlan +| | ... | Honeycomb Configure interface vxlan | | ... | ${node} | ${interface} | &{settings} | Honeycomb fails setting invalid VxLAN configuration @@ -169,5 +167,5 @@ | | [Arguments] | ${node} | ${interface} | ${settings_list} | | :FOR | ${settings} | IN | @{settings_list} | | | Run Keyword And Expect Error | HoneycombError: * Status code: 500. -| | | ... | interfaceAPI.Create VxLAN interface +| | | ... | Honeycomb Create VxLAN interface | | | ... | ${node} | ${interface} | &{settings} -- cgit 1.2.3-korg