From 029a50e37499ba7c1dd121a9613799b520e0fc65 Mon Sep 17 00:00:00 2001 From: Zdeno Olsovsky Date: Wed, 19 Oct 2016 09:16:31 +0200 Subject: CSIT-451 LISP vrf tests rework Change-Id: I2dac2eaff828672c2d921e889356b70baed5f4da Signed-off-by: Zdeno Olsovsky --- .../lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py | 4 ++-- resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py | 7 +++++-- resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py | 6 ++++-- 3 files changed, 11 insertions(+), 6 deletions(-) (limited to 'resources/test_data') diff --git a/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py b/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py index 244f042f03..9ec54c5d4b 100644 --- a/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py +++ b/resources/test_data/lisp/ipv4_ipsec_lispgpe_ipv4/ipv4_ipsec_lispgpe_ipv4.py @@ -50,8 +50,8 @@ dut2_ip4_eid = {'locator_name': locator_name, 'eid': '6.6.2.0', 'prefix': 24} -dut1_fib_table = '1' -dut2_fib_table = '2' +fib_table_1 = 1 +dut1_dut2_vni = 1 dut2_spi = 1000 dut1_spi = 1001 diff --git a/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py b/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py index f3754e228b..f1ad6e51a5 100644 --- a/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py +++ b/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py @@ -42,6 +42,9 @@ dst_ip_range = '6.0.5.0' vm1_vif1_mac = '52:54:00:00:04:01' vm1_vif2_mac = '52:54:00:00:04:02' + +vhost_ip = '6.0.1.3' + prefix4 = 24 dut1_to_dut2_ip4_static_adjacency = {'vni': 0, @@ -64,8 +67,8 @@ dut2_ip4_eid = {'locator_name': locator_name, 'eid': dst_ip_range, 'prefix': prefix4} -dut1_fib_table = 1 -dut2_fib_table = 2 +fib_table_1 = 1 +dut1_dut2_vni = 1 sock1 = "/tmp/sock1" sock2 = "/tmp/sock2" diff --git a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py b/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py index e3206c2bc9..fcb27ae0cc 100644 --- a/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py +++ b/resources/test_data/lisp/ipv6_lispgpe_ipv6/ipv6_lispgpe_ipv6.py @@ -30,6 +30,8 @@ tg1_ip6 = '2001:cdba:1::2' tg2_ip6 = '2001:cdba:2::2' prefix6 = 64 +vhost_ip = '2001:cdba:1::9' + dut1_to_dut2_ip6_static_adjacency = {'vni': 0, 'deid': '2001:cdba:2::0', 'rloc': '2001:cdba:3::2', @@ -50,8 +52,8 @@ dut2_ip6_eid = {'locator_name': locator_name, 'eid': '2001:cdba:2::0', 'prefix': 64} -dut1_fib_table = '1' -dut2_fib_table = '2' +fib_table_1 = 1 +dut1_dut2_vni = 1 sock1 = "/tmp/sock1" sock2 = "/tmp/sock2" -- cgit 1.2.3-korg