CSIT-563: HC Test: improved Lisp test coverage

added TC09-TC14 with following features:
Map Resolver
Map Server
PETR configuration
RLOC Probing
Map Register
Map Request mode

Change-Id: I0e8a573e9a0f7ef3c688a014ff879e2b3d6b9b1e
Signed-off-by: jan.hradil <jan.hradil@pantheon.tech>
Signed-off-by: selias <samelias@cisco.com>

9 files changed, 685 insertions, 24 deletions

diff --git a/resources/libraries/python/LispUtil.py b/resources/libraries/python/LispUtil.py
index 82341d123e..89f12bb2f2 100644
--- a/resources/libraries/python/LispUtil.py
+++ b/resources/libraries/python/LispUtil.py
@@ -89,6 +89,76 @@ class LispUtil(object):
         return JsonParser().parse_data(vat.get_script_stdout())
 
     @staticmethod
+    def vpp_show_lisp_map_register(node):
+        """Get LISP Map Register from VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        :returns: LISP Map Register as python list.
+        :rtype: list
+        """
+
+        vat = VatExecutor()
+        vat.execute_script_json_out('lisp/show_lisp_map_register.vat', node)
+        return JsonParser().parse_data(vat.get_script_stdout())
+
+    @staticmethod
+    def vpp_show_lisp_map_request_mode(node):
+        """Get LISP Map Request mode from VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        :returns: LISP Map Request mode as python list.
+        :rtype: list
+        """
+
+        vat = VatExecutor()
+        vat.execute_script_json_out('lisp/show_lisp_map_request_mode.vat', node)
+        return JsonParser().parse_data(vat.get_script_stdout())
+
+    @staticmethod
+    def vpp_show_lisp_map_server(node):
+        """Get LISP Map Server from VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        :returns: LISP Map Server as python list.
+        :rtype: list
+        """
+
+        vat = VatExecutor()
+        vat.execute_script_json_out('lisp/show_lisp_map_server.vat', node)
+        return JsonParser().parse_data(vat.get_script_stdout())
+
+    @staticmethod
+    def vpp_show_lisp_petr_config(node):
+        """Get LISP PETR configuration from VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        :returns: LISP PETR configuration as python list.
+        :rtype: list
+        """
+
+        vat = VatExecutor()
+        vat.execute_script_json_out('lisp/show_lisp_petr_config.vat', node)
+        return JsonParser().parse_data(vat.get_script_stdout())
+
+    @staticmethod
+    def vpp_show_lisp_rloc_config(node):
+        """Get LISP RLOC configuration from VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        :returns: LISP RLOC configuration as python list.
+        :rtype: list
+        """
+
+        vat = VatExecutor()
+        vat.execute_script_json_out('lisp/show_lisp_rloc_config.vat', node)
+        return JsonParser().parse_data(vat.get_script_stdout())
+
+    @staticmethod
     def vpp_show_lisp_pitr(node):
         """Get Lisp PITR feature config from VPP node.
 
diff --git a/resources/libraries/python/honeycomb/Lisp.py b/resources/libraries/python/honeycomb/Lisp.py
index 7ec259347c..8c124d194c 100644
--- a/resources/libraries/python/honeycomb/Lisp.py
+++ b/resources/libraries/python/honeycomb/Lisp.py
@@ -94,24 +94,88 @@ class LispKeywords(object):
             return resp
 
     @staticmethod
-    def set_lisp_state(node, state):
+    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 ip_addresses: IP addresses to verify map server data against.
+        :type data: dict
+        :type ip_addresses: list
+        :returns: Boolean Value indicating equality of IP Lists.
+        :rtype: bool
+        """
+
+        data =\
+            data['lisp-state']['lisp-feature-data']['map-servers']['map-server']
+
+        data = sorted([entry['ip-address'] for entry in data])
+        ip_addresses.sort()
+
+        return data == ip_addresses
+
+    @staticmethod
+    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 ip_addresses: IP addresses to verify map server data against.
+        :type data: dict
+        :type ip_addresses: list
+        :returns: Boolean Value indicating equality of IP Lists.
+        :rtype: bool
+        """
+
+        data = sorted([entry['map-server'] for entry in data])
+        ip_addresses.sort()
+
+        return data == ip_addresses
+
+    @staticmethod
+    def set_lisp_state(node, state=True):
         """Enable or disable the Lisp feature.
 
         :param node: Honeycomb node.
