Lisp enable/disable test

Test lisp enable/disable API.
Test disable lisp, re-enable it and check if everthing is still working.
Enable lisp before every lisp API test
Reformat source data

Change-Id: I7bace01535562814d85d7b5f6035436d583abf53
Signed-off-by: Andrej Kozemcak <akozemca@cisco.com>

2 files changed, 150 insertions, 117 deletions

diff --git a/resources/libraries/robot/lisp/lisp_api.robot b/resources/libraries/robot/lisp/lisp_api.robot
index 43471a9d86..54ba6b7703 100644
--- a/resources/libraries/robot/lisp/lisp_api.robot
+++ b/resources/libraries/robot/lisp/lisp_api.robot
@@ -14,6 +14,7 @@
 *** Settings ***
 | Resource | resources/libraries/robot/interfaces.robot
 | Library  | resources.libraries.python.NodePath
+| Library  | resources.libraries.python.LispSetup.LispStatus
 | Library  | resources.libraries.python.LispSetup.LispSetup
 | Library  | resources.libraries.python.LispUtil
 
@@ -24,15 +25,15 @@
 | | ...             | the lisp locator_set and locator API.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${locator_set_number} - Number how many locator_set data
-| | ... |                           will be generated. Type: integer
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - locator_set_number - Number how many locator_set data
+| | ... |                        will be generated. Type: integer
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - ${locator_set_values} - New generated locator_set data.
+| | ... | - locator_set_values - New generated locator_set data.
 | | ...
 | | ... | *Example:*
 | | ... | \| Given Lisp locator_set data is prepared \| ${nodes['DUT1']} \
@@ -47,15 +48,15 @@
 | | [Documentation] | Set the lisp locator_set and locator on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${locator_set_values} - Generated locator_set data from
-| | ... |                           KW locator_set data is prepared,
-| | ... |                           which will be set on the VPP node.
+| | ... | - locator_set_values - Generated locator_set data from
+| | ... |                        KW locator_set data is prepared,
+| | ... |                        which will be set on the VPP node.
 | | ...
 | | ... | *Example:*
 | | ... | \| When Lisp locator_set data is set \| ${nodes['DUT1']} \|
@@ -63,22 +64,22 @@
 | | [Arguments] | ${dut_node}
 | | Vpp Set Lisp Locator Set | ${dut_node} | ${locator_set_values}
 
-| Lisp locator_set is set correct
-| | [Documentation] | Test if the locator_set is set correct on the VPP node.
+| Lisp locator_set is set correctly
+| | [Documentation] | Test if the locator_set is set correctly on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${locator_set_values} - Generated locator_set data from
-| | ... |                           KW locator_set data is prepared,
-| | ... |                           which were set to VPP node.
+| | ... | - locator_set_values - Generated locator_set data from
+| | ... |                        KW locator_set data is prepared,
+| | ... |                        which were set to VPP node.
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp locator_set is set correct \| ${nodes['DUT1']} \|
+| | ... | \| Then Lisp locator_set is set correctly \| ${nodes['DUT1']} \|
 | | ...
 | | [Arguments] | ${dut_node}
 | | ${show_locator_set}= | Vpp Show Lisp Locator Set | ${dut_node}
@@ -89,15 +90,15 @@
 | | [Documentation] | Delete all lisp locator_set on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${locator_set_values} - Generated locator_set data from
-| | ... |                           KW locator_set data is prepared,
-| | ... |                           which was set on the VPP node.
+| | ... | - locator_set_values - Generated locator_set data from
+| | ... |                        KW locator_set data is prepared,
+| | ... |                        which was set on the VPP node.
 | | ...
 | | ... | *Example:*
 | | ... | \| When Delete all lisp locator_set from VPP \
@@ -110,7 +111,7 @@
 | | [Documentation] | Test if all locator_set are unset from VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -127,15 +128,15 @@
 | | ...             | This data will be use for test reset locator_set.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${locator_set_number} - Number how many locator_set data
-| | ...                          | it will generate. Type: int
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - locator_set_number - Number how many locator_set data
+| | ... |                        it will generate. Type: int
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - ${locator_set_values} - New generate locator_set data.
+| | ... | - locator_set_values - New generate locator_set data.
 | | ...
 | | ... | *Example:*
 | | ... | \| Given Lisp locator_set data use for test reset locator_set \
