diff options
| author |   Vratko Polak <vrpolak@cisco.com> | 2022-08-12 16:25:50 +0200 |
|---|---|---|
| committer | Vratko Polak <vrpolak@cisco.com> | 2022-08-16 08:03:57 +0000 |
| commit | 4640b7da58f69f5b5aac69698656ae334735080c (patch) | |
| tree | 1d5669d1a378f25c5c2106ee7a4018d83f6968e1 /resources/libraries/robot/ip/ip4.robot | |
| parent | ffcf925b2f686bf368c6ee4adb08c7075b732d63 (diff) | |
fix(robot): replace Run Keyword Unless
Use Run Keyword If, with the condition negated.
This silences the deprecation warning seen since Robot version bump.
Change-Id: I9a88ff551994df3e129d71327f08207133a958a6
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/robot/ip/ip4.robot')
| -rw-r--r-- | resources/libraries/robot/ip/ip4.robot | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/resources/libraries/robot/ip/ip4.robot b/resources/libraries/robot/ip/ip4.robot index ef5b27f7de..1d4e3e22b6 100644 --- a/resources/libraries/robot/ip/ip4.robot +++ b/resources/libraries/robot/ip/ip4.robot @@ -1,4 +1,4 @@ -# Copyright (c) 2021 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: @@ -83,17 +83,17 @@ | | ... | Vpp Route Add | ${dut2} | 10.10.10.0 | 24 | gateway=1.1.1.1 | | ... | interface=${DUT2_${int}1}[0] | | -| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | Run Keyword If | '${remote_host1_ip}' != '${NONE}' | | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | ${remote_host_mask} | | ... | gateway=10.10.10.2 | interface=${DUT1_${int}1}[0] -| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | Run Keyword If | '${remote_host2_ip}' != '${NONE}' | | ... | Vpp Route Add | ${dut} | ${remote_host2_ip} | ${remote_host_mask} | | ... | gateway=20.20.20.2 | interface=${dut_if2} -| | Run Keyword Unless | '${remote_host1_ip}' == '${NONE}' +| | Run Keyword If | '${remote_host1_ip}' != '${NONE}' | | ... | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Vpp Route Add | ${dut1} | ${remote_host1_ip} | ${remote_host_mask} | | ... | gateway=1.1.1.2 | interface=${DUT1_${int}2}[0] -| | Run Keyword Unless | '${remote_host2_ip}' == '${NONE}' +| | Run Keyword If | '${remote_host2_ip}' != '${NONE}' | | ... | Run Keyword If | '${dut2_status}' == 'PASS' | | ... | Vpp Route Add | ${dut2} | ${remote_host2_ip} | ${remote_host_mask} | | ... | gateway=1.1.1.1 | interface=${DUT2_${int}1}[0] @@ -267,7 +267,7 @@ | | | ${memif2}= | Set Variable | ${${dut}-memif-${number}-if2} | | | ${fib_table_1}= | Evaluate | ${fib_table_1} + ${1} | | | ${fib_table_2}= | Evaluate | ${fib_table_1} + ${1} -| | | Run Keyword Unless | ${number} == ${count} +| | | Run Keyword If | ${number} != ${count} | | | ... | Add Fib Table | ${nodes['${dut}']} | ${fib_table_2} | | | Assign Interface To Fib Table | ${nodes['${dut}']} | | | ... | ${memif1} | ${fib_table_1} @@ -375,10 +375,10 @@ | | | ... | ${dut1} | ${dut1-vhost-${number}-if1} | 1.1.1.2 | 30 | | | VPP Interface Set IP Address | | | ... | ${dut1} | ${dut1-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 | | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 | | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} | | | Run Keyword If | ${testpmd_mac} @@ -494,16 +494,16 @@ | | | ... | ${dut2} | ${dut2-vhost-${number}-if1} | 1.1.1.2 | 30 | | | VPP Interface Set IP Address | | | ... | ${dut2} | ${dut2-vhost-${number}-if2} | 1.1.2.2 | 30 -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut1} | 20.0.0.0 | 8 | gateway=1.1.1.1 | | | ... | interface=${dut1-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut1} | 10.0.0.0 | 8 | gateway=1.1.2.1 | | | ... | interface=${dut1-vhost-${number}-if2} | vrf=${fib_table_2} -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut2} | 20.0.0.0 | 8 | gateway=1.1.1.1 | | | ... | interface=${dut2-vhost-${number}-if1} | vrf=${fib_table_1} -| | | Run Keyword Unless | ${testpmd_mac} +| | | Run Keyword If | not ${testpmd_mac} | | | ... | Vpp Route Add | ${dut2} | 10.0.0.0 | 8 | gateway=1.1.2.1 | | | ... | interface=${dut2-vhost-${number}-if2} | vrf=${fib_table_2} | | | Run Keyword If | ${testpmd_mac} |