-        :param state: Desired Lisp state, enable or disable.
+        :param state: Enable or disable Lisp.
         :type node: dict
-        :type state: str
+        :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")
+        if ret_code == HTTPCodes.OK:
+            data["lisp"]["enable"] = bool(state)
+        elif ret_code == HTTPCodes.NOT_FOUND:
+                data = {"lisp": {"enable": bool(state)}}
+        else:
+            raise HoneycombError("Unexpected return code when getting existing"
+                                 " Lisp configuration.")
+
+        return LispKeywords._set_lisp_properties(node, '', data)
+
+    @staticmethod
+    def set_rloc_probe_state(node, state=False):
+        """Enable or disable the Routing Locator probe.
+
+        :param node: Honeycomb node.
+        :param state: Enable or Disable the Rloc probe.
+        :type node: dict
+        :type state: bool
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/rloc-probe"
+
         data = {
-            "lisp": {
-                "enable": True if state.lower() == "enable" else False
+            "rloc-probe": {
+                "enabled": bool(state)
             }
         }
 
-        return LispKeywords._set_lisp_properties(node, '', data)
+        return LispKeywords._set_lisp_properties(node, path, data)
 
     @staticmethod
     def add_locator(node, interface, locator_set, priority=1, weight=1):
@@ -163,6 +227,27 @@ class LispKeywords(object):
         return LispKeywords._set_lisp_properties(node, path, data)
 
     @staticmethod
+    def configure_lisp_map_request_mode(node, option):
+        """Modify Lisp Map Request Mode configuration to the data provided.
+
+        :param node: Honeycomb node.
+        :param option: Settings for the Lisp map request mode.
+        :type node: dict
+        :type option: str
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        data = {
+            "map-request-mode": {
+                "mode": option
+            }
+        }
+
+        path = "/lisp-feature-data/map-request-mode"
+        return LispKeywords._set_lisp_properties(node, path, data)
+
+    @staticmethod
     def add_lisp_adjacency(node, vni_id, map_name, adjacency_name, data):
         """Add an adjacency to an existing Lisp mapping.
 
@@ -217,6 +302,51 @@ class LispKeywords(object):
         return LispKeywords._set_lisp_properties(node, path, data)
 
     @staticmethod
+    def set_map_register(node, map_register=False):
+        """Configure Map Register.
+
+        :param node: Honeycomb node.
+        :param map_register: Enable or disable Map Register.
+        :type node: dict
+        :type map_register: bool
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/map-register"
+
+        data = {
+            "map-register": {
+                "enabled": bool(map_register)
+            }
+        }
+
+        return LispKeywords._set_lisp_properties(node, path, data)
+
+    @staticmethod
+    def set_map_request_mode(node, src_dst=False):
+        """Configure Map Request Mode.
+
+        :param node: Honeycomb node.
+        :param src_dst: Configure Map Request Mode with source destination.
+        :type node: dict
+        :type src_dst: bool
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/map-request-mode"
+
+        data = {
+            "map-request-mode": {
+                "mode": "source-destination" if src_dst
+                else "target-destination"
+            }
+        }
+
+        return LispKeywords._set_lisp_properties(node, path, data)
+
+    @staticmethod
     def delete_map_resolver(node):
         """Delete an existing map resolver.
 
@@ -231,6 +361,44 @@ class LispKeywords(object):
         return LispKeywords._set_lisp_properties(node, path)
 
     @staticmethod
+    def add_map_server(node, *ip_addresses):
+        """Configure map server with the specified IP addresses.
+
+        :param node: Honeycomb node.
+        :param ip_addresses: IP addresses to configure map server with.
+        :type node: dict
+        :type ip_addresses: list
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/map-servers"
+
+        data = {
+            "map-servers": {
+                "map-server": [
+                    {"ip-address": ip_address} for ip_address in ip_addresses
+                ]
+            }
+        }
+
+        return LispKeywords._set_lisp_properties(node, path, data)
+
+    @staticmethod
+    def delete_map_server(node):
+        """Delete all map servers.
+
+        :param node: Honeycomb node
+        :type node: dict
+        :returns: Content of response
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/map-servers"
+
+        return LispKeywords._set_lisp_properties(node, path)
+
+    @staticmethod
     def configure_pitr(node, locator_set=None):
         """Configure PITR feature with the specified locator set. If not locator
         set is specified, disable PITR instead.
@@ -257,6 +425,32 @@ class LispKeywords(object):
         return LispKeywords._set_lisp_properties(node, path, data)
 
     @staticmethod
+    def configure_petr(node, ip_address):
+        """Configure PETR feature with the specified IP. If no IP
+        specified, disable PETR instead.
+
+        :param node: Honeycomb node.
+        :param ip_address: IPv6 address.
+        :type node: dict
+        :type ip_address: str
+        :returns: Content of response.
+        :rtype: bytearray
+        """
+
+        path = "/lisp-feature-data/petr-cfg"
+
+        if ip_address:
+            data = {
+                "petr-cfg": {
+                    "petr-address": ip_address
+                }
+            }
+        else:
+            data = None
+
+        return LispKeywords._set_lisp_properties(node, path, data)
+
+    @staticmethod
     def disable_lisp(node):
         """Remove all Lisp settings on the node.
 