@@ -150,15 +151,15 @@
 | | [Documentation] | Generate lisp eid address for testing lisp eid API.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${eid_ipv4_num} - Number of generate ipv4 address. Type: int
-| | ... | - ${eid_ipv6_num} - Number of generate ipv6 address. Type: int
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - eid_ipv4_num - Number of generate ipv4 address. Type: int
+| | ... | - eid_ipv6_num - Number of generate ipv6 address. Type: int
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - ${set_eid} - New generate eid data.
+| | ... | - set_eid - New generate eid data.
 | | ...
 | | ... | *Example:*
 | | ... | \| Given Lisp eid address is prepared \| ${nodes['DUT1']} \
@@ -173,37 +174,37 @@
 | | [Documentation] | Set the lisp eid address on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - set_eid - Test eid data. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_eid} - Generated eid data which will be set to VPP.
-| | ...
 | | ... | *Example:*
-| | ... | \| When Lisp eid address is set \| ${nodes['DUT1']} \|
+| | ... | \| When Lisp eid address is set \| ${nodes['DUT1']} \| ${eid_table} |\
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_eid}
 | | Vpp Set Lisp Eid Table | ${dut_node} | ${set_eid}
 
-| Lisp eid address is set correct to eid table
-| | [Documentation] | Test if the locator_set is set correct on the VPP node.
+| Lisp eid address is set correctly to eid table
+| | [Documentation] | Test if the locator_set is set correctly on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - set_eid - Example eid data, which was set to the VPP node.
+| | ... |                Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
 | | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_eid} - Generated eid data which will be set to the VPP node.
+| | ... | - set_eid - Generated eid data, which will be set to the VPP node.
 | | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp eid address is set correct to eid table \
-| | ... | \| ${nodes['DUT1']} \|
+| | ... | \| Then Lisp eid address is set correctly to eid table \
+| | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_eid}
 | | ${show_eid}= | Vpp Show Lisp Local Eid Table | ${dut_node}
 | | Lisp Should Be Equal | ${set_eid} | ${show_eid}
 
@@ -211,26 +212,25 @@
 | | [Documentation] | Delete all lisp eid address from the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - set_eid - Eid data which will be removed from the VPP node.
+| | ... |             Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_eid} - Generated eid data which was set to the VPP node.
-| | ...
 | | ... | *Example:*
 | | ... | \| When Delete all lisp eid address from VPP \
-| | ... | \| ${nodes['DUT1']} \|
+| | ... | \| ${nodes['DUT1']} \| ${eid_table} \|
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_eid}
 | | Vpp Unset Lisp Eid Table | ${dut_node} | ${set_eid}
 
 | Lisp eid table should be empty
 | | [Documentation] | Test if the eid table is empty.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -242,71 +242,41 @@
 | | ${show_eid}= | Vpp Show Lisp Local Eid Table | ${dut_node}
 | | Lisp Is Empty | ${show_eid}
 
-| Lisp map resolver address is prepared
-| | [Documentation] | Generate map resolver address for testing
-| | ...             | lisp map resolver API.
-| | ...
-| | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
-| | ... | - ${map_resolver_ipv4_num} - Number of generate ipv4 address.
-| | ... |                              Type: int
-| | ... | - ${map_resolver_ipv6_num} - Number of generate ipv6 address.
-| | ... |                              Type: int
-| | ...
-| | ... | *Return:*
-| | ... | - No value returned
-| | ...
-| | ... | _NOTE:_ This KW sets following test case variables:
-| | ... | - ${set_map_resolver} - Generate map resolver data.
-| | ...
-| | ... | *Example:*
-| | ... | \| Given Lisp map resolver address is prepared \
-| | ... | \| ${nodes['DUT1']} \| ${map_resolver_ipv4_num} \
-| | ... | \| ${map_resolver_ipv6_num} \|
-| | ...
-| | [Arguments] | ${dut_node} | ${map_resolver_ipv4_num} | ${map_resolver_ipv6_num}
-| | ${set_map_resolver} = | Generate Lisp Map Resolver Data
-| | ... | ${map_resolver_ipv4_num} | ${map_resolver_ipv6_num}
-| | Set Test Variable | ${set_map_resolver}
-
 | Lisp map resolver address is set
 | | [Documentation] | Set the lisp map resolver address in the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - set_map_resolver - Map resolver data, which will be set on
