No overlapping subnets between DUT/TG and DUT/VM

Change-Id: Ib6a2921070f3524b001ecea2467b28264288fee3
Signed-off-by: Neale Ranns <nranns@cisco.com>

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 f1ad6e5..d5cfb8b 100644 (file)
--- a/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py
+++ b/resources/test_data/lisp/ipv4_lispgpe_ipv4/ipv4_lispgpe_ipv4.py
@@ -43,7 +43,7 @@ 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'
+vhost_ip = '6.6.1.3'
 
 prefix4 = 24
 

diff --git a/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py b/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
index f6471a4..019b81f 100644 (file)
--- a/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
+++ b/resources/test_data/lisp/ipv4_lispgpe_ipv6/ipv4_lispgpe_ipsec_ipv6.py
@@ -30,7 +30,7 @@ tg1_ip4 = '6.0.1.2'
 tg2_ip4 = '6.0.2.2'
 prefix4 = 24
 prefix6 = 64
-vhost_ip = '6.0.1.3'
+vhost_ip = '6.6.1.3'
 lisp_gpe_int = 'lisp_gpe0'
 
 dut1_to_dut2_ip_static_adjacency = {'vni': 0,

diff --git a/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py b/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py
index bd6f587..735b023 100644 (file)
--- a/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py
+++ b/resources/test_data/lisp/ipv6_lispgpe_ipv4/ipv6_lispgpe_ipsec_ipv4.py
@@ -30,7 +30,7 @@ tg1_ip6 = '2001:cdba:1::2'
 tg2_ip6 = '2001:cdba:2::2'
 prefix4 = 24
 prefix6 = 64
-vhost_ip = '2001:cdba:1::3'
+vhost_ip = '2001:cdba:6::3'
 lisp_gpe_int = 'lisp_gpe0'
 
 dut1_to_dut2_ip_static_adjacency = {'vni': 0,

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 fcb27ae..9f7fa3c 100644 (file)
--- 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,7 +30,7 @@ tg1_ip6 = '2001:cdba:1::2'
 tg2_ip6 = '2001:cdba:2::2'
 prefix6 = 64
 
-vhost_ip = '2001:cdba:1::9'
+vhost_ip = '2001:cdba:6::9'
 
 dut1_to_dut2_ip6_static_adjacency = {'vni': 0,
                                      'deid': '2001:cdba:2::0',
@@ -57,4 +57,4 @@ dut1_dut2_vni = 1
 
 sock1 = "/tmp/sock1"
 sock2 = "/tmp/sock2"
-bid = 10
\ No newline at end of file
+bid = 10

diff --git a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
index 56cda75..334dcbf 100644 (file)
--- a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
@@ -20,7 +20,7 @@ dut1_dut2_vni = 1
 sock1 = '/tmp/sock1'
 sock2 = '/tmp/sock2'
 bid = 10
-vhost_ip = '6:0:1::3'
+vhost_ip = '6:6:1::3'
 
 # Lisp default locator_set value
 duts_locator_set = {'locator_name': locator_name,