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/access_control_lists.robot | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'resources/libraries/robot/honeycomb/access_control_lists.robot') diff --git a/resources/libraries/robot/honeycomb/access_control_lists.robot b/resources/libraries/robot/honeycomb/access_control_lists.robot index 1d42cf186a..3f0b3d0592 100644 --- a/resources/libraries/robot/honeycomb/access_control_lists.robot +++ b/resources/libraries/robot/honeycomb/access_control_lists.robot @@ -18,7 +18,6 @@ | Library | resources.libraries.python.InterfaceUtil | Library | resources.libraries.python.honeycomb.HcAPIKwACL.ACLKeywords | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords -| ... | WITH NAME | InterfaceAPI | Documentation | Keywords used to manage ACLs. *** Keywords *** @@ -92,7 +91,7 @@ | | ... | \| Honeycomb enables ACL on interface \| ${nodes['DUT1']} \ | | ... | \| GigabithEthernet0/8/0 \| table0 \| | | [Arguments] | ${node} | ${interface} | ${table_name} -| | InterfaceAPI.Enable ACL on interface +| | Enable ACL on interface | | ... | ${node} | ${interface} | ${table_name} | Honeycomb disables ACL on interface @@ -107,7 +106,7 @@ | | ... | \| Honeycomb disables ACL on interface \| ${nodes['DUT1']} \ | | ... | \| GigabithEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} -| | InterfaceAPI.Disable ACL on interface | ${node} | ${interface} +| | Disable ACL on interface | ${node} | ${interface} | ACL table from Honeycomb should be | | [Documentation] | Retrieves ACL table information from Honeycomb\ @@ -268,7 +267,7 @@ | | ... | \| Interface ACL configuration from Honeycomb should be \ | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| table0 \| | | [Arguments] | ${node} | ${interface} | ${table_name} -| | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface} +| | ${data}= | Get interface oper data | ${node} | ${interface} | | Should be equal | | ... | ${table_name} | | ... | ${data['vpp-interface-acl:acl']['ingress']['l2-acl']['classify-table']} @@ -306,7 +305,7 @@ | | ... | \| Interface ACL configuration from Honeycomb should be empty \ | | ... | \| ${nodes['DUT1']} \| GigabithEthernet0/8/0 \| | | [Arguments] | ${node} | ${interface} -| | ${data}= | InterfaceAPI.Get interface oper data | ${node} | ${interface} +| | ${data}= | Get interface oper data | ${node} | ${interface} | | Run keyword and expect error | *KeyError: 'vpp-interface-acl:acl' | | ... | Set Variable | | ... | ${data['vpp-interface-acl:acl']['l2-acl']['classify-table']} -- cgit 1.2.3-korg