HC Test: re-enable NSH tests, minor fixes

NSH plugin was fixed in https://gerrit.fd.io/r/8218

- updated lispGPE test data
- added missing teardown to multi-IP traffic test
- marked L2-fib update revert case as failing

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

9 files changed, 43 insertions, 61 deletions

diff --git a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
index 6f0bdda9fe..17ed3b8246 100644
--- a/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
+++ b/resources/libraries/python/honeycomb/HcAPIKwInterfaces.py
@@ -556,6 +556,9 @@ class InterfaceKeywords(object):
         :rtype: bytearray
         """
 
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
         path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4",
                 "address")
         return InterfaceKeywords._set_interface_properties(
@@ -598,6 +601,9 @@ class InterfaceKeywords(object):
         :rtype: bytearray
         """
 
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
         path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv4",
                 "neighbor")
         return InterfaceKeywords._set_interface_properties(
@@ -696,6 +702,9 @@ class InterfaceKeywords(object):
         :rtype: bytearray
         """
 
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
         path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
                 "address")
         return InterfaceKeywords._set_interface_properties(
@@ -738,6 +747,9 @@ class InterfaceKeywords(object):
         :rtype: bytearray
         """
 
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
         path = ("interfaces", ("interface", "name", interface), "ietf-ip:ipv6",
                 "neighbor")
         return InterfaceKeywords._set_interface_properties(
diff --git a/resources/test_data/honeycomb/lisp/lisp_gpe.py b/resources/test_data/honeycomb/lisp/lisp_gpe.py
index 45a8f1f93a..f91cb86fe9 100644
--- a/resources/test_data/honeycomb/lisp/lisp_gpe.py
+++ b/resources/test_data/honeycomb/lisp/lisp_gpe.py
@@ -80,23 +80,19 @@ positive_mapping_ip4 = {
         "virtual-network-id": 0,
         "ipv4-prefix": "192.168.5.0/24"
     },
-    "locator-pairs": [
+    "locator-pair": [
       {
-        "id": "gpe-entry-locator-1",
-        "locator-pair": {
             "local-locator": "192.168.6.2",
             "remote-locator": "192.168.7.3",
             "weight": 0
-        }
+
       },
-      {
-        "id": "gpe-entry-locator-2",
-        "locator-pair": {
+    {
             "local-locator": "192.168.5.2",
             "remote-locator": "192.168.5.3",
             "weight": 1
         }
-      }
+
     ]
 }
 
@@ -131,22 +127,16 @@ positive_mapping_ip6 = {
         "virtual-network-id": 0,
         "ipv6-prefix": "13::/64"
     },
-    "locator-pairs": [
+    "locator-pair": [
       {
-        "id": "gpe-entry-locator-1",
-        "locator-pair": {
             "local-locator": "13::10",
             "remote-locator": "13::11",
             "weight": 0
-        }
       },
       {
-        "id": "gpe-entry-locator-2",
-        "locator-pair": {
             "local-locator": "14::10",
             "remote-locator": "14::11",
             "weight": 1
-        }
       }
     ]
 }
@@ -178,14 +168,11 @@ lisp_traffic_ip4 = {
         "virtual-network-id": 0,
         "ipv4-prefix": remote_eid4
     },
-    "locator-pairs": [
+    "locator-pair": [
       {
-        "id": "gpe-entry-locator-1",
-        "locator-pair": {
             "local-locator": src_rloc4,
             "remote-locator": dst_rloc4,
             "weight": 0
-        }
       }
     ]
 }
@@ -216,14 +203,11 @@ lisp_traffic_ip6 = {
         "virtual-network-id": 0,
         "ipv6-prefix": remote_eid6
     },
-    "locator-pairs": [
+    "locator-pair": [
       {
-        "id": "gpe-entry-locator-1",
-        "locator-pair": {
             "local-locator": src_rloc6,
             "remote-locator": dst_rloc6,
             "weight": 0
-        }
       }
     ]
 }
diff --git a/resources/tools/scripts/download_hc_build_pkgs.sh b/resources/tools/scripts/download_hc_build_pkgs.sh
index 5d76323179..6683499956 100755
--- a/resources/tools/scripts/download_hc_build_pkgs.sh
+++ b/resources/tools/scripts/download_hc_build_pkgs.sh
@@ -50,12 +50,11 @@ for ART in ${VPP_ARTIFACTS}; do
     done
 done
 
-# NSHSFC-34: Having NSH plugin installed crashes VPP
-#for ART in ${NSH_ARTIFACTS}; do
-#    for PAC in ${PACKAGE}; do
-#        curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
-#    done
-#done
+for ART in ${NSH_ARTIFACTS}; do
+    for PAC in ${PACKAGE}; do
+        curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
+    done
+done
 
 # verify downloaded packages
 if [ "${OS}" == "centos7" ]; then
diff --git a/resources/tools/scripts/download_hc_pkgs.sh b/resources/tools/scripts/download_hc_pkgs.sh
index 2bb2a08e17..1bda02505c 100755
--- a/resources/tools/scripts/download_hc_pkgs.sh
+++ b/resources/tools/scripts/download_hc_pkgs.sh
@@ -61,12 +61,11 @@ for ART in ${DPDK_ARTIFACTS}; do
     done
 done
 
-# NSHSFC-34: Having NSH plugin installed crashes VPP
-#for ART in ${NSH_ARTIFACTS}; do
-#    for PAC in ${PACKAGE}; do
-#        curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
-#    done
-#done
+for ART in ${NSH_ARTIFACTS}; do
+    for PAC in ${PACKAGE}; do
+        curl "${URL}?r=${REPO}&g=${NSH_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
+    done
+done
 
 # determine VPP dependency
 if [ "${OS}" == "centos7" ]; then
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
index b1a4304f87..b27c7f49f7 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-int-subint-apihc-apivat-func.robot
@@ -471,8 +471,6 @@
 | | [Documentation] | Check if Honeycomb can configure an unnumbered interface\
 | | ... | on a sub-interface, borrowing the IP address of a physical interface.
 | | ...
-# CSIT-734: Intermittent failures of all unnumbered interface cases
-| | [Tags] | EXPECTED_FAILING
 | | Given sub-interface ipv4 address from Honeycomb should be empty
 | | ... | ${node} | ${super_if} | ${sub_if_id}
 | | And sub-interface ipv4 address from VAT should be empty
@@ -497,8 +495,6 @@
 | | [Documentation] | Check if Honeycomb can remove unnumbered configuration\
 | | ... | from a sub-interface.
 | | ...
-# CSIT-734: Intermittent failures of all unnumbered interface cases
-| | [Tags] | EXPECTED_FAILING
 | | [Teardown] | Honeycomb removes interface IPv4 addresses | ${node}
 | | ... | ${super_if2}
 | | ...
@@ -528,8 +524,6 @@
 | TC24: Honeycomb can configure unnumbered interface using a sub-interface
 | | [Documentation] | Check if Honeycomb can configure an unnumbered interface\
 | | ... | on an interface, borrowing the IP address of a sub-interface.
-| | ...# CSIT-734: Intermittent failures of all unnumbered interface cases
-| | [Tags] | EXPECTED_FAILING
 | | Given IPv4 address from Honeycomb should be empty | ${node} | ${super_if2}
 | | And ipv4 address from VAT should be empty | ${node} | ${super_if2}
 | | And sub-interface ipv4 address from Honeycomb should be empty
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
index 2266509f61..9565564100 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-intip4-intip6-apihc-apivat-func.robot
@@ -171,6 +171,7 @@
 | | ... | of source and destination IP addresses. Receive an ICMP reply\
 | | ... | for every packet sent.
 | | ...
+| | [Teardown] | Multiple IP Address Test Teardown | ${node} | ${dut_to_tg_if1}
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
 | | When Honeycomb sets interface IPv4 address with prefix
@@ -190,7 +191,8 @@
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix}
 | | And IPv6 address from VAT should contain
 | | ... | ${dut_node} | ${dut_to_tg_if1} | ${ipv6_address} | ${ipv6_prefix}
-| | And Honeycomb configures interface state | ${dut_node} | ${dut_to_tg_if1} | up
+| | And Honeycomb configures interface state
+| | ... | ${dut_node} | ${dut_to_tg_if1} | up
 | | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
 | | ... | ${ipv4_neighbor} | ${neighbor_mac}
 | | And Honeycomb adds interface IPv4 neighbor | ${dut_node} | ${dut_to_tg_if1}
@@ -222,8 +224,6 @@
 | | ... | on a physical interface, borrowing the IP address of another physical\
 | | ... | interface.
 | | ...
-# CSIT-734: Intermittent failures of all unnumbered interface cases
-| | [Tags] | EXPECTED_FAILING
 | | Given Honeycomb sets interface IPv4 address | ${node}
 | | ... | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
 | | When Honeycomb adds unnumbered configuration to interface
@@ -244,8 +244,6 @@
 | | [Documentation] | Check if Honeycomb can remove unnumbered configuration\
 | | ... | from an interface.
 | | ...
-# CSIT-734: Intermittent failures of all unnumbered interface cases
-| | [Tags] | EXPECTED_FAILING
 | | Given IPv4 address from Honeycomb should be
 | | ... | ${node} | ${interface2} | ${ipv4_address} | ${ipv4_prefix}
 | | And IPv4 address from VAT should be
@@ -299,3 +297,11 @@
 | | ... | ${node} | ${interface} | 10::FF11 | ${64}
 | | And Honeycomb fails to add interface IPv6 address
 | | ... | ${node} | ${interface} | 10::FFFF | ${64}
+
+*** Keywords ***
+| Multiple IP Address Test Teardown
+| | [Arguments] | ${node} | ${interface}
+| | Honeycomb removes interface IPv4 addresses | ${node} | ${interface}
+| | Honeycomb removes interface IPv6 addresses | ${node} | ${interface}
+| | Honeycomb clears all interface IPv4 neighbors | ${node} | ${interface}
+| | Honeycomb clears all interface IPv6 neighbors | ${node} | ${interface}
\ No newline at end of file
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
index c243af28f9..011824f39a 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-l2fib-apihc-apivat-func.robot
@@ -202,6 +202,8 @@
 | | [Documentation] | Honeycomb tries to modify an existing L2 FIB entry. It \
 | | ... | must fail.
 | | ...
+# HC2VPP-228 - operation does not revert on error
+| | [Tags] | EXPECTED_FAILING
 | | [Teardown] | Honeycomb removes all L2 FIB entries
 | | ... | ${node} | ${bd_name}
 | | ...
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot
index 072d475417..61dbb95c2a 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-lispgpe-apihc-apivat-func.robot
@@ -36,7 +36,6 @@
 | TC01: Honeycomb enables LISP GPE feature
 | | [Documentation] | Check if Honeycomb can enable the LISP GPE feature.
 | | ...
-| | [Tags] | HC_FUNC | test
 | | Given LISP GPE Should Not Be Configured | ${node}
 | | When Honeycomb enables LISP GPE | ${node}
 | | Then LISP GPE state from Honeycomb should be | ${node} | enabled
@@ -45,7 +44,6 @@
 | TC02: Honeycomb disable LISP GPE feature
 | | [Documentation] | Check if Honeycomb can enable the LISP GPE feature.
 | | ...
-| | [Tags] | HC_FUNC
 | | [Teardown] | Honeycomb enables LISP GPE | ${node}
 | | Given LISP GPE state from Honeycomb should be | ${node} | enabled
 | | And LISP GPE state from VAT should be | ${node} | enabled
@@ -57,7 +55,6 @@
 | | [Documentation] | Check if Honeycomb can configure a LISP mapping\
 | | ... | with VRF.
 | | ...
-| | [Tags] | HC_FUNC
 | | Given LISP GPE mappings from Honeycomb should not exist
 | | ... | ${node}
 | | When Honeycomb adds first LISP GPE mapping
@@ -69,7 +66,6 @@
 | | [Documentation] | Check if Honeycomb can remove a configured LISP GPE\
 | | ... | mapping.
 | | ...
-| | [Tags] | HC_FUNC
 | | Given LISP GPE mapping from Honeycomb should be
 | | ... | ${node} | ${negative_mapping_ip4}
 | | When Honeycomb removes LISP GPE mapping
@@ -81,8 +77,6 @@
 | | [Documentation] | Check if Honeycomb can configure a LISP mapping\
 | | ... | with VRF.
 | | ...
-# | | [Tags] | HC_FUNC
-# Disabled due to VPP-915 - configuring positive entry crashes VPP
 | | [Teardown] | Honeycomb removes LISP GPE mapping
 | | ... | ${node} | ${positive_mapping_ip4['id']}
 | | Given LISP GPE mappings from Honeycomb should not exist
@@ -110,8 +104,6 @@
 | | [Documentation] | Check if Honeycomb can configure a LISP mapping\
 | | ... | with VRF.
 | | ...
-# | | [Tags] | HC_FUNC
-# Disabled due to VPP-915 - configuring positive entry crashes VPP
 | | [Teardown] | Honeycomb removes LISP GPE mapping
 | | ... | ${node} | ${positive_mapping_ip6['id']}
 | | Given LISP GPE mappings from Honeycomb should not exist
@@ -125,7 +117,6 @@
 | | [Documentation] | Check if Honeycomb can modify and existing LISP GPE\
 | | ... | mapping.
 | | ...
-| | [Tags] | HC_FUNC
 | | [Teardown] | Honeycomb removes LISP GPE mapping
 | | ... | ${node} | ${negative_mapping_ip4_edit['id']}
 | | Given LISP GPE mappings from Honeycomb should not exist
@@ -143,7 +134,6 @@
 | | [Documentation] | Check if Honeycomb can configure multiple LISP GPE\
 | | ... | mappings at the same time.
 | | ...
-| | [Tags] | HC_FUNC
 | | [Teardown] | Run Keywords
 | | ... | Honeycomb removes LISP GPE mapping
 | | ... | ${node} | ${negative_mapping_ip4['id']}
@@ -162,7 +152,6 @@
 | TC10: Honeycomb can disable all LISP GPE features
 | | [Documentation] | Check if Honeycomb can disable all LISP GPE features.
 | | ...
-| | [Tags] | HC_FUNC
 | | Given Honeycomb adds first LISP GPE mapping
 | | ... | ${node} | ${negative_mapping_ip4}
 | | When Honeycomb disables all LISP GPE features | ${node}
@@ -181,7 +170,6 @@
 | | ... | LISP GPE tunnel verify LISP encapsulation of received packet.
 | | ... | [Ref] RFC6830.
 | | ...
-| | [Tags] | test
 | | [Teardown] | LISPGPE functional traffic test teardown
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
@@ -215,7 +203,6 @@
 | | ... | LISP GPE tunnel verify LISP encapsulation of received packet.
 | | ... | [Ref] RFC6830.
 | | ...
-| | [Tags] | test
 | | [Teardown] | LISPGPE functional traffic test teardown
 | | Given Configure path in 2-node circular topology
 | | ... | ${nodes['TG']} | ${nodes['DUT1']} | ${nodes['TG']}
diff --git a/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot b/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
index e3697d2d32..65ee700a33 100644
--- a/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
+++ b/tests/vpp/func/honeycomb/mgmt-cfg-nsh-apihc-apivat-func.robot
@@ -32,8 +32,7 @@
 | ... | Tear Down Honeycomb Functional Test Suite | ${node} | AND
 | ... | Disable Honeycomb Feature | ${node} | NSH
 | ...
-# NSHSFC-34: Having NSH plugin installed crashes VPP
-#| Force Tags | HC_FUNC
+| Force Tags | HC_FUNC
 
 
 *** Test Cases ***