CSIT-1337: Migrate L2Util library from VAT to PAPI

Change-Id: I22879c7bdd100d00216b9528663bf17406169826
Signed-off-by: Jan Gelety <jgelety@cisco.com>

2 files changed, 58 insertions, 5 deletions

diff --git a/resources/libraries/robot/honeycomb/l2_fib.robot b/resources/libraries/robot/honeycomb/l2_fib.robot
index f90cbffb20..6889fb2af4 100644
--- a/resources/libraries/robot/honeycomb/l2_fib.robot
+++ b/resources/libraries/robot/honeycomb/l2_fib.robot
@@ -12,9 +12,9 @@
 # limitations under the License.
 
 *** Settings ***
-| Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.honeycomb.HcAPIKwBridgeDomain.BridgeDomainKeywords
 | Library | resources.libraries.python.honeycomb.HcAPIKwInterfaces.InterfaceKeywords
+| Resource | resources/libraries/robot/honeycomb/papi.robot
 
 *** Keywords ***
 | Honeycomb adds L2 FIB entry to bridge domain
@@ -151,7 +151,7 @@
 
 | L2 FIB entry from VAT should be
 | | [Documentation] | Retrieves the operational data about the specified L2 \
-| | ... | FIB entry using VAT and checks if it is as expected.
+| | ... | FIB entry using Python API and checks if it is as expected.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -164,13 +164,13 @@
 | | ...
 | | [Arguments] | ${node} | ${bd_index} | ${l2_fib_ref_data}
 | | ...
-| | ${l2_fib_data}= | Get L2 FIB entry VAT | ${node} | ${bd_index}
+| | ${l2_fib_data}= | Get L2 FIB entry PAPI | ${node} | ${bd_index}
 | | ... | ${l2_fib_ref_data['mac']}
 | | Compare Data Structures | ${l2_fib_data} | ${l2_fib_ref_data}
 
 | L2 FIB Table from VAT should be empty
 | | [Documentation] | Check if the L2 FIB table in the specified bridge domain \
-| | ... | is empty. VAT is used to get operational data.
+| | ... | is empty. Python API is used to get operational data.
 | | ...
 | | ... | *Arguments:*
 | | ... | - node - Information about a DUT node. Type: dictionary
@@ -182,5 +182,5 @@
 | | ...
 | | [Arguments] | ${node} | ${bd_index}
 | | ...
-| | ${l2_fib_data}= | Get L2 FIB table VAT | ${node} | ${bd_index}
+| | ${l2_fib_data}= | Get L2 FIB table PAPI | ${node} | ${bd_index}
 | | Should be empty | ${l2_fib_data}
diff --git a/resources/libraries/robot/honeycomb/papi.robot b/resources/libraries/robot/honeycomb/papi.robot
new file mode 100644
index 0000000000..33797f1aea
--- /dev/null
+++ b/resources/libraries/robot/honeycomb/papi.robot
@@ -0,0 +1,53 @@
+# Copyright (c) 2019 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.L2Util
+
+*** Keywords ***
+| Get L2 FIB entry PAPI
+| | [Documentation] | Retrieve the operational data about the specified L2 \
+| | ... | FIB entry using Python API.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - bd_index - Index of the bridge domain. Type: integer
+| | ... | - mac - MAC address. Type: string
+| | ...
+| | ... | *Example:*
+| | ... | \| Get L2 FIB entry PAPI \
+| | ... | \| ${nodes['DUT1']} \| test_bd \| 00:fe:c8:e5:46:d1 \|
+| | ...
+| | [Arguments] | ${node} | ${bd_index} | ${mac}
+| | ...
+| | [Return] | ${l2_fib_data}
+| | ...
+| | ${l2_fib_data}= | Get L2 FIB entry by MAC | ${node} | ${bd_index}
+| | ... | ${mac}
+
+| Get L2 FIB table PAPI
+| | [Documentation] | Retrieve L2 FIB table data of the specified bridge \
+| | ... | domain using Python API.
+| | ...
+| | ... | *Arguments:*
+| | ... | - node - Information about a DUT node. Type: dictionary
+| | ... | - bd_index - Index of the bridge domain. Type: integer
+| | ...
+| | ... | *Example:*
+| | ... | \| Get L2 FIB table PAPI \| ${nodes['DUT1']} \| test_bd \|
+| | ...
+| | [Arguments] | ${node} | ${bd_index}
+| | ...
+| | [Return] | ${l2_fib_data}
+| | ...
+| | ${l2_fib_data}= | Get L2 FIB table | ${node} | ${bd_index}