HC Test: Fix intermittent failures of HC startup

 - rework "check Honeycomb startup state" keyword
 - increase timeout value for startup
 - add separators to Honeycomb log file between test suites
 - other minor fixes:
    - remove usused import from NAT suite
    - fix loop in ICMPv6 ND proxy traffic script
    - add teardown to LISP cases
    - update prerequisites for sub-interface SPAN test

Change-Id: I2f714ffc1d2e8435d3abe690d8bd15099e071c9a
Signed-off-by: selias <samelias@cisco.com>

7 files changed, 35 insertions, 29 deletions

diff --git a/tests/vpp/func/honeycomb/__init__.robot b/tests/vpp/func/honeycomb/__init__.robot
index b7f0c1d7b9..80585a0e61 100644
--- a/tests/vpp/func/honeycomb/__init__.robot
+++ b/tests/vpp/func/honeycomb/__init__.robot
@@ -22,6 +22,7 @@
 | ...
 | Suite Setup | Run Keywords | Configure all DUTs before test | AND
 | ... | Set Global Variable | ${node} | AND
-| ... | Stop Honeycomb service on DUTs | ${node}
+| ... | Stop Honeycomb service on DUTs | ${node} | AND
+| ... | Clear Honeycomb Log | ${node}
 | ...
 | Suite Teardown | Archive Honeycomb log file | ${node}
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
index fa2506cba4..5966883049 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
@@ -13,7 +13,7 @@
 
 *** Variables***
 | ${ip_address}= | 192.168.0.4
-| @{ip_addresses}= | 192.168.0.4 | 192.168.0.5 | 192.168.0.6 | 192.168.0.7
+| @{ip_addresses}= | 192.168.0.5 | 192.168.0.6 | 192.168.0.7 | 192.168.0.8
 | ${state}= | enabled
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${bd_name}= | bd_lisp
@@ -57,11 +57,20 @@
 | | Then Locator Set From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${locator_set}
 
+| TC15: Honeycomb can remove configuration of LISP features
+| | [Documentation] | Check if Honeycomb can disable all LISP features.
+| | ...
+| | Given Locator Set From Honeycomb Should Be
+| | ... | ${node} | ${interface} | ${locator_set}
+| | When Honeycomb disables all LISP features | ${node}
+| | Then LISP Should Not Be Configured | ${node}
+
 | TC03: Honeycomb configures LISP - remote mapping - Bridge Domain
 | | [Documentation] | Check if Honeycomb can configure a remote LISP mapping\
 | | ... | with a bridge domain.
 | | ...
-| | Given LISP state from Honeycomb should be | ${node} | ${state}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | And Honeycomb creates first l2 bridge domain
 | | ... | ${node} | ${bd_name} | ${bd_settings}
 | | When Honeycomb adds LISP mapping | ${node} | ${lisp_settings_remote_bd}
@@ -136,7 +145,7 @@
 | | [Documentation] | Check if Honeycomb can configure local and remote LISP\
 | | ... | mappings with VRF, and configure adjacency.
 | | ...
-| | [Teardown] | Honeycomb removes all LISP mappings | ${node}
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
 | | ...
 | | Given Locator Set From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${locator_set}
@@ -153,7 +162,9 @@
 | TC09: Honeycomb configures LISP Map Resolver
 | | [Documentation] | Check if Honeycomb can configure a LISP Map Resolver.
 | | ...
-| | Given LISP state from Honeycomb should be | ${node} | ${state}
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | And LISP state from VAT should be | ${node} | ${state}
 | | When Honeycomb adds LISP Map Resolver | ${node} | ${ip_address}
 | | Then Map Resolver from Honeycomb should be | ${node} | ${ip_address}
@@ -162,6 +173,9 @@
 | TC10: Honeycomb configures LISP Map Server
 | | [Documentation] | Check if Honeycomb can configure a LISP Map Server.
 | | ...
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Given LISP state from Honeycomb should be | ${node} | ${state}
 | | And LISP state from VAT should be | ${node} | ${state}
 | | When Honeycomb adds LISP Map Server | ${node} | @{ip_addresses}
@@ -172,6 +186,9 @@
 | | [Documentation] | Check if Honeycomb can configure LISP
 | | ... | PETR configuration.
 | | ...
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Given LISP state from Honeycomb should be | ${node} | ${state}
 | | And LISP state from VAT should be | ${node} | ${state}
 | | When Honeycomb enables LISP PETR feature | ${node} | ${ip_address}
@@ -181,6 +198,9 @@
 | TC12: Honeycomb configures LISP RLOC Probing
 | | [Documentation] | Check if Honeycomb can configure LISP RLOC Probing.
 | | ...
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Given LISP state from Honeycomb should be | ${node} | ${state}
 | | And LISP state from VAT should be | ${node} | ${state}
 | | When Honeycomb enables LISP RLOC feature | ${node}
