fix(robot): replace Run Keyword Unless

[csit.git] / resources / libraries / robot / overlay / srv6.robot

diff --git a/resources/libraries/robot/overlay/srv6.robot b/resources/libraries/robot/overlay/srv6.robot
index d14d304..6ce7f74 100644 (file)
--- a/resources/libraries/robot/overlay/srv6.robot
+++ b/resources/libraries/robot/overlay/srv6.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Cisco and/or its affiliates.
+# Copyright (c) 2022 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:
@@ -248,7 +248,7 @@
 | | Run Keyword If | ${dut2_status}
 | | ... | VPP Interface Set IP Address
 | | ... | ${dut2} | ${DUT2_${int}2}[0] | ${dut2_if2_ip6} | ${prefix}
-| | Vpp All Ra Suppress Link Layer | ${nodes}
+| | Vpp Interfaces RA Suppress On All Nodes | ${nodes}
 | | FOR | ${number} | IN RANGE | 2 | ${dst_addr_nr}+2
 | | | ${hexa_nr}= | Convert To Hex | ${number}
 | | | VPP Add IP Neighbor
@@ -263,7 +263,7 @@
 | | ... | VPP Add IP Neighbor
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6}
 | | ... | ${DUT2_${int}1_mac}[0]
-| | Run Keyword Unless | ${dut2_status}
+| | Run Keyword If | not ${dut2_status}
 | | ... | VPP Add IP Neighbor
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6} | ${TG_pf2_mac}[0]
 | | Run Keyword If | ${dut2_status}
@@ -400,12 +400,12 @@
 | | Run Keyword If | ${dut2_status}
 | | ... | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if2}
 | | ... | ${dut2-memif-1-if2_ip6} | ${mem_prefix}
-| | Vpp All Ra Suppress Link Layer | ${nodes}
+| | Vpp Interfaces RA Suppress On All Nodes | ${nodes}
 | | Run Keyword If | ${dut2_status}
 | | ... | VPP Add IP Neighbor
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6}
 | | ... | ${DUT2_${int}1_mac}[0]
-| | Run Keyword Unless | ${dut2_status}
+| | Run Keyword If | not ${dut2_status}
 | | ... | VPP Add IP Neighbor
 | | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6} | ${TG_pf2_mac}[0]
 | | Run Keyword If | ${dut2_status}
@@ -428,15 +428,15 @@
 | | ... | VPP Add IP Neighbor | ${dut2}
 | | ... | ${dut2-memif-1-if1} | ${dut2_nh} | ${dut2-memif-1-if2_mac}
 | | Vpp Route Add | ${dut1} | ${dut2_sid1} | ${sid_prefix}
-| | ... | gateway=${dut2_if1_ip6} | interface=${dut1_if2}
+| | ... | gateway=${dut2_if1_ip6} | interface=${DUT1_${int}2}[0]
 | | Vpp Route Add | ${dut1} | ${out_sid2_1} | ${sid_prefix}
-| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1}
+| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${DUT1_${int}1}[0]
 | | Run Keyword If | ${dut2_status}
 | | ... | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix}
-| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_if1}
+| | ... | gateway=${dut1_if2_ip6} | interface=${DUT2_${int}1}[0]
 | | Run Keyword If | ${dut2_status}
 | | ... | Vpp Route Add | ${dut2} | ${out_sid1_1} | ${sid_prefix}
-| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2}
+| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${DUT2_${int}2}[0]
 # Configure SRv6 for direction0 on DUT1
 | | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1}
 | | @{sid_list_dir0}= | Create List | ${dut2_sid1} | ${out_sid1_1}