X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Foverlay%2Fsrv6.robot;h=92c8220cb7b426c6e542cbed77c3123c61a81222;hb=75fe508bc9e03291977c1a28ca0adc31c3149df9;hp=dafc0fe5661fdeafae183d87edbce13dc99e68e8;hpb=6cdc335b42c3fa4c4c69ec0b20314df02118e4b4;p=csit.git

diff --git a/resources/libraries/robot/overlay/srv6.robot b/resources/libraries/robot/overlay/srv6.robot
index dafc0fe566..92c8220cb7 100644
--- a/resources/libraries/robot/overlay/srv6.robot
+++ b/resources/libraries/robot/overlay/srv6.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Cisco and/or its affiliates.
+# Copyright (c) 2020 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:
@@ -19,7 +19,7 @@
 | Configure SR LocalSID on DUT
 | | [Documentation] | Create SRv6 LocalSID and binds it to a particular\
 | | ... | behavior on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to create localSID on. Type: dictionary
 | | ... | - local_sid - LocalSID IPv6 address. Type: string
@@ -42,9 +42,9 @@
 | | ... | to SR-unaware appliance via static proxy). Type: string
 | | ... | - sid_list - SID list (Optional, default value: []; required for SRv6
 | | ... | endpoint to SR-unaware appliance via static proxy). Type: list
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Configure SR LocalSID on DUT \| ${nodes['DUT1']} \| B:: \| end \|
 | | ... | \| Configure SR LocalSID on DUT \| ${nodes['DUT1']} \| C:: \
 | | ... | \| end.dx2 \| interface=GigabitEthernet0/10/0 \|
@@ -58,12 +58,12 @@
 | | ... | \| Configure SR LocalSID on DUT \| ${nodes['DUT2']} \| E:: \
 | | ... | \| end.as \| next_hop=10.0.0.1 \| out_if=DUT2_VHOST1 \
 | | ... | \| in_if=DUT2_VHOST2 \| src_addr=B:: \| sid_list=['C::', 'D::'] \|
-| | ...
+| |
 | | [Arguments] | ${dut_node} | ${local_sid} | ${behavior}
 | | ... | ${interface}=${None} | ${next_hop}=${None} | ${fib_table}=${None}
 | | ... | ${out_if}=${None} | ${in_if}=${None} | ${src_addr}=${None}
 | | ... | @{sid_list}
-| | ...
+| |
 | | Configure SR LocalSID | ${dut_node} | ${local_sid} | ${behavior}
 | | ... | interface=${interface} | next_hop=${next_hop} | fib_table=${fib_table}
 | | ... | out_if=${out_if} | in_if=${in_if} | src_addr=${src_addr}
@@ -71,55 +71,55 @@
 
 | Show SR LocalSIDs on DUT
 | | [Documentation] | Show SRv6 LocalSIDs on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to show SR localSIDs on. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR LocalSIDs on DUT \| ${nodes['DUT1']} \|
-| | ...
+| |
 | | [Arguments] | ${dut_node}
-| | ...
+| |
 | | Show SR LocalSIDs | ${dut_node}
 
 | Configure SR Policy on DUT
 | | [Documentation] | Create SRv6 policy on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to create SRv6 policy on. Type: dictionary
 | | ... | - bsid - BindingSID - local SID IPv6 address. Type: string
 | | ... | - mode - Encapsulation / insertion mode. Type: string
 | | ... | - sid_list - SID list. Type: list
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Configure SR Policy on DUT \| ${nodes['DUT2']} \| A:: \| encap \
 | | ... | \| B::\| C:: \|
 | | ... | \| Configure SR Policy on DUT \| ${nodes['DUT2']} \| D:: \| insert \
 | | ... | \| E::\| F:: \|
-| | ...
+| |
 | | [Arguments] | ${dut_node} | ${bsid} | ${mode} | @{sid_list}
-| | ...
+| |
 | | Configure SR Policy | ${dut_node} | ${bsid} | ${sid_list} | mode=${mode}
 
 | Show SR Policies on DUT
 | | [Documentation] | Show SRv6 policies on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to show SR policies on. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR Policies on DUT \| ${nodes['DUT1']} \|
