CSIT-245: IPv6 - ip4-lispgpe-ip6

Change-Id: Ie88cadfc2eab31cd1f411b9648b1a3515e4baa89
Signed-off-by: Zdeno Olsovsky <zolsovsk@cisco.com>
Signed-off-by: Matej Klotton <mklotton@cisco.com>

2 files changed, 24 insertions, 10 deletions

diff --git a/resources/libraries/robot/lisp/lispgpe.robot b/resources/libraries/robot/lisp/lispgpe.robot
index a5ab102652..7dc53c7e27 100644
--- a/resources/libraries/robot/lisp/lispgpe.robot
+++ b/resources/libraries/robot/lisp/lispgpe.robot
@@ -20,6 +20,7 @@
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
 | Library  | resources.libraries.python.LispSetup.LispAdjacency
 | Library  | resources.libraries.python.LispSetup.LispRemoteMapping
+| Library  | resources.libraries.python.LispSetup.LispEidTableMap
 
 *** Keywords ***
 | Set up LISP GPE topology
@@ -52,6 +53,7 @@
 | | ... | ${dut2_node} | ${dut2_if} | ${dut2_int_index}
 | | ... | ${locator_set} | ${dut1_eid} | ${dut2_eid}
 | | ... | ${dut1_static_adjacency} | ${dut2_static_adjacency}
+| | ... | ${vni_table}=0 | ${vrf_table}=0
 | | ...
 # DUT1 settings:
 | | ${dut1_int_index}= | Run Keyword If | ${dut1_int_index} is None
@@ -66,20 +68,23 @@
 | | ... | ${dut1_int_index}
 | | ... | ${locator_set['priority']}
 | | ... | ${locator_set['weight']}
+| | Vpp Lisp Eid Table Mapping | ${dut1_node}
+| | ... | ${vni_table}
+| | ... | vrf=${vrf_table}
 | | Vpp Add Lisp Local Eid | ${dut1_node}
 | | ... | ${dut1_eid['locator_name']}
-| | ... | ${dut1_eid['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut1_eid['eid']}
 | | ... | ${dut1_eid['prefix']}
 | | Vpp Add Lisp Remote Mapping | ${dut1_node}
-| | ... | ${dut1_static_adjacency['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut1_static_adjacency['deid']}
 | | ... | ${dut1_static_adjacency['prefix']}
 | | ... | ${dut1_static_adjacency['seid']}
 | | ... | ${dut1_static_adjacency['prefix']}
 | | ... | ${dut1_static_adjacency['rloc']}
 | | Vpp Add Lisp Adjacency | ${dut1_node}
-| | ... | ${dut1_static_adjacency['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut1_static_adjacency['deid']}
 | | ... | ${dut1_static_adjacency['prefix']}
 | | ... | ${dut1_static_adjacency['seid']}
@@ -98,20 +103,23 @@
 | | ... | ${dut2_int_index}
 | | ... | ${locator_set['priority']}
 | | ... | ${locator_set['weight']}
+| | Vpp Lisp Eid Table Mapping | ${dut2_node}
+| | ... | ${vni_table}
+| | ... | vrf=${vrf_table}
 | | Vpp Add Lisp Local Eid | ${dut2_node}
 | | ... | ${dut2_eid['locator_name']}
-| | ... | ${dut2_eid['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut2_eid['eid']}
 | | ... | ${dut2_eid['prefix']}
 | | Vpp Add Lisp Remote Mapping | ${dut2_node}
-| | ... | ${dut2_static_adjacency['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut2_static_adjacency['deid']}
 | | ... | ${dut2_static_adjacency['prefix']}
 | | ... | ${dut2_static_adjacency['seid']}
 | | ... | ${dut2_static_adjacency['prefix']}
 | | ... | ${dut2_static_adjacency['rloc']}
 | | Vpp Add Lisp Adjacency | ${dut2_node}
-| | ... | ${dut2_static_adjacency['vni']}
+| | ... | ${vni_table}
 | | ... | ${dut2_static_adjacency['deid']}
 | | ... | ${dut2_static_adjacency['prefix']}
 | | ... | ${dut2_static_adjacency['seid']}
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 b3af598d58..56cda75426 100644
--- a/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
+++ b/resources/test_data/lisp/static_adjacency/lisp_static_adjacency.py
@@ -15,6 +15,12 @@
 
 # Lisp default global value
 locator_name = 'ls1'
+fib_table1 = 1
+dut1_dut2_vni = 1
+sock1 = '/tmp/sock1'
+sock2 = '/tmp/sock2'
+bid = 10
+vhost_ip = '6:0:1::3'
 
 # Lisp default locator_set value
 duts_locator_set = {'locator_name': locator_name,
@@ -47,7 +53,7 @@ dut2_ip4_eid = {'locator_name': locator_name,
                 'vni': 0,
                 'eid': '6.0.2.0',
                 'prefix': 24}
-dut2_to_dut1_ip4_reconf= '6.0.3.20'
+dut2_to_dut1_ip4_reconf = '6.0.3.20'
 dut1_to_dut2_ip4_static_adjacency_reconf = {'vni': 0,
                                             'deid': '6.0.2.0',
                                             'seid': '6.0.1.0',
@@ -80,7 +86,7 @@ dut2_ip6_eid = {'locator_name': locator_name,
                 'vni': 0,
                 'eid': '6:0:2::0',
                 'prefix': 64}
-dut2_to_dut1_ip6_reconf= '6:0:3::20'
+dut2_to_dut1_ip6_reconf = '6:0:3::20'
 dut1_to_dut2_ip6_static_adjacency_reconf = {'vni': 0,
                                             'deid': '6:0:2::0',
                                             'seid': '6:0:1::0',
@@ -114,7 +120,7 @@ dut2_ip4o6_eid = {'locator_name': locator_name,
                   'vni': 0,
                   'eid': '6.0.2.0',
                   'prefix': 24}
-dut2_to_dut1_ip4o6_reconf= '6:0:3::20'
+dut2_to_dut1_ip4o6_reconf = '6:0:3::20'
 dut1_ip4o6_static_adjacency_reconf = {'vni': 0,
                                       'deid': '6.0.2.0',
                                       'seid': '6.0.1.0',
@@ -148,7 +154,7 @@ dut2_ip6o4_eid = {'locator_name': locator_name,
                   'vni': 0,
                   'eid': '6:0:2::0',
                   'prefix': 64}
-dut2_to_dut1_ip6o4_reconf= '6.0.3.20'
+dut2_to_dut1_ip6o4_reconf = '6.0.3.20'
 dut1_ip6o4_static_adjacency_reconf = {'vni': 0,
                                       'deid': '6:0:2::0',
                                       'seid': '6:0:1::0',