@@ -190,6 +210,9 @@
 | TC13: Honeycomb configures LISP Map Register
 | | [Documentation] | Check if Honeycomb can configure a LISP Map Register.
 | | ...
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Given LISP state from Honeycomb should be | ${node} | ${state}
 | | And LISP state from VAT should be | ${node} | ${state}
 | | When Honeycomb adds LISP Map Register | ${node} | ${True}
@@ -199,21 +222,15 @@
 | TC14: Honeycomb enabled LISP PITR feature
 | | [Documentation] | Check if Honeycomb can configure the LISP PITR feature.
 | | ...
+| | [Teardown] | Honeycomb disables all LISP features | ${node}
+| | Given Honeycomb enables LISP | ${node}
+| | And Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Given Locator Set From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${locator_set}
 | | When Honeycomb enables LISP PITR feature | ${node} | ${locator_set}
 | | Then PITR config from Honeycomb should be | ${node} | ${locator_set}
 | | And PITR config from VAT should be | ${node} | ${locator_set}
 
-| TC15: Honeycomb can remove configuration of LISP features
-| | [Documentation] | Check if Honeycomb can disable all LISP features.
-| | ...
-| | Given Map Resolver from Honeycomb should be | ${node} | ${ip_address}
-| | And PITR config from Honeycomb should be | ${node} | ${locator_set}
-| | And Map Register from Honeycomb should be | ${node} | ${True}
-| | When Honeycomb disables all LISP features | ${node}
-| | Then LISP Should Not Be Configured | ${node}
-
 | TC16: Honeycomb can configure LISP for traffic test - IPv4
 | | [Documentation]
 | | ... | [Top] TG-DUT1-TG.
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot
index 7f61780fb5..1f4d2a9021 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-policer-apihc-func.robot
@@ -101,8 +101,6 @@
 | | ... | ${node} | ${interface} | ${acl_tables['hc_acl_table']['name']}
 
 | TC06: VPP policer 2R3C Color-aware marks packet
-# Pending rework
-| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG=DUT1.
 | | ... | [Ref] RFC2474, RFC2698.
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
index 7f229be65c..8a54918032 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-slaac-apihc-func.robot
@@ -115,8 +115,6 @@
 | | ... | ${interface} | ${slaac_data_03}
 
 | TC07: DUT retransmits RA on IPv6 enabled interface after a set interval
-# Traffic test failing in VIRL
-| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG-DUT1-DUT2-TG.
 | | ... | [Cfg] On DUT1 configure IPv6 interface on the link to TG.
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
index 2bad2d7507..ccb674fbd7 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-spanrx-apihc-apivat-func.robot
@@ -103,8 +103,6 @@
 | | ... | ${node} | ${interface2} | ${settings_if2}
 
 | TC07: DUT mirrors IPv4 packets from one interface to another
-# Pending rework
-| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG=DUT1
 | | ... | [Cfg] (using Honeycomb) On DUT1 configure IPv4 address and set SPAN\
@@ -221,8 +219,6 @@
 | | ... | ${node} | ${interface2} | ${1} | ${settings_if2}
 
 | TC14: DUT mirrors IPv4 packets from an interface to a sub-interface
-# Pending rework
-| | [Tags] | EXPECTED_FAILING
 | | [Documentation]
 | | ... | [Top] TG=DUT1
 | | ... | [Cfg] (using Honeycomb) On DUT1 configure IPv4 address and set SPAN\
@@ -236,8 +232,8 @@
 | | ...
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
-| | And Sub-interface state from Honeycomb should be
-| | ... | ${dut_node} | ${interface1} | ${1} | down | up
+| | And Honeycomb creates sub-interface | ${dut_node} | ${dut_to_tg_if1}
+| | ... | ${sub_if_1_match} | ${sub_if_1_tags} | ${sub_if_1_settings}
 | | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1}
 | | ... | up
 | | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if2}
diff --git a/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot b/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot
index 22a65b2e39..5320a7fcb7 100644
--- a/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-notif-apihcnc-func.robot
@@ -31,8 +31,7 @@
 | ...
 | Suite Teardown | Tear Down Honeycomb Functional Test Suite | ${node}
 | ...
-# HC2VPP-203 Notifications are not being sent since VPP 17.10
-| Force Tags | HC_FUNC | EXPECTED_FAILING
+| Force Tags | HC_FUNC
 
 *** Test Cases ***
 | TC01: Honeycomb sends notification on interface state change
diff --git a/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot b/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot
index 1d3ce02e05..b7fe610b18 100644
--- a/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-statepersist-apihc-func.robot
@@ -39,9 +39,6 @@
 | | [Documentation] | Checks if Honeycomb maintains configuration after both\
 | | ... | Restart Honeycomb and VPP.
 | | ...
-# Failing due to HC2VPP-47
-| | [Tags] | HC_FUNC | EXPECTED_FAILING
-| | ...
 | | [Teardown]
 | | ... | Restart Honeycomb And VPP And Clear Persisted Configuration | ${node}
 | | ...