X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Flb%2Fload_balancer.robot;h=a44a92d58e91e5449a0b053c886b7eea68f148af;hb=9780b57a9640e9ab40e40ec122ac80e09cd74c79;hp=42cac6ae2e521aa65a569b4db3bba67a09630e7d;hpb=06e6da52159a865a3fd366d9aad09c31159f9e4b;p=csit.git

diff --git a/resources/libraries/robot/lb/load_balancer.robot b/resources/libraries/robot/lb/load_balancer.robot
index 42cac6ae2e..a44a92d58e 100644
--- a/resources/libraries/robot/lb/load_balancer.robot
+++ b/resources/libraries/robot/lb/load_balancer.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Intel and/or its affiliates.
+# Copyright (c) 2021 Intel 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:
@@ -20,9 +20,9 @@
 | Library | resources.libraries.python.topology.Topology
 | Library | resources.libraries.python.LoadBalancerUtil
 | Library | resources.libraries.python.NodePath
-| ...
+|
 | Resource | resources/libraries/robot/shared/interfaces.robot
-| ...
+|
 | Documentation | LoadBalancer suite keywords - configuration
 
 *** Keywords ***
@@ -32,27 +32,29 @@
 | | ... | circular topology. Get the interface MAC addresses and setup ARP on
 | | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG
 | | ... | links.
-| | ...
+| |
 | | Set interfaces in path up
-| | ...
+| |
 | | ${fib_table}= | Set Variable | ${0}
 | | Add Fib Table | ${dut1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table}
-| | ...
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1}
-| | ... | 192.168.50.72 | 24
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2}
-| | ... | 192.168.60.73 | 24
-| | ...
-| | Add Ip Neighbors | ${dut1} | ${dut1_if2} | 192.168.60 | ${tg_if2_mac}
-| | ...
-| | Vpp Route Add | ${dut1} | 192.168.60.0 | 24 | interface=${dut1_if2}
-| | ...
-| | Vpp Lb Conf | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
-| | Vpp Lb Add Del Vip | ${dut1} | vip_addr=90.1.2.1 | encap=${0}
-| | ... | new_len=${1024}
-| | Add Lb As Addresses | ${dut1} | 90.1.2.1 | 192.168.60
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${fib_table}
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${fib_table}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | 192.168.50.72 | 24
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60.73 | 24
+| | Add Ip Neighbors
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60 | ${TG_pf2_mac}[0]
+| | Vpp Route Add
+| | ... | ${dut1} | 192.168.60.0 | 24 | interface=${DUT1_${int}2}[0]
+| | Vpp Lb Conf
+| | ... | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
+| | Vpp Lb Add Del Vip
+| | ... | ${dut1} | vip_addr=90.1.2.1 | encap=${0} | new_len=${1024}
+| | Add Lb As Addresses
+| | ... | ${dut1} | 90.1.2.1 | 192.168.60
 
 | Initialize loadbalancer l3dsr
 | | [Documentation]
@@ -60,27 +62,29 @@
 | | ... | circular topology. Get the interface MAC addresses and setup ARP on
 | | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG
 | | ... | links.
-| | ...
+| |
 | | Set interfaces in path up
-| | ...
+| |
 | | ${fib_table}= | Set Variable | ${0}
 | | Add Fib Table | ${dut1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table}
-| | ...
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1}
-| | ... | 192.168.50.72 | 24
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2}
-| | ... | 192.168.60.73 | 24
-| | ...
-| | Add Ip Neighbors | ${dut1} | ${dut1_if2} | 192.168.60 | ${tg_if2_mac}
-| | ...
-| | Vpp Route Add | ${dut1} | 192.168.60.0 | 24 | interface=${dut1_if2}
-| | ...
-| | Vpp Lb Conf | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
-| | Vpp Lb Add Del Vip | ${dut1} | vip_addr=90.1.2.1 | encap=${2} | dscp=${7}
-| | ... | new_len=${1024}
-| | Add Lb As Addresses | ${dut1} | 90.1.2.1 | 192.168.60
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${fib_table}
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${fib_table}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | 192.168.50.72 | 24
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60.73 | 24
+| | Add Ip Neighbors
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60 | ${TG_pf2_mac}[0]
+| | Vpp Route Add
+| | ... | ${dut1} | 192.168.60.0 | 24 | interface=${DUT1_${int}2}[0]
+| | Vpp Lb Conf
+| | ... | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
+| | Vpp Lb Add Del Vip
+| | ... | ${dut1} | vip_addr=90.1.2.1 | encap=${2} | dscp=${7} | new_len=${1024}
+| | Add Lb As Addresses
+| | ... | ${dut1} | 90.1.2.1 | 192.168.60
 
 | Initialize loadbalancer nat4
 | | [Documentation]
@@ -88,54 +92,60 @@
 | | ... | circular topology. Get the interface MAC addresses and setup ARP on
 | | ... | all VPP interfaces. Setup IPv4 addresses with /24 prefix on DUT-TG
 | | ... | links.
-| | ...
+| |
 | | Set interfaces in path up
-| | ...
+| |
 | | ${fib_table}= | Set Variable | ${0}
 | | Add Fib Table | ${dut1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if1} | ${fib_table}
