LISP: Add xTR-ID support in Map-Register perf tests

Change-Id: I5d7573e83f8abc5d2cbdbc722417f68d5784d86d
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
index 96ba70d9fa2b3801f739a0593f620d3ee196cc7e..153fc339355d28914e22e149110f4e2fd07a8625 100644 (file)
--- a/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
+++ b/csit/suites/lispflowmapping/performance/010_Southbound_MapRequest.robot
@@ -13,7 +13,7 @@ Variables         ../../../variables/Variables.py
 
 *** Variables ***
 ${MAPPINGS}       10000
-${LISP_SCAPY}     https://raw.githubusercontent.com/intouch/py-lispnetworking/master/lisp.py
+${LISP_SCAPY}     https://raw.githubusercontent.com/ljakab/py-lispnetworking/opendaylight/lisp.py
 ${TOOLS_DIR}      ${CURDIR}/../../../../tools/odl-lispflowmapping-performance-tests/
 ${PCAP_CREATOR}    ${TOOLS_DIR}/create_lisp_control_plane_pcap.py
 ${MAPPING_BLASTER}    ${TOOLS_DIR}/mapping_blaster.py

diff --git a/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py b/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py
index 5dd11181557e09571549e34230b2f90f158d24cd..ffbccaf5a778e7cea85416bdd7041878975cd7e8 100755 (executable)
--- a/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py
+++ b/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py
@@ -105,9 +105,11 @@ def generate_map_register(eid, rloc):
     packet /= lisp.IP(dst=dst_rloc, src=src_rloc)
     packet /= lisp.UDP(sport=sport1, dport=4342)
     packet /= lisp.LISP_MapRegister(ptype=3, nonce=rnonce,
-                                    register_flags=1,
+                                    register_flags=10,
+                                    additional_register_flags=1,
                                     register_count=1,
-                                    register_records=record)
+                                    register_records=record,
+                                    xtr_id_low=netaddr.IPAddress(eid))
     return packet
 
 parser = argparse.ArgumentParser(description='Create a Map-Request trace file')