CSIT-611: HC Test: Lisp suite updates + LispGPE

 - added LispGPE test suite
 - added IPv6 tests to Lisp suite
 - added traffic tests to Lisp suite

Change-Id: I3b699149cd73ebf5856072d3f26e98a370dbfc4b
Signed-off-by: selias <samelias@cisco.com>

6 files changed, 609 insertions, 97 deletions

diff --git a/resources/libraries/python/honeycomb/Lisp.py b/resources/libraries/python/honeycomb/Lisp.py
index f89ffed0b9..f2fe24caf1 100644
--- a/resources/libraries/python/honeycomb/Lisp.py
+++ b/resources/libraries/python/honeycomb/Lisp.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -11,7 +11,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""This module implements keywords to manipulate Lisp data structures using
+"""This module implements keywords to manipulate LISP data structures using
 Honeycomb REST API."""
 
 from resources.libraries.python.HTTPRequest import HTTPCodes
@@ -20,15 +20,16 @@ from resources.libraries.python.honeycomb.HoneycombUtil \
     import HoneycombUtil as HcUtil
 from resources.libraries.python.honeycomb.HoneycombUtil \
     import DataRepresentation
+from resources.libraries.python.topology import Topology
 
 
 class LispKeywords(object):
     """Implementation of keywords which make it possible to:
-    - enable/disable Lisp feature
-    - configure Lisp mappings
+    - enable/disable LISP feature
+    - configure LISP mappings
     - configure locator sets
     - configure map resolver
-    - configure Lisp PITR feature
+    - configure LISP PITR feature
     - read operational data for all of the above
     """
 
@@ -38,7 +39,7 @@ class LispKeywords(object):
 
     @staticmethod
     def _set_lisp_properties(node, path, data=None):
-        """Set Lisp properties and check the return code.
+        """Set LISP properties and check the return code.
 
         :param node: Honeycomb node.
         :param path: Path which is added to the base path to identify the data.
@@ -80,7 +81,7 @@ class LispKeywords(object):
         status_code, resp = HcUtil.get_honeycomb_data(node, "oper_lisp")
 
         if status_code != HTTPCodes.OK:
-            raise HoneycombError("Could not retrieve Lisp operational data."
+            raise HoneycombError("Could not retrieve LISP operational data."
                                  "Status code: {0}.".format(status_code))
         else:
             # get rid of empty vni-table entry
@@ -97,7 +98,7 @@ class LispKeywords(object):
     def verify_map_server_data_from_honeycomb(data, ip_addresses):
         """Verify whether MAP server data from Honeycomb is correct.
 
-        :param data: Lisp operational data containing map server IP addresses.
+        :param data: LISP operational data containing map server IP addresses.
         :param ip_addresses: IP addresses to verify map server data against.
         :type data: dict
         :type ip_addresses: list
@@ -117,7 +118,7 @@ class LispKeywords(object):
     def verify_map_server_data_from_vat(data, ip_addresses):
         """Verify whether MAP server data from VAT is correct.
 
-        :param data: Lisp operational data containing map server IP addresses.
+        :param data: LISP operational data containing map server IP addresses.
         :param ip_addresses: IP addresses to verify map server data against.
         :type data: dict
         :type ip_addresses: list
@@ -132,10 +133,10 @@ class LispKeywords(object):
 
     @staticmethod
     def set_lisp_state(node, state=True):
-        """Enable or disable the Lisp feature.
+        """Enable or disable the LISP feature.
 
         :param node: Honeycomb node.
-        :param state: Enable or disable Lisp.
+        :param state: Enable or disable LISP.
         :type node: dict
         :type state: bool
         :returns: Content of response.
@@ -151,7 +152,7 @@ class LispKeywords(object):
             data = {"lisp": {"enable": bool(state)}}
         else:
             raise HoneycombError("Unexpected return code when getting existing"
-                                 " Lisp configuration.")
+                                 " LISP configuration.")
 
         return LispKeywords._set_lisp_properties(node, '', data)
 
@@ -179,7 +180,7 @@ class LispKeywords(object):
 
     @staticmethod
     def add_locator(node, interface, locator_set, priority=1, weight=1):
-        """Configure a new Lisp locator set.
+        """Configure a new LISP locator set.
 
         :param node: Honeycomb node.
         :param interface: An interface on the node.
@@ -195,6 +196,9 @@ class LispKeywords(object):
         :rtype: bytearray
         """
 
+        interface = Topology.convert_interface_reference(
+            node, interface, "name")
+
         path = "/lisp-feature-data/locator-sets/locator-set" \
                "/{0}".format(locator_set)
 
@@ -216,7 +220,7 @@ class LispKeywords(object):
         """Modify eid-table configuration to the data provided.
 
         :param node: Honeycomb node.
-        :param data: Settings for the Lisp mappings.
+        :param data: Settings for the LISP mappings.
         :type node: dict
         :type data: dict
         :returns: Content of response.
@@ -228,10 +232,10 @@ class LispKeywords(object):
 
     @staticmethod
     def configure_lisp_map_request_mode(node, option):
-        """Modify Lisp Map Request Mode configuration to the data provided.
+        """Modify LISP Map Request Mode configuration to the data provided.
 
         :param node: Honeycomb node.
