diff options
author | 2019-05-08 18:04:37 +0000 | |
---|---|---|
committer | 2019-05-14 09:02:00 +0000 | |
commit | 15912f9aadf9b55906f3b2886c9ee9c78b89f81f (patch) | |
tree | 98807c330702638056a9ec8667b4febbb2197f6a /resources/libraries | |
parent | 704927d423388e29edaf36a4e0dc6235cec0f48b (diff) |
Add new higher density NF tests
Change-Id: Ib2f3f3f8dc3e202dc1db53c739d9309be2ed8a60
Signed-off-by: Peter Mikus <pmikus@cisco.com>
(cherry picked from commit 1ac36a9fd34043609b81901f2de37deb0a113ea5)
Diffstat (limited to 'resources/libraries')
-rw-r--r-- | resources/libraries/python/TrafficGenerator.py | 4 | ||||
-rw-r--r-- | resources/libraries/python/autogen/Regenerator.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py index da364cbded..270c2403af 100644 --- a/resources/libraries/python/TrafficGenerator.py +++ b/resources/libraries/python/TrafficGenerator.py @@ -425,8 +425,8 @@ class TrafficGenerator(AbstractMeasurer): command = ( "sh -c '{tool}/resources/tools/trex/trex_stateless_profile.py" " --profile {prof}/resources/traffic_profiles/trex/{traffic}.py" - " --duration {duration!r} --frame_size {frame_size} --rate {rate!r}" - " --warmup_time {warmup!r} --port_0 {p_0} --port_1 {p_1}").format( + " --duration {duration} --frame_size {frame_size} --rate {rate}" + " --warmup_time {warmup} --port_0 {p_0} --port_1 {p_1}").format( tool=Constants.REMOTE_FW_DIR, prof=Constants.REMOTE_FW_DIR, traffic=traffic_profile, duration=duration, frame_size=frame_size, rate=rate, warmup=warmup_time, p_0=p_0, diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 85625c4c35..c2df94c4cf 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -124,6 +124,11 @@ class Regenerator(object): # CSIT lab only has 28 (physical) core processors, # so these test would fail when attempting to assign cores. emit = False + if "-24vm1t-" in suite_id or "-24dcr1t-" in suite_id: + if kwargs["phy_cores"] > 3: + # CSIT lab only has 28 (physical) core processors, + # so these test would fail when attempting to assign cores. + emit = False if "soak" in suite_id: # Soak test take too long, do not risk other than tc01. if kwargs["phy_cores"] != 1: |