-| | ...
+| |
 | | [Arguments] | ${dut_node}
-| | ...
+| |
 | | Show SR Policies | ${dut_node}
 
 | Configure SR Steer on DUT
 | | [Documentation] | Create SRv6 steering policy on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to create SR steering policy on.
 | | ... | Type: dictionary
@@ -131,194 +131,237 @@
 | | ... | in case of L3 mode). Type: string
 | | ... | - prefix - IP address prefix (Optional, default value: None; required
 | | ... | for L3 mode). Type: integer
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Configure SR Steer on DUT \| ${nodes['DUT1']} \| L2 \| B:: \
 | | ... | \| interface=GigabitEthernet0/10/0 \|
 | | ... | \| Configure SR Steer on DUT \| ${nodes['DUT1']} \| L3 \| C:: \
 | | ... | \| ip_address=2001::1 \| prefix=64 \|
-| | ...
+| |
 | | [Arguments] | ${dut_node} | ${mode} | ${bsid}
 | | ... | ${interface}=${None} | ${ip_addr}=${None} | ${prefix}=${None}
-| | ...
+| |
 | | Configure SR Steer | ${dut_node} | ${mode} | ${bsid}
 | | ... | interface=${interface} | ip_addr=${ip_addr} | prefix=${prefix}
 
 | Show SR Steering Policies on DUT
 | | [Documentation] | Show SRv6 steering policies on the given DUT node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to show SR steering policies on.
 | | ... | Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR Steering Policies on DUT \| ${nodes['DUT1']} \|
-| | ...
+| |
 | | [Arguments] | ${dut_node}
-| | ...
+| |
 | | Show SR Steering Policies | ${dut_node}
 
 | Set SR Encaps Source Address on DUT
 | | [Documentation] | Set SRv6 encapsulation source address on the given DUT
 | | ... | node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - dut_node - DUT node where to set SRv6 encapsulation source address
 | | ... | on. Type: dictionary
 | | ... | - ip6_addr - Local SID IPv6 address. Type: string
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Set SR Encaps Source Address on DUT \| ${nodes['DUT1']} \| B:: \|
-| | ...
+| |
 | | [Arguments] | ${dut_node} | ${ip6_addr}
-| | ...
+| |
 | | Set SR Encaps Source Address | ${dut_node} | ip6_addr=${ip6_addr}
 
 | Show SR Policies on all DUTs
 | | [Documentation] | Show SRv6 policies on all DUT nodes in topology.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - nodes - Topology. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR Policies on all DUTs \| ${nodes} \|
-| | ...
+| |
 | | [Arguments] | ${nodes}
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Show SR Policies | ${nodes['${dut}']}
+| | END
 
 | Show SR Steering Policies on all DUTs
 | | [Documentation] | Show SRv6 steering policies on all DUT nodes in topology.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - nodes - Topology. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR Steering Policies on all DUTs \| ${nodes} \|
-| | ...
+| |
 | | [Arguments] | ${nodes}
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Show SR Steering Policies | ${nodes['${dut}']}
+| | END
 
 | Show SR LocalSIDs on all DUTs
 | | [Documentation] | Show SRv6 LocalSIDs on all DUT nodes in topology.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - nodes - Topology. Type: dictionary
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Show SR LocalSIDs on all DUTs \| ${nodes} \|
-| | ...
+| |
 | | [Arguments] | ${nodes}
-| | ...
-| | ${duts}= | Get Matches | ${nodes} | DUT*
-| | :FOR | ${dut} | IN | @{duts}
+| |
+| | FOR | ${dut} | IN | @{duts}
 | | | Show SR LocalSIDs | ${nodes['${dut}']}
+| | END
 
-| Initialize IPv6 forwarding over SRv6 with encapsulation with '${n}' x SID '${prepos}' decapsulation in 3-node circular topology
+| Initialize SRv6 encapsulation with '${n}' x SID '${prepos}' decapsulation
 | | [Documentation]
-| | ... | Set UP state on VPP interfaces in path on nodes in 3-node circular
+| | ... | Set UP state on VPP interfaces in path on node(s) in circular
 | | ... | topology. Get the interface MAC addresses and setup neighbours on all
 | | ... | VPP interfaces. Setup IPv6 addresses on all interfaces. Set segment
 | | ... | routing for IPv6 for required number of SIDs and configure IPv6 routes