diff --git a/resources/libraries/robot/honeycomb/lisp.robot b/resources/libraries/robot/honeycomb/lisp.robot
index e1d69ed316..0ee1314f71 100644
--- a/resources/libraries/robot/honeycomb/lisp.robot
+++ b/resources/libraries/robot/honeycomb/lisp.robot
@@ -24,10 +24,26 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
 | | ...
-| | Set Lisp state | ${node} | enable
+| | Set Lisp state | ${node} | ${TRUE}
+
+| Honeycomb disables Lisp
+| | [Documentation] | Uses Honeycomb API to disable Lisp.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb disables Lisp \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | Set Lisp state | ${node} | ${FALSE}
 
 | Honeycomb adds locator set
 | | [Documentation] | Uses Honeycomb API to enable Lisp.
@@ -38,12 +54,15 @@
 | | ... | - locator_set - Name for the new locator set. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb enables Lisp \| ${nodes['DUT1']} \| GigabitEthernet0/8/0\
 | | ... | \| loc_01 \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${locator_set}
+| | ...
 | | Add locator | ${node} | ${interface} | ${locator_set}
 
-| Honeycomb adds Lisp mapping
+| Honeycomb adds Lisp Mapping
 | | [Documentation] | Uses Honeycomb API to configure a Lisp mapping.
 | | ...
 | | ... | *Arguments:*
@@ -51,9 +70,12 @@
 | | ... | - 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.
@@ -62,8 +84,11 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb removes all Lisp mappings \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
+| | ...
 | | Configure lisp mapping | ${node} | ${NONE}
 
 | Lisp should not be configured
@@ -74,7 +99,9 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp should not be configured \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
 | | ...
 | | Run keyword and Expect Error | KeyError: 'lisp-feature-data'
@@ -89,10 +116,13 @@
 | | ... | - state - Expected Lisp state. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp state From Honeycomb Should Be \| ${nodes['DUT1']} \
 | | ... | \| enabled \|
+| | ...
 | | [Arguments] | ${node} | ${state}
 | | ${data}= | Get Lisp operational data | ${node}
+| | ...
 | | Run keyword if | $state == 'enabled'
 | | ... | Should be equal as strings
 | | ... | ${data['lisp-state']['enable']} | ${True}
@@ -109,8 +139,11 @@
 | | ... | - 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['feature_status']} | ${state}
 
@@ -123,9 +156,12 @@
 | | ... | - settings - Expected Lisp mapping data. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp mapping From Honeycomb Should Be \| ${nodes['DUT1']} \
 | | ... | \| ${settings} \|
+| | ...
 | | [Arguments] | ${node} | ${settings}
+| | ...
 | | ${data}= | Get Lisp operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['eid-table']['vni-table'][0]}
@@ -140,9 +176,12 @@
 | | ... | - settings - Expected Lisp mapping data. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp mapping From VAT Should Be \| ${nodes['DUT1']} \
 | | ... | \| ${settings} \|
+| | ...
 | | [Arguments] | ${node} | ${settings}
+| | ...
 | | ${data}= | VPP show Lisp eid table | ${node}
 | | Compare data structures | ${data[0]} | ${settings}
 
@@ -154,9 +193,12 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp mappings from Honeycomb should not exist \
 | | ... | \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
+| | ...
 | | ${data}= | Get Lisp operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | Should be empty | ${data['eid-table']['vni-table']}
@@ -169,8 +211,11 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Lisp mappings from VAT should not exist \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
+| | ...
 | | ${data}= | VPP show Lisp eid table | ${node}
 | | Should be empty | ${data}
 