+| | ... |                      the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_map_resolver} - Map resolver data which will be set
-| | ... |                         to the VPP node.
-| | ...
 | | ... | *Example:*
-| | ... | \| When Lisp map resolver address is set \| ${nodes['DUT1']} \|
+| | ... | \| When Lisp map resolver address is set \| ${nodes['DUT1']} \
+| | ... | \| ${map_resolver} \|
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | Vpp Set Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
 
-| Lisp map resolver address is set correct
-| | [Documentation] | Test if the map resolver address is set correct
+| Lisp map resolver address is set correctly
+| | [Documentation] | Test if the map resolver address is set correctly
 | | ...             | on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - set_map_resolver - Map resolver data, which was set on
+| | ... |                      the VPP node. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_map_resolver} - Map resolver data which was set
-| | ... |                         to the VPP node.
-| | ...
 | | ... | *Example:*
-| | ... | \| Then Lisp map resolver address is set correct \
-| | ... | \| ${nodes['DUT1']} \|
+| | ... | \| Then Lisp map resolver address is set correctly \
+| | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
 | | Lisp Should Be Equal | ${set_map_resolver} | ${show_map_resolver}
 
@@ -314,27 +284,25 @@
 | | [Documentation] | Delete all lisp map resolver address on the VPP node.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - map_resolver - Map resolver data, which will be remove from
+| | ... |                  the VPP. Type: list
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
 | | ...
-| | ... | _NOTE:_ This KW requires following test case variables:
-| | ... | - ${set_map_resolver} - Map resolver data which was set
-| | ... |                         to the VPP node.
-| | ...
 | | ... | *Example:*
 | | ... | \| When Delete all lisp map resolver address from VPP \
-| | ... | \| ${nodes['DUT1']} \|
+| | ... | \| ${nodes['DUT1']} \| ${map_resolver} \|
 | | ...
-| | [Arguments] | ${dut_node}
+| | [Arguments] | ${dut_node} | ${set_map_resolver}
 | | Vpp Unset Lisp Map Resolver | ${dut_node} | ${set_map_resolver}
 
 | Lip map resolver address should be empty
 | | [Documentation] | Test if the map resolver are empty.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut_node} - DUT node. Type: dictionary
+| | ... | - dut_node - DUT node. Type: dictionary
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -346,3 +314,71 @@
 | | [Arguments] | ${dut_node}
 | | ${show_map_resolver}= | Vpp Show Lisp Map Resolver | ${dut_node}
 | | Lisp Is Empty | ${show_map_resolver}
+
+| Enable lisp
+| | [Documentation] | Enable lisp on VPP node.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Enable lisp \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${dut_node}
+| | Vpp Lisp Enable Disable | ${dut_node} | enable
+
+| Check if lisp is enabled
+| | [Documentation] | Check if the lisp is enabled.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - lisp_status_data - Lisp status data, which was set on
+| | ... |                      the VPP node. Type: list
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Check if lisp is enabled \| ${nodes['DUT1']} \
+| | ... | \| ${lisp_status_data} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${lisp_status_data}
+| | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node}
+| | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[1]}
+
+| Disable lisp
+| | [Documentation] | Disable lisp on VPP node.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Disable lisp \| ${nodes['DUT1']} \|
+| | ...
+| | [Arguments] | ${dut_node}
+| | Vpp Lisp Enable Disable | ${dut_node} | disable
+
+| Check if lisp is disabled
+| | [Documentation] | Check if lisp is disabled.
+| | ...
+| | ... | *Arguments:*
+| | ... | - dut_node - DUT node. Type: dictionary
+| | ... | - lisp_status_data - Lisp status data, which was set on
+| | ... |                      the VPP node. Type: list
+| | ...
+| | ... | *Return:*
+| | ... | - No value returned
+| | ...
+| | ... | *Example:*
+| | ... | \| Check if lisp is disabled \| ${nodes['DUT1']} \
+| | ... | \| ${lisp_status_data} \|
+| | ...
+| | [Arguments] | ${dut_node} | ${lisp_status_data}
+| | ${show_lisp_stat}= | Vpp Show Lisp State | ${dut_node}
+| | Lisp Should Be Equal | ${show_lisp_stat} | ${lisp_status_data[0]}
diff --git a/resources/libraries/robot/lisp/lisp_static_mapping.robot b/resources/libraries/robot/lisp/lisp_static_mapping.robot
index 8d6bf311d0..b6c0e791b4 100644
--- a/resources/libraries/robot/lisp/lisp_static_mapping.robot
+++ b/resources/libraries/robot/lisp/lisp_static_mapping.robot
@@ -13,31 +13,28 @@
 
 *** Settings ***
 | Documentation | Lisp State mapping suite keywords
