From 28dd384dbf9d791bbe2cac7a09227008f85bb64f Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Mon, 28 Aug 2017 12:47:29 +0200
Subject: 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>
---
 resources/test_data/honeycomb/lisp/lisp_gpe.py | 30 ++++++--------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

(limited to 'resources/test_data')

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
-        }
       }
     ]
 }
-- 
cgit 1.2.3-korg