X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fhoneycomb%2Ffunc%2Fmgmt-cfg-pluginacl-apihc-apivat-func.robot;h=ca717ae42fb0ab3e3b3ce46f35df11aafa90e513;hb=0e28406b43bf4ce145f1530f15dbb00957edf945;hp=302b22fa4ea0147d1f4f67e58aeb27d3c4fe5617;hpb=0cf1f0204e326cf93e36b344e2efd3cfa2f82870;p=csit.git

diff --git a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
index 302b22fa4e..ca717ae42f 100644
--- a/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
+++ b/tests/honeycomb/func/mgmt-cfg-pluginacl-apihc-apivat-func.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2019 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -38,10 +38,8 @@
 | Resource | resources/libraries/robot/shared/traffic.robot
 | Library | resources.libraries.python.honeycomb.HcAPIKwACL.ACLKeywords
 | Library | resources.libraries.python.Trace
-| Library | resources.libraries.python.IPv4Setup
-| Library | resources.libraries.python.IPv4Util
+| Library | resources.libraries.python.IPUtil
 | Library | resources.libraries.python.IPv6Util
-| Library | resources.libraries.python.Routing
 | ...
 | Test Setup | Clear Packet Trace on All DUTs | ${nodes}
 | ...
@@ -102,6 +100,9 @@
 | | ... | to the other, using different IPv4 IPs. Receive all packets except\
 | | ... | those with IPs in the filtered ranges and UDP protocol payload.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup Interfaces And Bridge Domain For plugin-acl Test
@@ -138,6 +139,9 @@
 | | ... | to the other, using different IPv6 IPs. Receive all packets except\
 | | ... | those with IPs in the filtered ranges and UDP protocol payload.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup interfaces and bridge domain for plugin-acl test
@@ -174,6 +178,9 @@
 | | ... | to the other, using different ports. Receive all packets except\
 | | ... | those with ports in the filtered ranges.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup interfaces and bridge domain for plugin-acl test
@@ -211,6 +218,9 @@
 | | ... | using IPs and ports. Receive all packets except those with\
 | | ... | both IPs and ports in the filtered ranges.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup Interfaces And Bridge Domain For plugin-acl Test
@@ -246,6 +256,9 @@
 | | ... | to the other, using different codes and types. Receive all packets\
 | | ... | except those with types and codes in the filtered ranges.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup interfaces and bridge domain for plugin-acl test
@@ -284,6 +297,9 @@
 | | ... | to the other, using different codes and types. Receive all packets\
 | | ... | except those with the filtered type and code.
 | | ...
+# HC2VPP-337: enable after ACL test failures in ODL tests are fixed
+| | [Tags] | HC_REST_ONLY
+| | ...
 | | [Teardown] | Bridged ACL test teardown
 | | ...
 | | Given Setup interfaces and bridge domain for plugin-acl test
@@ -432,9 +448,9 @@
 | | And Honeycomb adds interface IPv6 neighbor
 | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
 | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length}
-| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
 | | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length}
-| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
 | | When Honeycomb Creates ACL Chain Through ACL plugin
 | | ... | ${dut_node} | ${acl_name_l3_ip6} | ${acl_settings}
 | | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -609,9 +625,9 @@
 | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
 | | And VPP RA suppress link layer | ${dut_node} | ${dut_to_tg_if2}
 | | And VPP Route Add | ${node} | ${dst_net} | ${prefix_length}
-| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
 | | And VPP Route Add | ${node} | ${classify_dst_net} | ${prefix_length}
-| | ... | ${gateway} | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | gateway=${gateway} | interface=${dut_to_tg_if2}
 | | When Honeycomb Creates ACL Chain Through ACL plugin
 | | ... | ${dut_node} | ${acl_name_icmpv6} | ${acl_settings}
 | | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -656,14 +672,14 @@
 | | ...
 | | Given Setup Interface IPs And Routes For IPv4 plugin-acl Test
 | | ... | reflex | ${acl_name_reflex}
-| | And Add ARP on DUT
+| | And VPP Add IP Neighbor
 | | ... | ${node} | ${dut_to_tg_if1} | ${gateway2} | ${tg_to_dut_if1_mac}
 | | And VPP Route Add
-| | ... | ${node} | ${src_net} | ${prefix_length} | ${gateway2}
-| | ... | interface=${dut_to_tg_if1} | use_sw_index=False
+| | ... | ${node} | ${src_net} | ${prefix_length} | gateway=${gateway2}
+| | ... | interface=${dut_to_tg_if1}
 | | And VPP Route Add
-| | ... | ${node} | ${classify_src_net} | ${prefix_length} | ${gateway2}
-| | ... | interface=${dut_to_tg_if1} | use_sw_index=False
+| | ... | ${node} | ${classify_src_net} | ${prefix_length}
+| | ... | gateway=${gateway2} | interface=${dut_to_tg_if1}
 | | When Honeycomb Creates ACL Chain Through ACL plugin
 | | ... | ${dut_node} | ${acl_name_reflex} | ${acl_settings}
 | | And Honeycomb Assigns plugin-acl Chain To Interface
@@ -711,11 +727,11 @@
 | | And Honeycomb adds interface IPv4 neighbor
 | | ... | ${node} | ${dut_to_tg_if2} | ${gateway} | ${tg_to_dut_if2_mac}
 | | VPP Route Add
-| | ... | ${node} | ${dst_net} | ${prefix_length} | ${gateway}
-| | ... | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | ${node} | ${dst_net} | ${prefix_length} | gateway=${gateway}
+| | ... | interface=${dut_to_tg_if2}
 | | VPP Route Add
-| | ... | ${node} | ${classify_dst_net} | ${prefix_length} | ${gateway}
-| | ... | interface=${dut_to_tg_if2} | use_sw_index=False
+| | ... | ${node} | ${classify_dst_net} | ${prefix_length} | gateway=${gateway}
+| | ... | interface=${dut_to_tg_if2}
 
 | Setup interfaces and bridge domain for plugin-acl test
 | | [Documentation] | Import test variables, set interfaces up and bridge them.