-| | ... | on both DUT nodes.
-| | ...
+| | ... | on DUT node(s).
+| |
+| | ${status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Variable Should Exist | ${dut2}
+| | ${dut2_status}= | Set Variable If | '${status}' == 'PASS' | ${True}
+| | ... | ${False}
+| |
 | | VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if1} | ${dut1_if1_ip6} | ${prefix}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut1_if1_ip6} | ${prefix}
 | | VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if2} | ${dut1_if2_ip6} | ${prefix}
-| | VPP Interface Set IP Address
-| | ... | ${dut2} | ${dut2_if1} | ${dut2_if1_ip6} | ${prefix}
-| | VPP Interface Set IP Address
-| | ... | ${dut2} | ${dut2_if2} | ${dut2_if2_ip6} | ${prefix}
-| | Vpp All Ra Suppress Link Layer | ${nodes}
-| | :FOR | ${number} | IN RANGE | 2 | ${dst_addr_nr}+2
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut1_if2_ip6} | ${prefix}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Interface Set IP Address
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut2_if1_ip6} | ${prefix}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Interface Set IP Address
+| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${dut2_if2_ip6} | ${prefix}
+| | 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 | ${dut1}
-| | | ... | ${dut1_if1} | ${tg_if1_ip6_subnet}${hexa_nr} | ${tg_if1_mac}
-| | | VPP Add IP Neighbor | ${dut2}
-| | | ... | ${dut2_if2} | ${tg_if2_ip6_subnet}${hexa_nr} | ${tg_if2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut1} | ${dut1_if2} | ${dut2_if1_ip6} | ${dut2_if1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2} | ${dut2_if1} | ${dut1_if2_ip6} | ${dut1_if2_mac}
+| | | VPP Add IP Neighbor
+| | | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_if1_ip6_subnet}${hexa_nr}
+| | | ... | ${TG_pf1_mac}[0]
+| | | Run Keyword If | ${dut2_status}
+| | | ... | VPP Add IP Neighbor
+| | | ... | ${dut2} | ${DUT2_${int}2}[0] | ${tg_if2_ip6_subnet}${hexa_nr}
+| | | ... | ${TG_pf2_mac}[0]
+| | END
+| | 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}
+| | ... | VPP Add IP Neighbor
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6} | ${TG_pf2_mac}[0]
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Add IP Neighbor
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut1_if2_ip6}
+| | ... | ${DUT1_${int}2_mac}[0]
 | | ${sid1}= | Set Variable If
 | | ... | "${n}" == "1" | ${dut2_sid1}
 | | ... | "${n}" == "2" | ${dut2_sid1_1}
 | | ${sid2}= | Set Variable If
 | | ... | "${n}" == "1" | ${dut1_sid2}
 | | ... | "${n}" == "2" | ${dut1_sid2_1}
-| | Vpp Route Add | ${dut1} | ${sid1} | ${sid_prefix} | gateway=${dut2_if1_ip6}
-| | ... | interface=${dut1_if2}
-| | Vpp Route Add | ${dut2} | ${sid2} | ${sid_prefix} | gateway=${dut1_if2_ip6}
-| | ... | interface=${dut2_if1}
+| | Vpp Route Add
+| | ... | ${dut1} | ${sid1} | ${sid_prefix} | gateway=${dut2_if1_ip6}
+| | ... | interface=${DUT1_${int}2}[0]
+| | Run Keyword If | ${dut2_status}
+| | ... | Vpp Route Add
+| | ... | ${dut2} | ${sid2} | ${sid_prefix} | gateway=${dut1_if2_ip6}
+| | ... | interface=${DUT2_${int}1}[0]
 # Configure SRv6 for direction0
-| | Set SR Encaps Source Address on DUT | ${dut1} | ${dut1_sid1}
-| | @{sid_list_dir0}= | Run Keyword If | "${n}" == "1"
+| | Set SR Encaps Source Address on DUT
+| | ... | ${dut1} | ${dut1_sid1}
+| | @{sid_list_dir0}= | Run Keyword If | '${n}' == '1'
 | | ... | Create List | ${dut2_sid1}
