From: Peter Mikus <pmikus@cisco.com>
Date: Thu, 8 Aug 2019 11:31:26 +0000 (+0000)
Subject: Clean: L2_patch
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=950017b28c176a2d3d79844edcca62aa970f927f

Clean: L2_patch

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ib3620689acb3641b2ec9a49e2ce552bab3f00eef
(cherry picked from commit 016fb5988a63c3086b0b5b9f5ad7155c6ebef291)
---

diff --git a/resources/libraries/robot/l2/l2_patch.robot b/resources/libraries/robot/l2/l2_patch.robot
index f59f924e28..20e72f3261 100644
--- a/resources/libraries/robot/l2/l2_patch.robot
+++ b/resources/libraries/robot/l2/l2_patch.robot
@@ -12,13 +12,16 @@
 # limitations under the License.
 
 *** Settings ***
-| Library | resources.libraries.python.L2Util
 | Library | resources.libraries.python.InterfaceUtil
+| Library | resources.libraries.python.L2Util.py
 
 *** Keywords ***
-| Configure L2 patch
-| | [Documentation] | Setup Bidirectional L2 patch on DUT
-| | [Arguments] | ${node} | ${if1} | ${if2} |
-| | Set Interface State | ${node} | ${if1} | up
-| | Set Interface State | ${node} | ${if2} | up
-| | Vpp Setup Bidirectional L2 patch | ${node} | ${if1} | ${if2}
+| Initialize L2 patch
+| | [Documentation]
+| | ... | Setup L2 patch topology by cross connecting two interfaces on
+| | ... | each DUT. Interfaces are brought up.
+| | ...
+| | Set interfaces in path up
+| | :FOR | ${dut} | IN | @{duts}
+| | | VPP Setup Bidirectional L2 patch
+| | | ... | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
diff --git a/resources/libraries/robot/performance/performance_configuration.robot b/resources/libraries/robot/performance/performance_configuration.robot
index a9b999058b..e1e24d92d5 100644
--- a/resources/libraries/robot/performance/performance_configuration.robot
+++ b/resources/libraries/robot/performance/performance_configuration.robot
@@ -325,15 +325,6 @@
 | | ... | ELSE | Fail | Unsupported behaviour: ${behavior}
 | | Set interfaces in path up
 
-| Initialize L2 patch
-| | [Documentation]
-| | ... | Setup L2 patch topology by cross connecting two interfaces on
-| | ... | each DUT. Interfaces are brought up.
-| | ...
-| | Set interfaces in path up
-| | :FOR | ${dut} | IN | @{duts}
-| | | Configure L2patch | ${nodes['${dut}']} | ${${dut}_if1} | ${${dut}_if2}
-
 | Initialize L2 xconnect in 2-node circular topology
 | | [Documentation]
 | | ... | Setup L2 xconnect topology by cross connecting two interfaces on