-| | Assign Interface To Fib Table | ${dut1} | ${dut1_if2} | ${fib_table}
-| | ...
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if1}
-| | ... | 192.168.50.72 | 24
-| | VPP Interface Set IP Address | ${dut1} | ${dut1_if2}
-| | ... | 192.168.60.73 | 24
-| | ...
-| | Add Ip Neighbors | ${dut1} | ${dut1_if1} | 192.168.50 | ${tg_if1_mac}
-| | Add Ip Neighbors | ${dut1} | ${dut1_if2} | 192.168.60 | ${tg_if2_mac}
-| | ...
-| | Vpp Route Add | ${dut1} | 192.168.50.0 | 24 | interface=${dut1_if1}
-| | Vpp Route Add | ${dut1} | 192.168.60.0 | 24 | interface=${dut1_if2}
-| | ...
-| | Vpp Lb Conf | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
-| | Vpp Lb Add Del Vip | ${dut1} | vip_addr=90.1.2.1 | encap=${3}
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | ${fib_table}
+| | Assign Interface To Fib Table
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | ${fib_table}
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | 192.168.50.72 | 24
+| | VPP Interface Set IP Address
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60.73 | 24
+| | Add Ip Neighbors
+| | ... | ${dut1} | ${DUT1_${int}1}[0] | 192.168.50 | ${TG_pf1_mac}[0]
+| | Add Ip Neighbors
+| | ... | ${dut1} | ${DUT1_${int}2}[0] | 192.168.60 | ${TG_pf2_mac}[0]
+| | Vpp Route Add
+| | ... | ${dut1} | 192.168.50.0 | 24 | interface=${DUT1_${int}1}[0]
+| | Vpp Route Add
+| | ... | ${dut1} | 192.168.60.0 | 24 | interface=${DUT1_${int}2}[0]
+| | Vpp Lb Conf
+| | ... | ${dut1} | ip4_src_addr=192.168.60.73 | buckets_per_core=${128}
+| | Vpp Lb Add Del Vip
+| | ... | ${dut1} | vip_addr=90.1.2.1 | encap=${3}
 | | ... | protocol=${17} | port=${20000} | target_port=${3307} | new_len=${1024}
 | | Add Lb As Addresses
 | | ... | ${dut1} | 90.1.2.1 | 192.168.60 | protocol=${17} | port=${20000}
-| | Vpp Lb Add Del Intf Nat4 | ${dut1} | interface=${dut1_if2}
+| | Vpp Lb Add Del Intf Nat4
+| | ... | ${dut1} | interface=${DUT1_${int}2}[0]
 
 | Add Ip Neighbors
 | | [Documentation] | Add IP neighbors to physical interface on DUT.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - node - VPP node. Type: dictionary
 | | ... | - interface - Interface key. Type: string
 | | ... | - ip_addr - IP address of the interface. Type: string
 | | ... | - mac_addr - MAC address of the interface. Type: string
-| | ...
+| |
 | | ... | *Example:*
 | | ... | \| Add Ip Neighbors \| ${dut1} \| ${dut1_if1} \| 192.168.50 \
 | | ... | \| ${tg_if1_mac}
-| | ...
+| |
 | | [Arguments] | ${node} | ${interface} | ${ip_addr} | ${mac_addr}
-| | ...
-| | :FOR | ${number} | IN RANGE | 74 | 80
+| |
+| | FOR | ${number} | IN RANGE | 74 | 80
 | | | VPP Add IP Neighbor
 | | | ... | ${node} | ${interface} | ${ip_addr}.${number} | ${mac_addr}
+| | END
 
 | Add Lb As Addresses
 | | [Documentation] | Add Lb As Addresses on Vpp node.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - node - VPP node. Type: dictionary
 | | ... | - vip_addr - IPv4 address to be used as source for IPv4 traffic.
@@ -143,18 +153,19 @@
 | | ... | - as_addr - The application server address. Type: string
 | | ... | - protocol - tcp or udp. Type: integer
 | | ... | - port - destination port. Type: integer
-| | ... | - is_del - 1 if the VIP should be removed otherwise 0.  Type: integer
+| | ... | - is_del - 1 if the VIP should be removed otherwise 0. Type: integer
 | | ... | - is_flush - 1 if the sessions related to this AS should be flushed
 | | ... | otherwise 0. Type: integer
-| | ...
+| |
 | | ... | *Example:*
 | | ... | \| Add Lb As Addresses \| ${dut1} \| 90.1.2.1 \| 192.168.60 \
 | | ... | \| protocol=${17} \| port=${20000} \|
-| | ...
+| |
 | | [Arguments] | ${node} | ${vip_addr} | ${as_addr} | ${protocol}=${255}
 | | ... | ${port}=${0} | ${is_del}=${0} | ${is_flush}=${0}
-| | ...
-| | :FOR | ${number} | IN RANGE | 74 | 80
+| |
+| | FOR | ${number} | IN RANGE | 74 | 80
 | | | VPP Lb Add Del As
 | | | ... | ${node} | vip_addr=${vip_addr} | protocol=${protocol}
 | | | ... | port=${port} | as_addr=${as_addr}.${number}
+| | END