-| | ... | ELSE IF | "${n}" == "2"
+| | ... | ELSE IF | '${n}' == '2'
 | | ... | Create List | ${dut2_sid1_1} | ${dut2_sid1_2}
-| | Configure SR Policy on DUT | ${dut1} | ${dut1_bsid} | encap
-| | ... | @{sid_list_dir0}
-| | Configure SR Steer on DUT | ${dut1} | L3 | ${dut1_bsid}
-| | ... | ip_addr=${tg_if2_ip6_subnet} | prefix=${sid_prefix}
-| | Run Keyword If | "${n}" == "1"
-| | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1} | end.dx6
-| | ... | interface=${dut2_if2} | next_hop=${tg_if2_ip6_subnet}2
-| | Run Keyword If | "${n}" == "2"
-| | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1_1} | end
-| | Run Keyword If | "${n}" == "2" and "${prepos}" != "without"
-| | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1_2} | end.dx6
-| | ... | interface=${dut2_if2} | next_hop=${tg_if2_ip6_subnet}2
-| | Run Keyword If | "${n}" == "2" and "${prepos}" == "without"
-| | ... | Vpp Route Add | ${dut2} | ${dut2_sid1_2} | ${sid_prefix}
-| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2}
+| | Configure SR Policy on DUT
+| | ... | ${dut1} | ${dut1_bsid} | encap | @{sid_list_dir0}
+| | Configure SR Steer on DUT
+| | ... | ${dut1} | L3 | ${dut1_bsid} | ip_addr=${tg_if2_ip6_subnet}
+| | ... | prefix=${sid_prefix}
+| | Run Keyword If | ${dut2_status} and '${n}' == '1'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut2} | ${dut2_sid1} | end.dx6 | interface=${DUT2_${int}2}[0]
+| | ... | next_hop=${tg_if2_ip6_subnet}2
+| | Run Keyword If | ${dut2_status} and '${n}' == '2'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut2} | ${dut2_sid1_1} | end
+| | Run Keyword If
+| | ... | ${dut2_status} and '${n}' == '2' and '${prepos}' != 'without'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut2} | ${dut2_sid1_2} | end.dx6
+| | ... | interface=${DUT2_${int}2}[0] | next_hop=${tg_if2_ip6_subnet}2
+| | Run Keyword If
+| | ... | ${dut2_status} and '${n}' == '2' and '${prepos}' == 'without'
+| | ... | Vpp Route Add
+| | ... | ${dut2} | ${dut2_sid1_2} | ${sid_prefix}
+| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${DUT2_${int}2}[0]
 # Configure SRv6 for direction1
-| | Set SR Encaps Source Address on DUT | ${dut2} | ${dut2_sid2}
-| | @{sid_list_dir1}= | Run Keyword If | "${n}" == "1"
+| | Run Keyword If | ${dut2_status}
+| | ... | Set SR Encaps Source Address on DUT
+| | ... | ${dut2} | ${dut2_sid2}
+| | @{sid_list_dir1}= | Run Keyword If | '${n}' == '1'
 | | ... | Create List | ${dut1_sid2}
-| | ... | ELSE IF | "${n}" == "2"
+| | ... | ELSE IF | '${n}' == '2'
 | | ... | Create List | ${dut1_sid2_1} | ${dut1_sid2_2}
