X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Frobot%2Fwrk%2Fwrk_utils.robot;h=0e7150ba1e3e436b992681e9d855a42d94a30186;hb=14a71b74b414df7616ccb5ada3d50ecb90d96bae;hp=1c6522813076c88f8eef0cd96bcab23b2cc52a4f;hpb=6da7266754c28754c04cf37d1974e39766a261f6;p=csit.git

diff --git a/resources/libraries/robot/wrk/wrk_utils.robot b/resources/libraries/robot/wrk/wrk_utils.robot
index 1c65228130..0e7150ba1e 100644
--- a/resources/libraries/robot/wrk/wrk_utils.robot
+++ b/resources/libraries/robot/wrk/wrk_utils.robot
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 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:
@@ -12,66 +12,72 @@
 # limitations under the License.
 
 *** Settings ***
-| Library  | resources.tools.wrk.wrk
-| Library  | resources.libraries.python.IPUtil
-| Library  | resources.libraries.python.DUTSetup
-| Library  | resources.libraries.python.TrafficGenerator
-| Library  | resources.libraries.python.topology.Topology
-| ...
+| Library | resources.tools.wrk.wrk
+| Library | resources.libraries.python.IPUtil
+| Library | resources.libraries.python.DUTSetup
+| Library | resources.libraries.python.TrafficGenerator
+| Library | resources.libraries.python.topology.Topology
+|
 | Documentation | L2 keywords to set up wrk and to measure performance
 | ... | parameters using wrk.
 
+*** Variables ***
+| ${wrk_ip_prefix}= | 24
+| @{wrk_ip_addrs}= | 192.168.10.1 | 192.168.20.1 | 192.168.30.1
+| ... | 192.168.40.1 | 192.168.50.1 | 192.168.60.1 | 192.168.70.1
+| ... | 192.168.80.1
+
 *** Keywords ***
 | Measure throughput
 | | [Documentation]
 | | ... | Measure throughput using wrk.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${profile} - The name of the wrk traffic profile defining the
 | | ... | traffic. Type: string
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Measure throughput \| wrk-bw-1url-1core-50con \|
-| | ...
+| |
 | | [Arguments] | ${profile}
-| | ...
-| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${tg_if1} | ${tg_if2}
+| |
+| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 | | ${output}= | Run wrk | ${tg} | ${profile} | ${tg_numa} | bw
 | | Set test message | ${output}
 
 | Measure requests per second
 | | [Documentation]
 | | ... | Measure number of requests per second using wrk.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${profile} - The name of the wrk traffic profile defining the
 | | ... | traffic. Type: string
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Measure requests per second \| wrk-bw-1url-1core-50con \|
-| | ...
+| |
 | | [Arguments] | ${profile}
-| | ...
-| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${tg_if1} | ${tg_if2}
+| |
+| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 | | ${output}= | Run wrk | ${tg} | ${profile} | ${tg_numa} | rps
 | | Set test message | ${output}
 
 | Measure connections per second
 | | [Documentation]
 | | ... | Measure number of connections per second using wrk.
-| | ...
+| |
 | | ... | *Arguments:*
 | | ... | - ${profile} - The name of the wrk traffic profile defining the
 | | ... | traffic. Type: string
-| | ...
+| |
 | | ... | *Example:*
-| | ...
+| |
 | | ... | \| Measure connections per second \| wrk-bw-1url-1core-50con \|
-| | ...
+| |
 | | [Arguments] | ${profile}
-| | ...
-| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${tg_if1} | ${tg_if2}
+| |
+| | ${tg_numa}= | Get interfaces numa node | ${tg} | ${TG_pf1}[0] | ${TG_pf2}[0]
 | | ${output}= | Run wrk | ${tg} | ${profile} | ${tg_numa} | cps
 | | Set test message | ${output}