diff options
| author |   Jan Srnicek <jsrnicek@cisco.com> | 2017-08-04 08:49:05 +0200 |
|---|---|---|
| committer | Jan Srnicek <jsrnicek@cisco.com> | 2017-08-07 10:34:01 +0200 |
| commit | 941edc8b15e5f3fed701b5585ce7ad421991b16d (patch) | |
| tree | 55a73bd261f181cd890da517f25aeed519033af9 /lisp/lisp2vpp/src/test/resources/gpe | |
| parent | 1eac992e90839c99337a80db4ff6b880787a3056 (diff) | |
HC2VPP-162 - use composite key for locator pair
Removes need for custom mapping for locator pairs and their ids
Change-Id: Idaa6ee5ec74d8bf57a72bea95c0c0d408e6e940e
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>
Diffstat (limited to 'lisp/lisp2vpp/src/test/resources/gpe')
3 files changed, 21 insertions, 39 deletions
diff --git a/lisp/lisp2vpp/src/test/resources/gpe/gpe-fwd-entry-full.json b/lisp/lisp2vpp/src/test/resources/gpe/gpe-fwd-entry-full.json index 8bc5cc41e..6168b9d36 100644 --- a/lisp/lisp2vpp/src/test/resources/gpe/gpe-fwd-entry-full.json +++ b/lisp/lisp2vpp/src/test/resources/gpe/gpe-fwd-entry-full.json @@ -14,22 +14,16 @@ "virtual-network-id": 12, "ipv4-prefix": "192.168.3.0/16" }, - "locator-pairs": [ + "locator-pair": [ { - "id": "gpe-fwd-entry-pair-1", - "locator-pair": { - "local-locator": "192.168.4.1", - "remote-locator": "192.168.4.2", - "weight": 3 - } + "local-locator": "192.168.4.1", + "remote-locator": "192.168.4.2", + "weight": 3 }, { - "id": "gpe-fwd-entry-pair-2", - "locator-pair": { - "local-locator": "192.168.5.1", - "remote-locator": "192.168.5.2", - "weight": 2 - } + "local-locator": "192.168.5.1", + "remote-locator": "192.168.5.2", + "weight": 2 } ], "action": "natively-forward" diff --git a/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-local-eid.json b/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-local-eid.json index 7322dadc6..a36a7403f 100644 --- a/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-local-eid.json +++ b/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-local-eid.json @@ -9,22 +9,16 @@ "virtual-network-id": 12, "ipv4-prefix": "192.168.3.0/16" }, - "locator-pairs": [ + "locator-pair": [ { - "id": "gpe-fwd-entry-pair-1", - "locator-pair": { - "local-locator": "192.168.4.1", - "remote-locator": "192.168.4.2", - "weight": 3 - } + "local-locator": "192.168.4.1", + "remote-locator": "192.168.4.2", + "weight": 3 }, { - "id": "gpe-fwd-entry-pair-2", - "locator-pair": { - "local-locator": "192.168.5.1", - "remote-locator": "192.168.5.2", - "weight": 2 - } + "local-locator": "192.168.5.1", + "remote-locator": "192.168.5.2", + "weight": 2 } ] } diff --git a/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-remote-eid.json b/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-remote-eid.json index e6d5cc7e5..d63d377b1 100644 --- a/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-remote-eid.json +++ b/lisp/lisp2vpp/src/test/resources/gpe/invalid/invalid-gpe-fwd-entry-no-remote-eid.json @@ -9,22 +9,16 @@ "virtual-network-id": 12, "ipv4-prefix": "192.168.2.0/24" }, - "locator-pairs": [ + "locator-pair": [ { - "id": "gpe-fwd-entry-pair-1", - "locator-pair": { - "local-locator": "192.168.4.1", - "remote-locator": "192.168.4.2", - "weight": 3 - } + "local-locator": "192.168.4.1", + "remote-locator": "192.168.4.2", + "weight": 3 }, { - "id": "gpe-fwd-entry-pair-2", - "locator-pair": { - "local-locator": "192.168.5.1", - "remote-locator": "192.168.5.2", - "weight": 2 - } + "local-locator": "192.168.5.1", + "remote-locator": "192.168.5.2", + "weight": 2 } ], "action": "natively-forward" |