X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fperformance%2Fperformance_setup.robot;h=a70742f448f97e82d69ffaf4e59457ca00d0e9c4;hp=407819637233288b44db4b6a38d3374a9f87c4ab;hb=75e2e7bbbfc1da40f8c742870ec12204846c9bf9;hpb=1bd729a755dd75b469e075f4efef4a929a59a297

diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 4078196372..a70742f448 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -36,7 +36,9 @@
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
 | | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
 | | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - 1st DUT interface towards TG.
 | | ... | - dut1_if2 - 2nd DUT interface towards TG.
@@ -57,9 +59,13 @@
 | | ${dut1_if1} | ${dut1}= | First Ingress Interface
 | | ${dut1_if2} | ${dut1}= | Last Egress Interface
 | | ${tg_if2} | ${tg}= | Last Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
@@ -75,8 +81,10 @@
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
-| | ... | - tg_if1 - TG interface towards DUT1.
-| | ... | - tg_if2 - TG interface towards DUT2.
+| | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
+| | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - DUT1 interface towards TG.
 | | ... | - dut1_if2 - DUT1 interface towards DUT2.
@@ -103,9 +111,13 @@
 | | ${dut2_if1} | ${dut2}= | Next Interface
 | | ${dut2_if2} | ${dut2}= | Next Interface
 | | ${tg_if2} | ${tg}= | Next Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2}
@@ -124,8 +136,10 @@
 | | ...
 | | ... | _NOTE:_ This KW sets following suite variables:
 | | ... | - tg - TG node
-| | ... | - tg_if1 - TG interface towards DUT1.
-| | ... | - tg_if2 - TG interface towards DUT2.
+| | ... | - tg_if1 - 1st TG interface towards DUT.
+| | ... | - tg_if1 - 1st TG interface MAC address.
+| | ... | - tg_if2 - 2nd TG interface towards DUT.
+| | ... | - tg_if2 - 2nd TG interface MAC address.
 | | ... | - dut1 - DUT1 node
 | | ... | - dut1_if1 - DUT1 interface towards TG.
 | | ... | - dut1_if2_1 - DUT1 interface 1 towards DUT2.
@@ -168,10 +182,14 @@
 | | ${dut1_if2_2} | ${dut1}= | Last Interface
 | | ${dut2_if1_1} | ${dut2}= | First Ingress Interface
 | | ${dut2_if1_2} | ${dut2}= | Last Egress Interface
+| | ${tg_if1_mac}= | Get Interface MAC | ${tg} | ${tg_if1}
+| | ${tg_if2_mac}= | Get Interface MAC | ${tg} | ${tg_if2}
 | | # Set suite variables
 | | Set Suite Variable | ${tg}
 | | Set Suite Variable | ${tg_if1}
+| | Set Suite Variable | ${tg_if1_mac}
 | | Set Suite Variable | ${tg_if2}
+| | Set Suite Variable | ${tg_if2_mac}
 | | Set Suite Variable | ${dut1}
 | | Set Suite Variable | ${dut1_if1}
 | | Set Suite Variable | ${dut1_if2_1}
@@ -621,18 +639,23 @@
 | | ... | *Arguments:*
 | | ... | - chains: Total number of chains. Type: integer
 | | ... | - nodeness: Total number of nodes per chain. Type: integer
+| | ... | - auto_scale - If True, use same amount of Dataplane threads for
+| | ... |   network function as DUT, otherwise use single physical core for
+| | ... |   every network function. Type: boolean
 | | ...
 | | ... | *Example:*
 | | ...
 | | ... | \| Set up performance test with containers \| 1 \| 1 \|
 | | ...
-| | [Arguments] | ${chains}=${1} | ${nodeness}=${1}
+| | [Arguments] | ${nf_chains}=${1} | ${nf_nodes}=${1} | ${auto_scale}=${True}
 | | ...
 | | Set Test Variable | @{container_groups} | @{EMPTY}
 | | Set Test Variable | ${container_group} | CNF
+| | Set Test Variable | ${nf_nodes}
 | | Import Library | resources.libraries.python.ContainerUtils.ContainerManager
 | | ... | engine=${container_engine} | WITH NAME | ${container_group}
-| | Construct chains of containers on all DUTs | ${chains} | ${nodeness}
+| | Construct chains of containers on all DUTs | ${nf_chains} | ${nf_nodes}
+| | ... | auto_scale=${auto_scale}
 | | Acquire all '${container_group}' containers
 | | Create all '${container_group}' containers
 | | Configure VPP in all '${container_group}' containers