From 67d683ebfc222d63d79b883fe7cf94027dbde00c Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Fri, 9 Aug 2019 10:14:34 +0000 Subject: Clean: L2 bridge domain Signed-off-by: Peter Mikus Change-Id: I3721900b91a9c8e9db8766bdcb9771b6bcf95bca --- resources/libraries/robot/l2/l2_xconnect.robot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'resources/libraries/robot/l2/l2_xconnect.robot') diff --git a/resources/libraries/robot/l2/l2_xconnect.robot b/resources/libraries/robot/l2/l2_xconnect.robot index 64a967e551..42fe837676 100644 --- a/resources/libraries/robot/l2/l2_xconnect.robot +++ b/resources/libraries/robot/l2/l2_xconnect.robot @@ -123,7 +123,7 @@ | | | ${sock1}= | Set Variable | /var/run/vpp/sock-${number}-1 | | | ${sock2}= | Set Variable | /var/run/vpp/sock-${number}-2 | | | ${prev_index}= | Evaluate | ${number}-1 -| | | Configure vhost interfaces for L2BD forwarding | ${nodes['${dut}']} +| | | Configure vhost interfaces | ${nodes['${dut}']} | | | ... | ${sock1} | ${sock2} | ${dut}-vhost-${number}-if1 | | | ... | ${dut}-vhost-${number}-if2 | | | ${dut_xconnect_if1}= | Set Variable If | ${number}==1 | ${${dut}_if1} @@ -175,12 +175,12 @@ | | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 +| | Configure vhost interfaces +| | ... | ${dut1} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} -| | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 +| | Configure vhost interfaces +| | ... | ${dut2} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} @@ -244,12 +244,12 @@ | | Configure L2 tag rewrite method on interfaces | | ... | ${dut1} | ${subif_index_1} | ${dut2} | ${subif_index_2} | | ... | ${tag_rewrite} -| | Configure vhost interfaces for L2BD forwarding | ${dut1} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 +| | Configure vhost interfaces +| | ... | ${dut1} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut1} | ${dut1_if1} | ${vhost_if1} | | Configure L2XC | ${dut1} | ${subif_index_1} | ${vhost_if2} -| | Configure vhost interfaces for L2BD forwarding | ${dut2} -| | ... | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 +| | Configure vhost interfaces +| | ... | ${dut2} | /var/run/vpp/sock-1-1 | /var/run/vpp/sock-1-2 | | Configure L2XC | ${dut2} | ${subif_index_2} | ${vhost_if1} | | Configure L2XC | ${dut2} | ${dut2_if2} | ${vhost_if2} -- cgit 1.2.3-korg