@@ -185,9 +230,12 @@
 | | ... | - locator_set - Expected locator set name. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Locator set From Honeycomb Should Be \| ${nodes['DUT1']} \
 | | ... | \| GigabitEthernet0/8/0 \| loc01 \|
+| | ...
 | | [Arguments] | ${node} | ${interface} | ${locator_set}
+| | ...
 | | ${data}= | Get Lisp operational data | ${node}
 | | ${loc_data}= | Set Variable
 | | ... | ${data['lisp-state']['lisp-feature-data']['locator-sets']}
@@ -209,9 +257,12 @@
 | | ... | - data - Lisp adjacency settings to use. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb adds Lisp adjacency \| ${nodes['DUT1']} \| ${1} \| map1\
 | | ... | \| adj1 \| ${data} \|
+| | ...
 | | [Arguments] | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
+| | ...
 | | Add Lisp adjacency
 | | ... | ${node} | ${vni} | ${map} | ${adjacency} | ${data}
 
@@ -223,11 +274,46 @@
 | | ... | - ip_address - IP address for the map resolver. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb adds Lisp Map resolver \| ${nodes['DUT1']} \
 | | ... | \| 192.168.0.2 \|
+| | ...
 | | [Arguments] | ${node} | ${ip_address}
+| | ...
 | | Add map resolver | ${node} | ${ip_address}
 
+| Honeycomb adds Lisp Map register
+| | [Documentation] | Uses Honeycomb API to configure Lisp map register.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - add_map_register - Set boolean value of map register. Type: bool
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| 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.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - set_map_request - Set boolean value of map request mode. Type: bool
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb adds Lisp Map Request Mode \| ${nodes['DUT1']} \
+| | ... | \| ${True} \|
+| | ...
+| | [Arguments] | ${node} | ${set_map_request}
+| | ...
+| | Set Map Request Mode | ${node} | ${set_map_request}
+
 | Map resolver from Honeycomb should be
 | | [Documentation] | Retrieves Lisp map resolver from Honeycomb operational\
 | | ... | data, and compares with expected data.
@@ -238,9 +324,12 @@
 | | ... | Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Map resolver From Honeycomb Should Be \| ${nodes['DUT1']} \
 | | ... | \| 192.168.1.2 \|
+| | ...
 | | [Arguments] | ${node} | ${ip_address}
+| | ...
 | | ${data}= | Get Lisp operational data | ${node}
 | | ${data}= | Set Variable | ${data['lisp-state']['lisp-feature-data']}
 | | ${data}= | Set Variable | ${data['map-resolvers']['map-resolver'][0]}
@@ -256,12 +345,128 @@
 | | ... | Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Map resolver From VAT Should Be \| ${nodes['DUT1']} \
 | | ... | \| 192.168.1.2 \|
+| | ...
 | | [Arguments] | ${node} | ${ip_address}