-        :param option: Settings for the Lisp map request mode.
+        :param option: Settings for the LISP map request mode.
         :type node: dict
         :type option: str
         :returns: Content of response.
@@ -249,7 +253,7 @@ class LispKeywords(object):
 
     @staticmethod
     def add_lisp_adjacency(node, vni_id, map_name, adjacency_name, data):
-        """Add an adjacency to an existing Lisp mapping.
+        """Add an adjacency to an existing LISP mapping.
 
         :param node: Honeycomb node.
         :param vni_id: vni_id of the mapping.
@@ -452,7 +456,7 @@ class LispKeywords(object):
 
     @staticmethod
     def disable_lisp(node):
-        """Remove all Lisp settings on the node.
+        """Remove all LISP settings on the node.
 
         :param node: Honeycomb node.
         :type node: dict
@@ -461,3 +465,207 @@ class LispKeywords(object):
         """
 
         return LispKeywords._set_lisp_properties(node, "")
+
+
+class LispGPEKeywords(object):
+    """Implementation of keywords which make it possible to:
+    - enable/disable LISP GPE feature
+    - configure LISP GPE forwarding entries
+    - read operational data for all of the above
+    """
+
+    def __init__(self):
+        """Initializer."""
+        pass
+
+    @staticmethod
+    def _set_lispgpe_properties(node, path, data=None):
+        """Set LISP GPE properties and check the return code.
+
+        :param node: Honeycomb node.
+        :param path: Path which is added to the base path to identify the data.
+        :param data: The new data to be set. If None, the item will be removed.
+        :type node: dict
+        :type path: str
+        :type data: dict
+        :returns: Content of response.
+        :rtype: bytearray
+        :raises HoneycombError: If the status code in response to PUT is not
+        200 = OK or 201 = ACCEPTED.
+        """
+
+        if data:
+            status_code, resp = HcUtil.\
+                put_honeycomb_data(node, "config_lisp_gpe", data, path,
+                                   data_representation=DataRepresentation.JSON)
+        else:
+            status_code, resp = HcUtil.\
+                delete_honeycomb_data(node, "config_lisp_gpe", path)
+
+        if status_code not in (HTTPCodes.OK, HTTPCodes.ACCEPTED):
+            raise HoneycombError(
+                "Lisp GPE configuration unsuccessful. "
+                "Status code: {0}.".format(status_code))
+        else:
+            return resp
+
+    @staticmethod
+    def get_lispgpe_operational_data(node):
+        """Retrieve LISP GPE properties from Honeycomb operational data.
+
+        :param node: Honeycomb node.
+        :type node: dict
+        :returns: LISP GPE operational data.
+        :rtype: bytearray
+        :raises HoneycombError: If the status code in response to GET is not
+        200 = OK.
+        """
+
+        status_code, resp = HcUtil.get_honeycomb_data(node, "oper_lisp_gpe")
+
+        if status_code != HTTPCodes.OK:
+            raise HoneycombError("Could not retrieve Lisp GPE operational data."
+                                 "Status code: {0}.".format(status_code))
+        else:
+            return resp
+
+    @staticmethod
+    def get_lispgpe_mapping(node, name):
+        """Retrieve LISP GPE operational data and parse for a specific mapping.
+
+        :param node: Honeycomb node.
+        :param name: Name of the mapping to look for.
+        :type node: dict
+        :type name: str
+        :returns: LISP GPE mapping.
+        :rtype: dict
+        :raises HoneycombError: If the mapping is not present in operational
+        data.
+        """
+
+        data = LispGPEKeywords.get_lispgpe_operational_data(node)
+        try:
+            data = data["gpe-state"]["gpe-feature-data"]["gpe-entry-table"] \
+                ["gpe-entry"]
+        except KeyError:
+            raise HoneycombError("No mappings present in operational data.")
+        for item in data:
+            if item["id"] == name:
+                mapping = item
+                break
+        else:
+            raise HoneycombError("Mapping with name {name} not found in "
+                                 "operational data.".format(name=name))
+
+        return mapping
+
+    @staticmethod
+    def get_lispgpe_config_data(node):
+        """Retrieve LISP GPE properties from Honeycomb config data.
+
+        :param node: Honeycomb node.
+        :type node: dict
+        :returns: LISP GPE config data.
+        :rtype: bytearray
+        :raises HoneycombError: If the status code in response to GET is not
+        200 = OK.
+        """
+
+        status_code, resp = HcUtil.get_honeycomb_data(node, "config_lisp_gpe")
+
+        if status_code != HTTPCodes.OK:
+            raise HoneycombError("Could not retrieve Lisp GPE config data."
+                                 "Status code: {0}.".format(status_code))
+        else:
+            return resp
+
+    @staticmethod
+    def set_lispgpe_state(node, state=True):
+        """Enable or disable the LISP GPE feature.
+
+        :param node: Honeycomb node.
+        :param state: Enable or disable LISP.
+        :type node: dict
+        :type state: bool
+        :returns: Content of response.
+        :rtype: bytearray
+        :raises HoneycombError: If the return code is not 200:OK
+        or 404:NOT FOUND.
+        """
+
+        ret_code, data = HcUtil.get_honeycomb_data(node, "config_lisp_gpe")
+        if ret_code == HTTPCodes.OK:
+            data["gpe"]["gpe-feature-data"]["enable"] = bool(state)
+        elif ret_code == HTTPCodes.NOT_FOUND:
+            data = {"gpe": {"gpe-feature-data": {"enable": bool(state)}}}
+        else:
+            raise HoneycombError("Unexpected return code when getting existing"
+                                 " Lisp GPE configuration.")
+
+        return LispGPEKeywords._set_lispgpe_properties(node, '', data)
+
+    @staticmethod
+    def configure_lispgpe_mapping(node, data=None):
+        """Modify LISP GPE mapping configuration to the data provided.
+
+        :param node: Honeycomb node.
+        :param data: Settings for the LISP GPE mappings.
+        :type node: dict
+        :type data: dict
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/gpe-feature-data/gpe-entry-table"
+        if data:
+            data = {"gpe-entry-table": {"gpe-entry": data}}
+            return LispGPEKeywords._set_lispgpe_properties(node, path, data)
+        else:
+            return LispGPEKeywords._set_lispgpe_properties(node, path)
+
+    @staticmethod
+    def add_lispgpe_mapping(node, name, data):
+        """Add the specified LISP GPE mapping.
+
+        :param node: Honeycomb node.
+        :param name: Name for the mapping.
+        :param data: Mapping details.
+        :type node: dict
+        :type name: str
+        :type data: dict
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/gpe-feature-data/gpe-entry-table/gpe-entry/{name}".format(
+            name=name)
+
+        data = {"gpe-entry": data}
+        return LispGPEKeywords._set_lispgpe_properties(node, path, data)
+
+    @staticmethod
+    def delete_lispgpe_mapping(node, mapping):
+        """Delete the specified LISP GPE mapping from configuration.
+
+        :param node: Honeycomb node.
+        :param mapping: Name of the mapping to remove.
+        :type node: dict
+        :type mapping: str
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/gpe-feature-data/gpe-entry-table/gpe-entry/{0}".format(mapping)
+        return LispGPEKeywords._set_lispgpe_properties(node, path)
+
+    @staticmethod
+    def disable_lispgpe(node):
+        """Remove all LISP GPE settings on the node.
+
+        :param node: Honeycomb node.
+        :type node: dict
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        return LispGPEKeywords._set_lispgpe_properties(node, "")
diff --git a/resources/libraries/robot/honeycomb/lisp.robot b/resources/libraries/robot/honeycomb/lisp.robot
index cda8d827ba..5decf6b6e8 100644
--- a/resources/libraries/robot/honeycomb/lisp.robot
+++ b/resources/libraries/robot/honeycomb/lisp.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2017 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -18,7 +18,7 @@
 
 *** Keywords ***
 | Honeycomb enables LISP
-| | [Documentation] | Uses Honeycomb API to enable Lisp.
+| | [Documentation] | Uses Honeycomb API to enable LISP.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -29,10 +29,10 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | Set Lisp state | ${node} | ${TRUE}
+| | Set LISP state | ${node} | ${TRUE}
 
 | Honeycomb disables LISP
-| | [Documentation] | Uses Honeycomb API to disable Lisp.
+| | [Documentation] | Uses Honeycomb API to disable LISP.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -43,10 +43,10 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | Set Lisp state | ${node} | ${FALSE}
+| | Set LISP state | ${node} | ${FALSE}
 
 | Honeycomb adds locator set
-| | [Documentation] | Uses Honeycomb API to enable Lisp.
+| | [Documentation] | Uses Honeycomb API to enable LISP.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -62,20 +62,20 @@
 | | ...
 | | Add locator | ${node} | ${interface} | ${locator_set}
 
-| Honeycomb adds Lisp Mapping
-| | [Documentation] | Uses Honeycomb API to configure a Lisp mapping.
+| Honeycomb adds LISP Mapping
+| | [Documentation] | Uses Honeycomb API to configure a LISP mapping.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - data - Lisp settings to use. Type: dictionary
+| | ... | - data - LISP settings to use. Type: dictionary
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp Mapping \| ${nodes['DUT1']} \| ${data} \|
+| | ... | \| Honeycomb adds LISP Mapping \| ${nodes['DUT1']} \| ${data} \|
 | | ...
 | | [Arguments] | ${node} | ${data}
 | | ...
-| | Configure Lisp Mapping | ${node} | ${data}
+| | Configure LISP Mapping | ${node} | ${data}
 
 | Honeycomb removes all LISP mappings
 | | [Documentation] | Uses Honeycomb API to clear the eid-table.
@@ -89,10 +89,10 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | Configure lisp mapping | ${node} | ${NONE}
+| | Configure LISP mapping | ${node} | ${NONE}
 
 | LISP should not be configured
-| | [Documentation] | Retrieves Lisp configuration from Honeycomb operational\
+| | [Documentation] | Retrieves LISP configuration from Honeycomb operational\
 | | ... | data, and expects an empty dictionary.
 | | ...
 | | ... | *Arguments:*
@@ -105,15 +105,15 @@
 | | [Arguments] | ${node}
 | | ...
 | | Run keyword and Expect Error | KeyError: 'lisp-feature-data'
-| | ... | Get Lisp operational data | ${node}
+| | ... | Get LISP operational data | ${node}
 
 | LISP state from Honeycomb should be
-| | [Documentation] | Retrieves Lisp state from Honeycomb operational\
-| | ... | data, and compares Lisp state with expected value.
+| | [Documentation] | Retrieves LISP state from Honeycomb operational\
+| | ... | data, and compares LISP state with expected value.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - state - Expected Lisp state. Type: string
+| | ... | - state - Expected LISP state. Type: string
 | | ...
 | | ... | *Example:*
 | | ...
@@ -121,7 +121,7 @@
 | | ... | \| enabled \|
 | | ...
 | | [Arguments] | ${node} | ${state}
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ...
 | | Run keyword if | $state == 'enabled'
 | | ... | Should be equal as strings
@@ -131,12 +131,12 @@
 | | ... | ${data['lisp-state']['enable']} | ${False}
 
 | LISP state from VAT should be
-| | [Documentation] | Retrieves Lisp state from VAT,\
-| | ... | and compares Lisp state with expected value.
+| | [Documentation] | Retrieves LISP state from VAT,\
+| | ... | and compares LISP state with expected value.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - state - Expected Lisp state. Type: string
+| | ... | - state - Expected LISP state. Type: string
 | | ...
 | | ... | *Example:*
 | | ...
@@ -144,16 +144,16 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${status}= | VPP show Lisp State | ${node}
+| | ${status}= | VPP show LISP State | ${node}
 | | Should match | ${status['feature_status']} | ${state}
 
 | LISP mapping from Honeycomb should be
-| | [Documentation] | Retrieves Lisp mapping from Honeycomb operational\
+| | [Documentation] | Retrieves LISP mapping from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - settings - Expected Lisp mapping data. Type: dictionary
+| | ... | - settings - Expected LISP mapping data. Type: dictionary
 | | ...
 | | ... | *Example:*
 | | ...
@@ -162,18 +162,18 @@
 | | ...
 | | [Arguments] | ${node} | ${settings}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['eid-table']['vni-table'][0]}
 | | Compare data structures | ${data} | ${settings}
 
 | LISP mapping from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
-| | ... | - settings - Expected Lisp mapping data. Type: dictionary
+| | ... | - settings - Expected LISP mapping data. Type: dictionary
 | | ...
 | | ... | *Example:*
 | | ...
@@ -182,11 +182,11 @@
 | | ...
 | | [Arguments] | ${node} | ${settings}
 | | ...
-| | ${data}= | VPP show Lisp eid table | ${node}
+| | ${data}= | VPP show LISP eid table | ${node}
 | | Compare data structures | ${data[0]} | ${settings}
 
 | LISP mappings from Honeycomb should not exist
-| | [Documentation] | Retrieves Lisp mappings from operational\
+| | [Documentation] | Retrieves LISP mappings from operational\
 | | ... | data, and expects to find none.
 | | ...
 | | ... | *Arguments:*
@@ -199,12 +199,12 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | Should be empty | ${data['eid-table']['vni-table']}
 
 | LISP mappings from VAT should not exist
-| | [Documentation] | Retrieves Lisp mappings from VAT,\
+| | [Documentation] | Retrieves LISP mappings from VAT,\
 | | ... | and expects to receive an empty list.
 | | ...
 | | ... | *Arguments:*
@@ -216,11 +216,11 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | ${data}= | VPP show Lisp eid table | ${node}
+| | ${data}= | VPP show LISP eid table | ${node}
 | | Should be empty | ${data}
 
 | Locator set from Honeycomb should be
-| | [Documentation] | Retrieves Lisp locator set from Honeycomb operational\
+| | [Documentation] | Retrieves LISP locator set from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -236,7 +236,7 @@
 | | ...
 | | [Arguments] | ${node} | ${interface} | ${locator_set}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${loc_data}= | Set Variable
 | | ... | ${data['lisp-state']['lisp-feature-data']['locator-sets']}
 | | Should be equal
@@ -247,14 +247,14 @@
 | | ... | ${interface}
 
 | Honeycomb adds LISP adjacency
-| | [Documentation] | Uses Honeycomb API to configure Lisp adjacency.
+| | [Documentation] | Uses Honeycomb API to configure LISP adjacency.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ... | - vni - Virtual network identifier number. Type: integer
 | | ... | - map - Name of an existing remote mapping. Type: string
 | | ... | - adjacency - Name for the new adjacency. Type: string
-| | ... | - data - Lisp adjacency settings to use. Type: dictionary
+| | ... | - data - LISP adjacency settings to use. Type: dictionary
 | | ...
 | | ... | *Example:*
 | | ...
@@ -263,11 +263,11 @@
 | | ...
 | | [Arguments] | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
 | | ...
-| | Add Lisp adjacency
+| | Add LISP adjacency
 | | ... | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
 
 | Honeycomb adds LISP map resolver
-| | [Documentation] | Uses Honeycomb API to configure Lisp map resolver.
+| | [Documentation] | Uses Honeycomb API to configure LISP map resolver.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -282,8 +282,8 @@
 | | ...
 | | Add map resolver | ${node} | ${ip_address}
 
-| Honeycomb adds Lisp Map register
-| | [Documentation] | Uses Honeycomb API to configure Lisp map register.
+| Honeycomb adds LISP Map register
+| | [Documentation] | Uses Honeycomb API to configure LISP map register.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -291,15 +291,15 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp Map register \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds LISP Map register \| ${nodes['DUT1']} \
 | | ... | \| ${True} \|
 | | ...
 | | [Arguments] | ${node} | ${add_map_register}
 | | ...
 | | Set Map Register | ${node} | ${add_map_register}
 
-| Honeycomb sets Lisp Map request Mode
-| | [Documentation] | Uses Honeycomb API to configure Lisp map request mode.
+| Honeycomb sets LISP Map request Mode
+| | [Documentation] | Uses Honeycomb API to configure LISP map request mode.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -307,7 +307,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp Map Request Mode \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds LISP Map Request Mode \| ${nodes['DUT1']} \
 | | ... | \| ${True} \|
 | | ...
 | | [Arguments] | ${node} | ${set_map_request}
@@ -315,7 +315,7 @@
 | | Set Map Request Mode | ${node} | ${set_map_request}
 
 | Map resolver from Honeycomb should be
-| | [Documentation] | Retrieves Lisp map resolver from Honeycomb operational\
+| | [Documentation] | Retrieves LISP map resolver from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -330,13 +330,13 @@
 | | ...
 | | [Arguments] | ${node} | ${ip_address}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['map-resolvers']['map-resolver'][0]}
 | | Should be equal | ${data['ip-address']} | ${ip_address}
 
 | Map resolver from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -351,11 +351,11 @@
 | | ...
 | | [Arguments] | ${node} | ${ip_address}
 | | ...
-| | ${data}= | Vpp show Lisp map resolver | ${node}
+| | ${data}= | Vpp show LISP map resolver | ${node}
 | | Should be equal | ${data[0]['map resolver']} | ${ip_address}
 
-| Honeycomb adds Lisp Map Server
-| | [Documentation] | Uses Honeycomb API to configure Lisp Map Server.
+| Honeycomb adds LISP Map Server
+| | [Documentation] | Uses Honeycomb API to configure LISP Map Server.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -364,7 +364,7 @@
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Honeycomb adds Lisp Map Server \| ${nodes['DUT1']} \
+| | ... | \| Honeycomb adds LISP Map Server \| ${nodes['DUT1']} \
 | | ... | \| 192.168.0.2 \| 192.168.0.3 \|
 | | ...
 | | [Arguments] | ${node} | @{ip_addresses}
@@ -372,7 +372,7 @@
 | | Add Map Server | ${node} | @{ip_addresses}
 
 | Map Register from Honeycomb should be
-| | [Documentation] | Retrieves Lisp Map Register from Honeycomb operational\
+| | [Documentation] | Retrieves LISP Map Register from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -386,13 +386,13 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['map-register']}
 | | Should be equal | ${data['enabled']} | ${state}
 
 | Map Server from Honeycomb should be
-| | [Documentation] | Retrieves Lisp Map Server from Honeycomb operational\
+| | [Documentation] | Retrieves LISP Map Server from Honeycomb operational\
 | | ... | data, and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -407,12 +407,12 @@
 | | ...
 | | [Arguments] | ${node} | @{ip_addresses}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | Verify Map Server Data from Honeycomb | ${data} | ${ip_addresses}
 
 
 | Map Server from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -427,11 +427,11 @@
 | | ...
 | | [Arguments] | ${node} | @{ip_addresses}
 | | ...
-| | ${data}= | Vpp show Lisp Map Server | ${node}
+| | ${data}= | Vpp show LISP Map Server | ${node}
 | | Verify Map Server Data from VAT | ${data} | ${ip_addresses}
 
 | Map Register from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -445,11 +445,11 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${data}= | Vpp show Lisp Map Register | ${node}
+| | ${data}= | Vpp show LISP Map Register | ${node}
 | | Should be equal | ${data['state']} | ${state}
 
 | Map Request Mode from VAT should be
-| | [Documentation] | Retrieves Lisp Request Mode from VAT,\
+| | [Documentation] | Retrieves LISP Request Mode from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -464,11 +464,11 @@
 | | ...
 | | [Arguments] | ${node} | ${destination}
 | | ...
-| | ${data}= | Vpp show Lisp Map Request Mode | ${node}
+| | ${data}= | Vpp show LISP Map Request Mode | ${node}
 | | Should be equal | ${data['map_request_mode']} | ${destination}
 
 | Honeycomb enables LISP PITR feature
-| | [Documentation] | Uses Honeycomb API to configure Lisp PITR feature.
+| | [Documentation] | Uses Honeycomb API to configure LISP PITR feature.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -483,7 +483,7 @@
 | | Configure PITR | ${node} | ${locator_set}
 
 | Honeycomb enables LISP PETR feature
-| | [Documentation] | Uses Honeycomb API to configure Lisp PETR feature.
+| | [Documentation] | Uses Honeycomb API to configure LISP PETR feature.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -499,7 +499,7 @@
 | | Configure PETR | ${node} | ${ip_address}
 
 | Honeycomb enables LISP RLOC feature
-| | [Documentation] | Uses Honeycomb API to enable the Lisp RLOC feature.
+| | [Documentation] | Uses Honeycomb API to enable the LISP RLOC feature.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -529,7 +529,7 @@
 | | ...
 | | [Arguments] | ${node} | ${locator_set}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['pitr-cfg']}
 | | Should be equal | ${data['locator-set']} | ${locator_set}
@@ -549,7 +549,7 @@
 | | ...
 | | [Arguments] | ${node} | ${ip_address}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['petr-cfg']['petr-address']}
 | | Should be equal | ${data} | ${ip_address}
@@ -569,7 +569,7 @@
 | | ...
 | | [Arguments] | ${node} | ${destination}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['map-request-mode']['mode']}
 | | Should be equal | ${data} | ${destination}
@@ -589,13 +589,13 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${data}= | Get Lisp operational data | ${node}
+| | ${data}= | Get LISP operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['rloc-probe']['enabled']}
 | | Should be equal | ${data} | ${state}
 
 | PETR configuration from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -610,11 +610,11 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${data}= | Vpp show Lisp PETR config | ${node}
+| | ${data}= | Vpp show LISP PETR config | ${node}
 | | Should be equal | ${data['status']} | ${state}
 
 | RLOC probing from VAT should be
-| | [Documentation] | Retrieves Lisp mapping from VAT,\
+| | [Documentation] | Retrieves LISP mapping from VAT,\
 | | ... | and compares with expected data.
 | | ...
 | | ... | *Arguments:*
@@ -629,7 +629,7 @@
 | | ...
 | | [Arguments] | ${node} | ${state}
 | | ...
-| | ${data}= | Vpp show Lisp RLOC config | ${node}
+| | ${data}= | Vpp show LISP RLOC config | ${node}
 | | Should be equal | ${data['state']} | ${state}
 
 | PITR config from VAT should be
@@ -648,12 +648,12 @@
 | | ...
 | | [Arguments] | ${node} | ${locator_set}
 | | ...
-| | ${data}= | VPP show Lisp PITR | ${node}
+| | ${data}= | VPP show LISP PITR | ${node}
 | | Should be equal | ${data['status']} | enabled
 | | Should be equal | ${data['locator_set']} | ${locator_set}
 
 | Honeycomb disables all LISP features
-| | [Documentation] | Uses Honeycomb API to remove all Lisp configuration.
+| | [Documentation] | Uses Honeycomb API to remove all LISP configuration.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -664,4 +664,55 @@
 | | ...
 | | [Arguments] | ${node}
 | | ...
-| | Disable Lisp | ${node}
\ No newline at end of file
+| | Disable LISP | ${node}
+
+| Send packet and verify LISP encap
+| | [Documentation] | Send ICMP packet to DUT out one interface and receive\
+| | ... | a LISP encapsulated packet on the other interface.
+| | ...
+| | ... | *Arguments:*
+| | ...
+| | ... | _NOTE:_ Arguments are based on topology:
+| | ...             | TG(if1)->(if1)DUT(if2)->TG(if2)
+| | ...
+| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary
+| | ... | - src_ip - IP of source interface (TG-if1). Type: string
+| | ... | - dst_ip - IP of destination interface (TG-if2). Type: string
+| | ... | - tx_src_port - Interface of TG-if1. Type: string
+| | ... | - tx_src_mac - MAC address of TG-if1. Type: string
+| | ... | - tx_dst_mac - MAC address of DUT-if1. Type: string
+| | ... | - rx_port - Interface of TG-if1. Type: string
+| | ... | - rx_src_mac - MAC address of DUT1-if2. Type: string
+| | ... | - rx_dst_mac - MAC address of TG-if2. Type: string
+| | ... | - src_rloc - configured RLOC source address. Type: string
+| | ... | - dst_rloc - configured RLOC destination address. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send packet and verify LISP encap \| ${nodes['TG']} \| 10.0.0.1 \
+| | ... | \| 32.0.0.1 \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
+| | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \| 10.0.1.1 \
+| | ... | \| 10.0.1.2 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port}
+| | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac}
+| | ... | ${rx_dst_mac} | ${src_rloc} | ${dst_rloc}
+| | ...
+| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port}
+| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
+| | ${args}= | Catenate | --tg_src_mac | ${tx_src_mac} | --tg_dst_mac
+| | ... | ${rx_dst_mac} | --dut_if1_mac | ${tx_dst_mac} | --dut_if2_mac
+| | ... | ${rx_src_mac} | --src_ip | ${src_ip} | --dst_ip | ${dst_ip}
+| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name}
+| | ... | --src_rloc | ${src_rloc} | --dst_rloc | ${dst_rloc}
+| | Run Traffic Script On Node | lisp/lisp_check.py | ${tg_node}
+| | ... | ${args}
+
+| LISP Functional Traffic Test Teardown
+| | [Documentation] | Teardown for LISP functional traffic test.
+| | Show Packet Trace on all DUTs | ${nodes}
+| | VPP Show LISP EID Table | ${node}
+| | Disable LISP | ${node}
diff --git a/resources/libraries/robot/honeycomb/lisp_gpe.robot b/resources/libraries/robot/honeycomb/lisp_gpe.robot
new file mode 100644
index 0000000000..2b265c83c6
--- /dev/null
+++ b/resources/libraries/robot/honeycomb/lisp_gpe.robot
@@ -0,0 +1,252 @@
+# Copyright (c) 2017 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*** Settings ***
+| Library | resources.libraries.python.honeycomb.Lisp.LispGPEKeywords
+| Library | resources.libraries.python.LispUtil
+| Documentation | Keywords used to test Honeycomb Lisp GPE features.
+
+*** Keywords ***
+| Honeycomb enables LISP GPE
+| | [Documentation] | Uses Honeycomb API to enable LISP GPE.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb enables LISP GPE \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | Set LISPGPE state | ${node} | ${TRUE}
+
+| Honeycomb disables LISP GPE
+| | [Documentation] | Uses Honeycomb API to disable LISP GPE.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb disables LISP GPE \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | Set LISPGPE state | ${node} | ${FALSE}
+
+| Honeycomb adds first LISP GPE Mapping
+| | [Documentation] | Uses Honeycomb API to configure a LISP mapping. Removes
+| | ... | any existing mappings.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - data - LISP settings to use. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb adds first LISP GPE Mapping \| ${nodes['DUT1']} \
+| | ... | \| ${data} \|
+| | ...
+| | [Arguments] | ${node} | ${data}
+| | ...
+| | Configure LISPGPE Mapping | ${node} | ${data}
+
+| Honeycomb adds LISP GPE Mapping
+| | [Documentation] | Uses Honeycomb API to configure a LISP mapping.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - data - LISP settings to use. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb adds LISP GPE Mapping \| ${nodes['DUT1']} \| ${data} \|
+| | ...
+| | [Arguments] | ${node} | ${data}
+| | ...
+| | Add LISPGPE Mapping | ${node} | ${data['id']} | ${data}
+
+| Honeycomb removes LISP GPE mapping
+| | [Documentation] | Uses Honeycomb API to remove the specified mapping.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb removes LISP GPE mapping \| ${nodes['DUT1']} \
+| | ... | \| map_name \|
+| | ...
+| | [Arguments] | ${node} | ${mapping}
+| | ...
+| | Delete LISPGPE mapping | ${node} | ${mapping}
+
+| LISP GPE should not be configured
+| | [Documentation] | Retrieves LISP GPE configuration from Honeycomb operational\
+| | ... | data, and expects an empty dictionary.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| LISP GPE should not be configured \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | ${data}= | Get LISP GPE operational data | ${node}
+| | Should be Equal
+| | ... | ${data['gpe-state']['gpe-feature-data']['enable']} | ${FALSE}
+
+| LISP GPE state from Honeycomb should be
+| | [Documentation] | Retrieves LISP GPE state from Honeycomb operational\
+| | ... | data, and compares LISP state with expected value.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - Expected LISP state. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| LISP GPE state from Honeycomb should be \| ${nodes['DUT1']} \
+| | ... | \| enabled \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${data}= | Get LISPGPE operational data | ${node}
+| | Run keyword if | $state == 'enabled'
+| | ... | Should be equal as strings
+| | ... | ${data['gpe-state']['gpe-feature-data']['enable']} | ${True}
+| | Run keyword if | $state == 'disabled'
+| | ... | Should be equal as strings
+| | ... | ${data['gpe-state']['gpe-feature-data']['enable']} | ${False}
+
+| LISP GPE state from VAT should be
+| | [Documentation] | Retrieves LISP state from VAT,\
+| | ... | and compares LISP state with expected value.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - Expected LISP state. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| LISP state from VAT should be \| ${nodes['DUT1']} \| enabled \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${status}= | VPP show LISP State | ${node}
+| | Should match | ${status['gpe_status']} | ${state}
+
+| LISP GPE mapping from Honeycomb should be
+| | [Documentation] | Retrieves LISP GPE mapping from Honeycomb operational\
+| | ... | data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - settings - Expected LISP mapping data. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| LISP GPE mapping from Honeycomb should be \| ${nodes['DUT1']} \
+| | ... | \| ${settings} \|
+| | ...
+| | [Arguments] | ${node} | ${settings}
+| | ...
+| | ${data}= | Get LISPGPE mapping | ${node} | ${settings['id']}
+| | Compare data structures | ${data} | ${settings}
+
+| LISP GPE mappings from Honeycomb should not exist
+| | [Documentation] | Retrieves LISP GPE mappings from operational\
+| | ... | data, and expects to find none.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| LISP GPE mappings from Honeycomb should not exist \
+| | ... | \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | ${data}= | Get LISPGPE operational data | ${node}
+| | Variable Should Not Exist
+| | ... | ${data['gpe-state']['gpe-feature-data']['gpe-entry']}
+
+| Honeycomb disables all LISP GPE features
+| | [Documentation] | Uses Honeycomb API to remove all LISP GPE configuration.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb disables all LISP GPE features \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | Disable LISPGPE | ${node}
+
+| Send packet and verify LISP GPE encap
+| | [Documentation] | Send ICMP packet to DUT out one interface and receive\
+| | ... | a LISP-GPE encapsulated packet on the other interface.
+| | ...
+| | ... | *Arguments:*
+| | ...
+| | ... | _NOTE:_ Arguments are based on topology:
+| | ...             | TG(if1)->(if1)DUT(if2)->TG(if2)
+| | ...
+| | ... | - tg_node - Node to execute scripts on (TG). Type: dictionary
+| | ... | - src_ip - IP of source interface (TG-if1). Type: string
+| | ... | - dst_ip - IP of destination interface (TG-if2). Type: string
+| | ... | - tx_src_port - Interface of TG-if1. Type: string
+| | ... | - tx_src_mac - MAC address of TG-if1. Type: string
+| | ... | - tx_dst_mac - MAC address of DUT-if1. Type: string
+| | ... | - rx_port - Interface of TG-if1. Type: string
+| | ... | - rx_src_mac - MAC address of DUT1-if2. Type: string
+| | ... | - rx_dst_mac - MAC address of TG-if2. Type: string
+| | ... | - src_rloc - configured RLOC source address. Type: string
+| | ... | - dst_rloc - configured RLOC destination address. Type: string
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Send packet and verify LISP GPE encap \| ${nodes['TG']} \
+| | ... | \| 10.0.0.1 \| 32.0.0.1 \|
+| | ... | \| eth2 \| 08:00:27:ee:fd:b3 \| 08:00:27:a2:52:5b \
+| | ... | \| eth3 \| 08:00:27:4d:ca:7a \| 08:00:27:7d:fd:10 \
+| | ... | \| 10.0.1.1 \| 10.0.1.2 \|
+| | ...
+| | [Arguments] | ${tg_node} | ${src_ip} | ${dst_ip} | ${tx_src_port} |
+| | ... | ${tx_src_mac} | ${tx_dst_mac} | ${rx_port} | ${rx_src_mac}
+| | ... | ${rx_dst_mac} | ${src_rloc} | ${dst_rloc}
+| | ...
+| | ${tx_port_name}= | Get interface name | ${tg_node} | ${tx_src_port}
+| | ${rx_port_name}= | Get interface name | ${tg_node} | ${rx_port}
+| | ${args}= | Catenate | --tg_src_mac | ${tx_src_mac} | --tg_dst_mac
+| | ... | ${rx_dst_mac} | --dut_if1_mac | ${tx_dst_mac} | --dut_if2_mac
+| | ... | ${rx_src_mac} | --src_ip | ${src_ip} | --dst_ip | ${dst_ip}
+| | ... | --tx_if | ${tx_port_name} | --rx_if | ${rx_port_name}
+| | ... | --src_rloc | ${src_rloc} | --dst_rloc | ${dst_rloc}
+| | Run Traffic Script On Node | lisp/lispgpe_check.py | ${tg_node}
+| | ... | ${args}
+
+| LISPGPE Functional Traffic Test Teardown
+| | [Documentation] | Teardown for LISP GPE functional traffic test.
+| | Show Packet Trace on all DUTs | ${nodes}
+| | VPP Show LISP EID Table | ${node}
+| | Disable LISPGPE | ${node}
diff --git a/resources/libraries/robot/overlay/l2lisp.robot b/resources/libraries/robot/overlay/l2lisp.robot
index 5dcfcc5971..3a2eafa7a5 100644
--- a/resources/libraries/robot/overlay/l2lisp.robot
+++ b/resources/libraries/robot/overlay/l2lisp.robot
@@ -36,7 +36,7 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Configure LISP GPE topology in 3-node circular topology \| ${dut_node} \| ${adjacency} \
+| | ... | \| Configure L2 LISP on DUT \| ${dut_node} \| ${adjacency} \
 | | ... | \| ${settings} \|
 | | ...
 | | [Arguments]
diff --git a/resources/libraries/robot/overlay/lisp_api.robot b/resources/libraries/robot/overlay/lisp_api.robot
index 1485a405a6..b858ef48a7 100644
--- a/resources/libraries/robot/overlay/lisp_api.robot
+++ b/resources/libraries/robot/overlay/lisp_api.robot
@@ -82,7 +82,7 @@
 | | ... | KW locator_set data is prepared, which are expected from VPP via VAT.
 | | ...
 | | ... | *Example:*
-| | ... | \| Then LISP locator_set shpuld be configured correctly \
+| | ... | \| Then LISP locator_set should be configured correctly \
 | | ... | \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
diff --git a/resources/libraries/robot/overlay/lisp_static_adjacency.robot b/resources/libraries/robot/overlay/lisp_static_adjacency.robot
index f20fd51eb4..389b1bfb40 100644
--- a/resources/libraries/robot/overlay/lisp_static_adjacency.robot
+++ b/resources/libraries/robot/overlay/lisp_static_adjacency.robot
@@ -42,8 +42,9 @@
 | | ... | - No value returned
 | | ...
 | | ... | *Example:*
-| | ... | \| Configure LISP topology in 3-node circular topology \| ${dut1_node} \| ${interface_name} \
-| | ... | \| None \| ${dut2_node} \| ${interface_name} \| None \
+| | ... | \| Configure LISP topology in 3-node circular topology \
+| | ... | \| ${dut1_node} \| ${interface_name} \| None \
+| | ... | \| ${dut2_node} \| ${interface_name} \| None \
 | | ... | \| ${locator_set} \| ${dut1_eid} \| ${dut2_eid} \
 | | ... | \| ${dut1_static_adjacency} \| ${dut2_static_adjacency} \|
 | | ...