-| Resource | resources/libraries/robot/interfaces.robot
-| Library  | resources.libraries.python.NodePath
+| Resource | resources/libraries/robot/lisp/lisp_api.robot
 | Library  | resources.libraries.python.LispSetup.LispLocatorSet
 | Library  | resources.libraries.python.LispSetup.LispLocator
 | Library  | resources.libraries.python.LispSetup.LispLocalEid
 | Library  | resources.libraries.python.LispSetup.LispRemoteMapping
-| Library  | resources.libraries.python.LispSetup.LispSetup
-| Library  | resources.libraries.python.LispUtil
 
 *** Keywords ***
 | Set up Lisp topology
 | | [Documentation] | Set up Lisp static remote mapping topology.
 | | ...
 | | ... | *Arguments:*
-| | ... | - ${dut1_node} - DUT1 node. Type: dictionary
-| | ... | - ${dut1_int_name} - DUT1 node interface name. Type: string
-| | ... | - ${dut1_int_index} - DUT1 node interface index. Type: integer
-| | ... | - ${dut2_node} - DUT2 node. Type: dictionary
-| | ... | - ${dut2_int_name} - DUT2 node interface name. Type: string
-| | ... | - ${dut2_int_index} - DUT2 node interface index. Type: integer
-| | ... | - ${locator_set} - Locator set values. Type: dict
-| | ... | - ${dut1_eid} - Dut1 node eid address. Type: dict
-| | ... | - ${dut2_eid} - Dut2 node eid address. Type: dict
-| | ... | - ${dut1_static_mapping} - Dut1 static mapping address. Type: dict
-| | ... | - ${dut2_static_mapping} - Dut2 static mapping address. Type: dict
+| | ... | - dut1_node - DUT1 node. Type: dictionary
+| | ... | - dut1_int_name - DUT1 node interface name. Type: string
+| | ... | - dut1_int_index - DUT1 node interface index. Type: integer
+| | ... | - dut2_node - DUT2 node. Type: dictionary
+| | ... | - dut2_int_name - DUT2 node interface name. Type: string
+| | ... | - dut2_int_index - DUT2 node interface index. Type: integer
+| | ... | - locator_set - Locator set values. Type: dict
+| | ... | - dut1_eid - Dut1 node eid address. Type: dict
+| | ... | - dut2_eid - Dut2 node eid address. Type: dict
+| | ... | - dut1_static_mapping - Dut1 static mapping address. Type: dict
+| | ... | - dut2_static_mapping - Dut2 static mapping address. Type: dict
 | | ...
 | | ... | *Return:*
 | | ... | - No value returned
@@ -60,7 +57,7 @@
 | |                    | ... | Get Interface Sw Index | ${dut2_node}
 | |                    | ...                          | ${dut2_int_name}
 | |                    | ... | ELSE | Set Variable | ${dut2_int_index}
-| | Vpp lisp state | ${dut1_node} | enable
+| | Enable Lisp | ${dut1_node}
 | | Vpp Add Lisp Locator Set | ${dut1_node} | ${locator_set['locator_name']}
 | | Vpp Add Lisp Locator | ${dut1_node} | ${locator_set['locator_name']}
 | | ...                  | ${dut1_int_index} | ${locator_set['priority']}
@@ -73,7 +70,7 @@
 | | ...                         | ${dut1_static_mapping['seid']}
 | | ...                         | ${dut1_static_mapping['prefix']}
 | | ...                         | ${dut1_static_mapping['rloc']}
-| | Vpp Lisp State | ${dut2_node} | enable
+| | Enable Lisp | ${dut2_node}
 | | Vpp Add Lisp Locator Set | ${dut2_node} | ${locator_set['locator_name']}
 | | Vpp Add Lisp Locator | ${dut2_node} | ${locator_set['locator_name']}
 | | ...                  | ${dut2_int_index} | ${locator_set['priority']}