-| | Configure SR Policy on DUT | ${dut2} | ${dut2_bsid} | encap
-| | ... | @{sid_list_dir1}
-| | Configure SR Steer on DUT | ${dut2} | L3 | ${dut2_bsid}
-| | ... | ip_addr=${tg_if1_ip6_subnet} | prefix=${sid_prefix}
-| | Run Keyword If | "${n}" == "1"
-| | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2} | end.dx6
-| | ... | interface=${dut1_if1} | next_hop=${tg_if1_ip6_subnet}2
-| | Run Keyword If | "${n}" == "2"
-| | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2_1} | end
-| | Run Keyword If | "${n}" == "2" and "${prepos}" != "without"
-| | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2_2} | end.dx6
-| | ... | interface=${dut1_if1} | next_hop=${tg_if1_ip6_subnet}2
-| | Run Keyword If | "${n}" == "2" and "${prepos}" == "without"
-| | ... | Vpp Route Add | ${dut1} | ${dut1_sid2_2} | ${sid_prefix}
-| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${dut1_if1}
+| | Run Keyword If | ${dut2_status}
+| | ... | Configure SR Policy on DUT
+| | ... | ${dut2} | ${dut2_bsid} | encap | @{sid_list_dir1}
+| | Run Keyword If | ${dut2_status}
+| | ... | Configure SR Steer on DUT
+| | ... | ${dut2} | L3 | ${dut2_bsid} | ip_addr=${tg_if1_ip6_subnet}
+| | ... | prefix=${sid_prefix}
+| | Run Keyword If | '${n}' == '1'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut1} | ${dut1_sid2} | end.dx6 | interface=${DUT1_${int}1}[0]
+| | ... | next_hop=${tg_if1_ip6_subnet}2
+| | Run Keyword If | '${n}' == '2'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut1} | ${dut1_sid2_1} | end
+| | Run Keyword If | '${n}' == '2' and '${prepos}' != 'without'
+| | ... | Configure SR LocalSID on DUT
+| | ... | ${dut1} | ${dut1_sid2_2} | end.dx6 | interface=${DUT1_${int}1}[0]
+| | ... | next_hop=${tg_if1_ip6_subnet}2
+| | Run Keyword If | '${n}' == '2' and '${prepos}' == 'without'
+| | ... | Vpp Route Add
+| | ... | ${dut1} | ${dut1_sid2_2} | ${sid_prefix}
+| | ... | gateway=${tg_if1_ip6_subnet}2 | interface=${DUT1_${int}1}[0]
 | | Set interfaces in path up
 
-| Initialize IPv6 forwarding over SRv6 with endpoint to SR-unaware Service Function via '${behavior}' behaviour in 3-node circular topology
+| Initialize SRv6 with '${behavior}' SR-unaware Service Function
 | | [Documentation]
 | | ... | Create pair of Memif interfaces on all defined VPP nodes. Set UP
-| | ... | state on VPP interfaces in path on nodes in 3-node circular topology.
+| | ... | state on VPP interfaces in path on node(s) in circular topology.
 | | ... | Get the interface MAC addresses and setup neighbours on all VPP
 | | ... | interfaces. Setup IPv6 addresses on all interfaces. Set segment
 | | ... | routing for IPv6 with defined behaviour function and configure IPv6
-| | ... | routes on both DUT nodes.
-| | ...
+| | ... | routes on DUT node(s).
+| |
 | | ... | *Note:*
 | | ... | KW uses test variable rxq_count_int set by KW Add worker threads
 | | ... | and rxqueues to all DUTs
-| | ...
+| |
+| | ${status} | ${value}= | Run Keyword And Ignore Error
+| | ... | Variable Should Exist | ${dut2}
+| | ${dut2_status}= | Set Variable If | '${status}' == 'PASS' | ${True}
+| | ... | ${False}
+| |
 | | ${sock1}= | Set Variable | memif-DUT1_CNF
 | | ${sock2}= | Set Variable | memif-DUT2_CNF
 | | Set up memif interfaces on DUT node | ${dut1} | ${sock1} | ${sock1}
@@ -326,52 +369,74 @@
 | | ... | ${rxq_count_int}
 | | VPP Set interface MTU | ${dut1} | ${dut1-memif-1-if1}
 | | VPP Set interface MTU | ${dut1} | ${dut1-memif-1-if2}
-| | Set up memif interfaces on DUT node | ${dut2} | ${sock2} | ${sock2}
+| | Run Keyword If | ${dut2_status}
+| | ... | Set up memif interfaces on DUT node | ${dut2} | ${sock2} | ${sock2}
 | | ... | ${1} | dut2-memif-1-if1 | dut2-memif-1-if2 | ${rxq_count_int}
 | | ... | ${rxq_count_int}
-| | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if1}
-| | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if2}
-| | :FOR | ${dut} | IN | @{duts}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if1}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Set interface MTU | ${dut2} | ${dut2-memif-1-if2}
+| | FOR | ${dut} | IN | @{duts}
 | | | Show Memif | ${nodes['${dut}']}