+| | ...
 | | ${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.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - ip_addresses - IP addresses for the Map Server.\
+| | ... | Type: any number of strings
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb adds Lisp Map Server \| ${nodes['DUT1']} \
+| | ... | \| 192.168.0.2 \| 192.168.0.3 \|
+| | ...
+| | [Arguments] | ${node} | @{ip_addresses}
+| | ...
+| | Add Map Server | ${node} | @{ip_addresses}
+
+| Map Register from Honeycomb should be
+| | [Documentation] | Retrieves Lisp Map Register from Honeycomb operational\
+| | ... | data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - Desired state - True. Type: bool
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Map Register From Honeycomb Should Be \| ${nodes['DUT1']} \
+| | ... | \| ${True} \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${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\
+| | ... | data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - ip_addresses - IP addresses that should be referenced\
+| | ... | in Map Server. Type: any number of strings
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Map Server From Honeycomb Should Be \| ${nodes['DUT1']} \
+| | ... | \| 192.168.1.2 \| 192.168.1.7 \|
+| | ...
+| | [Arguments] | ${node} | @{ip_addresses}
+| | ...
+| | ${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,\
+| | ... | and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - ip_addresses - IP addresses that should be referenced\
+| | ... | in Map Server. Type: any number of strings
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Map Server From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| 192.168.1.2 \| 192.168.1.7 \|
+| | ...
+| | [Arguments] | ${node} | @{ip_addresses}
+| | ...
+| | ${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,\
+| | ... | and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - Desired state - "enabled". Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Map Register From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| enabled \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${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,\
+| | ... | and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - destination - Source or Destination in Map\
+| | ... | Request Mode. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Map Request Mode From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| src-dst \|
+| | ...
+| | [Arguments] | ${node} | ${destination}
+| | ...
+| | ${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.
 | | ...
@@ -270,10 +475,44 @@
 | | ... | - locator_set - Name of an existing locator set. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb enables Lisp PITR feature \| ${nodes['DUT1']} \| loc1 \|
+| | ...
 | | [Arguments] | ${node} | ${locator_set}
+| | ...
 | | Configure PITR | ${node} | ${locator_set}
 
+| Honeycomb enables Lisp PETR feature
+| | [Documentation] | Uses Honeycomb API to configure Lisp PETR feature.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - ip_address - IP address. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb enables Lisp PETR feature \| ${nodes['DUT1']}\
+| | ... | \| 192.168.0.1 \|
+| | ...
+| | [Arguments] | ${node} | ${ip_address}
+| | ...
+| | Configure PETR | ${node} | ${ip_address}
+
+| Honeycomb enables Lisp RLOC feature
+| | [Documentation] | Uses Honeycomb API to enable the Lisp RLOC feature.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Honeycomb enables Lisp RLOC feature\
+| | ... | \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${node}
+| | ...
+| | Set RLOC probe state | ${node} | ${TRUE}
+
 | PITR config from Honeycomb should be
 | | [Documentation] | Retrieves PITR config from Honeycomb operational\
 | | ... | data, and compares with expected data.
@@ -284,14 +523,115 @@
 | | ... | in PITR config. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| PITR config from Honeycomb should be \| ${nodes['DUT1']} \
 | | ... | \| loc01 \|
+| | ...
 | | [Arguments] | ${node} | ${locator_set}
+| | ...
 | | ${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}
 
+| PETR configuration from Honeycomb should be
+| | [Documentation] | Retrieves PETR config from Honeycomb operational\
+| | ... | data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - ip_address - IP address for PETR config. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| PETR config from Honeycomb should be \| ${nodes['DUT1']} \
+| | ... | \| 192.168.0.1 \|
+| | ...
+| | [Arguments] | ${node} | ${ip_address}
+| | ...
+| | ${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}
+
+| Map Request Mode from Honeycomb should be
+| | [Documentation] | Retrieves List Map Request Mode from Honeycomb\
+| | ... | operational data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - destination - source-destination. Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| List Map Request Mode from Honeycomb should be \| ${nodes['DUT1']}\
+| | ... | \| 192.168.0.1 \|
+| | ...
+| | [Arguments] | ${node} | ${destination}
+| | ...
+| | ${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}
+
+| RLOC probing from Honeycomb should be
+| | [Documentation] | Retrieves RLOC config from Honeycomb operational\
+| | ... | data, and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - desired state -True/False. Type: bool
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| RLOC probing from Honeycomb should be \| ${nodes['DUT1']} \
+| | ... | \| ${True} \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${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,\
+| | ... | and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - state of PETR config - enabled/disabled.\
+| | ... | Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| PETR configuration From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| enabled \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${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,\
+| | ... | and compares with expected data.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - state - state of RLOC config - enabled/disabled.\
+| | ... | Type: string
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| RLOC configuration From VAT Should Be \| ${nodes['DUT1']} \
+| | ... | \| enabled \|
+| | ...
+| | [Arguments] | ${node} | ${state}
+| | ...
+| | ${data}= | Vpp show Lisp RLOC config | ${node}
+| | Should be equal | ${data['state']} | ${state}
+
 | PITR config from VAT should be
 | | [Documentation] | Retrieves PITR config from VAT,\
 | | ... | and compares with expected data.
@@ -302,9 +642,12 @@
 | | ... | in PITR config. Type: string
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| PITR config from VAT should be \| ${nodes['DUT1']} \
 | | ... | \| loc01 \|
+| | ...
 | | [Arguments] | ${node} | ${locator_set}
+| | ...
 | | ${data}= | VPP show Lisp PITR | ${node}
 | | Should be equal | ${data['status']} | enabled
 | | Should be equal | ${data['locator_set']} | ${locator_set}
@@ -316,6 +659,9 @@
 | | ... | - node - Information about a DUT node. Type: dictionary
 | | ...
 | | ... | *Example:*
+| | ...
 | | ... | \| Honeycomb disables all Lisp features \| ${nodes['DUT1']} \|
+| | ...
 | | [Arguments] | ${node}
+| | ...
 | | Disable Lisp | ${node}
\ No newline at end of file
diff --git a/resources/templates/vat/lisp/show_lisp_map_register.vat b/resources/templates/vat/lisp/show_lisp_map_register.vat
new file mode 100644
index 0000000000..ea6847862e
--- /dev/null
+++ b/resources/templates/vat/lisp/show_lisp_map_register.vat
@@ -0,0 +1 @@
+show_lisp_map_register_state
\ No newline at end of file
diff --git a/resources/templates/vat/lisp/show_lisp_map_request_mode.vat b/resources/templates/vat/lisp/show_lisp_map_request_mode.vat
new file mode 100644
index 0000000000..2c8a44ee5c
--- /dev/null
+++ b/resources/templates/vat/lisp/show_lisp_map_request_mode.vat
@@ -0,0 +1 @@
+show_lisp_map_request_mode
\ No newline at end of file
diff --git a/resources/templates/vat/lisp/show_lisp_map_server.vat b/resources/templates/vat/lisp/show_lisp_map_server.vat
new file mode 100644
index 0000000000..3f7dd08a85
--- /dev/null
+++ b/resources/templates/vat/lisp/show_lisp_map_server.vat
@@ -0,0 +1 @@
+lisp_map_server_dump
\ No newline at end of file
diff --git a/resources/templates/vat/lisp/show_lisp_petr_config.vat b/resources/templates/vat/lisp/show_lisp_petr_config.vat
new file mode 100644
index 0000000000..e12be15f84
--- /dev/null
+++ b/resources/templates/vat/lisp/show_lisp_petr_config.vat
@@ -0,0 +1 @@
+show_lisp_use_petr
\ No newline at end of file
diff --git a/resources/templates/vat/lisp/show_lisp_rloc_config.vat b/resources/templates/vat/lisp/show_lisp_rloc_config.vat
new file mode 100644
index 0000000000..78c58ea92e
--- /dev/null
+++ b/resources/templates/vat/lisp/show_lisp_rloc_config.vat
@@ -0,0 +1 @@
+show_lisp_rloc_probe_state
\ No newline at end of file
diff --git a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
index aeb4782d5c..087720b0c6 100644
--- a/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
+++ b/tests/func/honeycomb/mgmt-cfg-lisp-apihc-apivat-func.robot
@@ -12,6 +12,9 @@
 # limitations under the License.
 
 *** Variables***
+| ${ip_address}= | 192.168.0.4
+| @{ip_addresses}= | 192.168.0.4 | 192.168.0.5 | 192.168.0.6 | 192.168.0.7
+| ${state}= | enabled
 | ${interface}= | ${node['interfaces']['port1']['name']}
 | ${bd_name}= | bd_lisp
 | ${bd2_name}= | bd2_lisp
@@ -34,12 +37,12 @@
 | | [Documentation] | Check if Honeycomb can enable the Lisp feature.
 | | Given Lisp Should Not Be Configured | ${node}
 | | When Honeycomb Enables Lisp | ${node}
-| | Then Lisp state From Honeycomb Should Be | ${node} | enabled
-| | And Lisp state From VAT Should Be | ${node} | enabled
+| | Then Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
 
 | TC02: Honeycomb adds locator set and locator
 | | [Documentation] | Check if Honeycomb can configure a locator set.
-| | Given Lisp state From Honeycomb Should Be | ${node} | enabled
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
 | | When Honeycomb adds locator set | ${node} | ${interface} | ${locator_set}
 | | Then Locator Set From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${locator_set}
@@ -47,7 +50,7 @@
 | TC03: Honeycomb configures Lisp - remote mapping - Bridge Domain
 | | [Documentation] | Check if Honeycomb can configure a remote Lisp mapping\
 | | ... | with a bridge domain.
-| | Given Lisp state From Honeycomb Should Be | ${node} | enabled
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
 | | And Honeycomb creates first l2 bridge domain
 | | ... | ${node} | ${bd_name} | ${bd_settings}
 | | When Honeycomb adds Lisp mapping | ${node} | ${lisp_settings_remote_bd}
@@ -129,15 +132,48 @@
 | | Then Lisp mapping from Honeycomb should be
 | | ... | ${node} | ${adj_subtable}
 
-| TC09: Honeycomb configures Lisp map resolver
-| | [Documentation] | Check if Honeycomb can configure a Lisp map resolver.
-| | Given Lisp state From Honeycomb Should Be | ${node} | enabled
-| | And Lisp state From VAT Should Be | ${node} | enabled
-| | When Honeycomb adds Lisp Map resolver | ${node} | 192.168.0.4
-| | Then Map resolver from Honeycomb should be | ${node} | 192.168.0.4
-| | And Map resolver from VAT should be | ${node} | 192.168.0.4
+| TC09: Honeycomb configures Lisp Map Resolver
+| | [Documentation] | Check if Honeycomb can configure a Lisp Map Resolver.
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
+| | When Honeycomb adds Lisp Map Resolver | ${node} | ${ip_address}
+| | Then Map Resolver from Honeycomb should be | ${node} | ${ip_address}
+| | And Map Resolver from VAT should be | ${node} | ${ip_address}
 
-| TC10: Honeycomb enabled Lisp PITR feature
+| TC10: Honeycomb configures Lisp Map Server
+| | [Documentation] | Check if Honeycomb can configure a Lisp Map Server.
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
+| | When Honeycomb adds Lisp Map Server | ${node} | @{ip_addresses}
+| | Then Map Server from Honeycomb should be | ${node} | @{ip_addresses}
+| | And Map Server from VAT should be | ${node} | @{ip_addresses}
+
+| TC11: Honeycomb configures Lisp PETR configuration
+| | [Documentation] | Check if Honeycomb can configure Lisp
+| | ... | PETR configuration.
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
+| | When Honeycomb enables Lisp PETR feature | ${node} | ${ip_address}
+| | Then PETR configuration from Honeycomb should be | ${node} | ${ip_address}
+| | And PETR configuration from VAT should be | ${node} | enabled
+
+| TC12: Honeycomb configures Lisp RLOC Probing
+| | [Documentation] | Check if Honeycomb can configure Lisp RLOC Probing.
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
+| | When Honeycomb enables Lisp RLOC feature | ${node}
+| | Then RLOC Probing from Honeycomb should be | ${node} | ${True}
+| | And RLOC Probing from VAT should be | ${node} | enabled
+
+| TC13: Honeycomb configures Lisp Map Register
+| | [Documentation] | Check if Honeycomb can configure a Lisp Map Register.
+| | Given Lisp state From Honeycomb Should Be | ${node} | ${state}
+| | And Lisp state From VAT Should Be | ${node} | ${state}
+| | When Honeycomb adds Lisp Map Register | ${node} | ${True}
+| | Then Map Register from Honeycomb should be | ${node} | ${True}
+| | And Map Register from VAT should be | ${node} | enabled
+
+| TC14: Honeycomb enabled Lisp PITR feature
 | | [Documentation] | Check if Honeycomb can configure the Lisp PITR feature.
 | | Given Locator Set From Honeycomb Should Be
 | | ... | ${node} | ${interface} | ${locator_set}
@@ -145,9 +181,19 @@
 | | Then PITR config from Honeycomb should be | ${node} | ${locator_set}
 | | And PITR config from VAT should be | ${node} | ${locator_set}
 
-| TC11: Honeycomb can remove configuration of Lisp features
+| TC15: Honeycomb can remove configuration of Lisp features
 | | [Documentation] | Check if Honeycomb can disable all Lisp features.
-| | Given Map resolver from Honeycomb should be | ${node} | 192.168.0.4
+| | Given Map resolver from Honeycomb should be | ${node} | ${ip_address}
 | | And PITR config from Honeycomb should be | ${node} | ${locator_set}
 | | When Honeycomb disables all Lisp features | ${node}
 | | Then Lisp Should Not Be Configured | ${node}
+
+| TC16: Honeycomb configures Lisp Map Request Mode
+| | [Documentation] | Check if Honeycomb can configure Lisp Map Request mode.
+| | ... | Note: Map Request Mode cannot be removed once configured.
+| | [Teardown] | Honeycomb disables Lisp | ${node}
+| | Given Honeycomb Enables Lisp | ${node}
+| | When Honeycomb sets Lisp Map Request Mode | ${node} | ${True}
+| | Then Map Request Mode from Honeycomb should be
+| | ... | ${node} | source-destination
+| | And Map Request Mode from VAT should be | ${node} | src-dst