+| | END
 | | VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if1} | ${dut1_if1_ip6} | ${prefix}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${dut1_if1_ip6} | ${prefix}
 | | VPP Interface Set IP Address
-| | ... | ${dut1} | ${dut1_if2} | ${dut1_if2_ip6} | ${prefix}
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut1_if2_ip6} | ${prefix}
 | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if1}
 | | ... | ${dut1-memif-1-if1_ip6} | ${mem_prefix}
 | | VPP Interface Set IP Address | ${dut1} | ${dut1-memif-1-if2}
 | | ... | ${dut1-memif-1-if2_ip6} | ${mem_prefix}
-| | VPP Interface Set IP Address
-| | ... | ${dut2} | ${dut2_if1} | ${dut2_if1_ip6} | ${prefix}
-| | VPP Interface Set IP Address
-| | ... | ${dut2} | ${dut2_if2} | ${dut2_if2_ip6} | ${prefix}
-| | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if1}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Interface Set IP Address
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut2_if1_ip6} | ${prefix}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Interface Set IP Address
+| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${dut2_if2_ip6} | ${prefix}
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if1}
 | | ... | ${dut2-memif-1-if1_ip6} | ${mem_prefix}
-| | VPP Interface Set IP Address | ${dut2} | ${dut2-memif-1-if2}
+| | 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}
+| | ... | VPP Add IP Neighbor
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${dut2_if1_ip6} | ${TG_pf2_mac}[0]
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Add IP Neighbor
+| | ... | ${dut2} | ${DUT2_${int}1}[0] | ${dut1_if2_ip6}
+| | ... | ${DUT1_${int}2_mac}[0]
 | | VPP Add IP Neighbor
-| | ... | ${dut1} | ${dut1_if2} | ${dut2_if1_ip6} | ${dut2_if1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2} | ${dut2_if1} | ${dut1_if2_ip6} | ${dut1_if2_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut1} | ${dut1_if1} | ${tg_if1_ip6_subnet}2 | ${tg_if1_mac}
-| | VPP Add IP Neighbor
-| | ... | ${dut2} | ${dut2_if2} | ${tg_if2_ip6_subnet}2 | ${tg_if2_mac}
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${tg_if1_ip6_subnet}2
+| | ... | ${TG_pf1_mac}[0]
+| | Run Keyword If | ${dut2_status}
+| | ... | VPP Add IP Neighbor
+| | ... | ${dut2} | ${DUT2_${int}2}[0] | ${tg_if2_ip6_subnet}2
+| | ... | ${TG_pf2_mac}[0]
 | | ${dut1-memif-1-if2_mac}= | Get Interface MAC | ${dut1} | memif2
-| | ${dut2-memif-1-if2_mac}= | Get Interface MAC | ${dut2} | memif2
+| | ${dut2-memif-1-if2_mac}= | Run Keyword If | ${dut2_status}
+| | ... | Get Interface MAC | ${dut2} | memif2
 | | VPP Add IP Neighbor | ${dut1}
 | | ... | ${dut1-memif-1-if1} | ${dut1_nh} | ${dut1-memif-1-if2_mac}
-| | VPP Add IP Neighbor | ${dut2}
+| | Run Keyword If | ${dut2_status}
+| | ... | 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}
-| | Vpp Route Add | ${dut2} | ${dut1_sid2} | ${sid_prefix}
-| | ... | gateway=${dut1_if2_ip6} | interface=${dut2_if1}
-| | Vpp Route Add | ${dut2} | ${out_sid1_1} | ${sid_prefix}
-| | ... | gateway=${tg_if2_ip6_subnet}2 | interface=${dut2_if2}
+| | ... | 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_${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_${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}
@@ -381,40 +446,46 @@
 | | Configure SR Steer on DUT | ${dut1} | L3 | ${dut1_bsid}
 | | ... | ip_addr=${tg_if2_ip6_subnet} | prefix=${sid_prefix}
 # Configure SRv6 for direction1 on DUT2
-| | Set SR Encaps Source Address on DUT | ${dut2} | ${dut2_sid2}
+| | Run Keyword If | ${dut2_status}
+| | ... | Set SR Encaps Source Address on DUT | ${dut2} | ${dut2_sid2}
 | | @{sid_list_dir1}= | Create List | ${dut1_sid2} | ${out_sid2_1}
 | | ... | ${out_sid2_2}
-| | Configure SR Policy on DUT | ${dut2} | ${dut2_bsid} | encap
+| | Run Keyword If | ${dut2_status}
+| | ... | Configure SR Policy on DUT | ${dut2} | ${dut2_bsid} | encap
 | | ... | @{sid_list_dir1}
-| | Configure SR Steer on DUT | ${dut2} | L3 | ${dut2_bsid}
+| | Run Keyword If | ${dut2_status}
+| | ... | Configure SR Steer on DUT | ${dut2} | L3 | ${dut2_bsid}
 | | ... | ip_addr=${tg_if1_ip6_subnet} | prefix=${sid_prefix}
 # Configure SRv6 for direction0 on DUT2
-| | ${dut2_out_if}= | Get Interface Name | ${dut2} | memif1
-| | ${dut2_in_if}= | Get Interface Name | ${dut2} | memif2
+| | ${dut2_out_if}= | Run Keyword If | ${dut2_status}
+| | ... | Get Interface Name | ${dut2} | memif1
+| | ${dut2_in_if}= | Run Keyword If | ${dut2_status}
+| | ... | Get Interface Name | ${dut2} | memif2
 | | Remove Values From List | ${sid_list_dir0} | ${dut2_sid1}
-| | Run Keyword If | "${behavior}" == "static_proxy"
+| | Run Keyword If | ${dut2_status} and '${behavior}' == 'static_proxy'
 | | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1} | end.as
 | | ... | ${NONE} | ${dut2_nh} | ${NONE} | ${dut2_out_if} | ${dut2_in_if}
 | | ... | ${dut1_sid1} | @{sid_list_dir0}
-| | ... | ELSE IF | "${behavior}" == "dynamic_proxy"
+| | ... | ELSE IF | ${dut2_status} and '${behavior}' == 'dynamic_proxy'
 | | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1} | end.ad
 | | ... | next_hop=${dut2_nh} | out_if=${dut2_out_if} | in_if=${dut2_in_if}
-| | ... | ELSE IF | "${behavior}" == "masquerading"
+| | ... | ELSE IF | ${dut2_status} and '${behavior}' == 'masquerading'
 | | ... | Configure SR LocalSID on DUT | ${dut2} | ${dut2_sid1} | end.am
 | | ... | next_hop=${dut2_nh} | out_if=${dut2_out_if} | in_if=${dut2_in_if}
-| | ... | ELSE | Fail | Unsupported behaviour: ${behavior}
+| | ... | ELSE IF | ${dut2_status}
+| | ... | Fail | Unsupported behaviour: ${behavior}
 # Configure SRv6 for direction1 on DUT1
 | | ${dut1_out_if}= | Get Interface Name | ${dut1} | memif1
 | | ${dut1_in_if}= | Get Interface Name | ${dut1} | memif2
 | | Remove Values From List | ${sid_list_dir1} | ${dut1_sid2}
-| | Run Keyword If | "${behavior}" == "static_proxy"
+| | Run Keyword If | '${behavior}' == 'static_proxy'
 | | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2} | end.as
 | | ... | ${NONE} | ${dut1_nh} | ${NONE} | ${dut1_out_if} | ${dut1_in_if}
 | | ... | ${dut2_sid2} | @{sid_list_dir1}
-| | ... | ELSE IF | "${behavior}" == "dynamic_proxy"
+| | ... | ELSE IF | '${behavior}' == 'dynamic_proxy'
 | | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2} | end.ad
 | | ... | next_hop=${dut1_nh} | out_if=${dut1_out_if} | in_if=${dut1_in_if}
-| | ... | ELSE IF | "${behavior}" == "masquerading"
+| | ... | ELSE IF | '${behavior}' == 'masquerading'
 | | ... | Configure SR LocalSID on DUT | ${dut1} | ${dut1_sid2} | end.am
 | | ... | next_hop=${dut1_nh} | out_if=${dut1_out_if} | in_if=${dut1_in_if}
 | | ... | ELSE | Fail | Unsupported behaviour: ${behavior}