aboutsummaryrefslogtreecommitdiffstats
path: root/resources/libraries/python
diff options
context:
space:
mode:
authorVratko Polak <vrpolak@cisco.com>2020-07-13 12:17:44 +0200
committerVratko Polak <vrpolak@cisco.com>2020-07-13 11:14:04 +0000
commit9378751a08ca5660886927f5502dcef19bc7f51c (patch)
tree25d757117051b75689ca6fb40439e127c67f189b /resources/libraries/python
parentbc36a6a974e63722dbae42c552eb0d95ae7b95a9 (diff)
Soak: Do not allow negative loss
Change-Id: I6da359d25edc415e44263d3f85f166369e564987 Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/python')
-rw-r--r--resources/libraries/python/PLRsearch/PLRsearch.py2
-rw-r--r--resources/libraries/python/TrafficGenerator.py11
2 files changed, 11 insertions, 2 deletions
diff --git a/resources/libraries/python/PLRsearch/PLRsearch.py b/resources/libraries/python/PLRsearch/PLRsearch.py
index 37ee468405..fb4ee1a4d0 100644
--- a/resources/libraries/python/PLRsearch/PLRsearch.py
+++ b/resources/libraries/python/PLRsearch/PLRsearch.py
@@ -57,6 +57,8 @@ class PLRsearch:
trial_number_offset=0, timeout=1800.0, trace_enabled=False):
"""Store rate measurer and additional parameters.
+ The measurer must never report negative loss count.
+
TODO: Copy AbstractMeasurer from MLRsearch.
:param measurer: The measurer to call when searching.
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index c63dc2d504..c5192e263d 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -161,6 +161,7 @@ class TrafficGenerator(AbstractMeasurer):
self.traffic_profile = None
self.warmup_time = None
self.traffic_directions = None
+ self.negative_loss = None
# Transient data needed for async measurements.
self._xstats = (None, None)
# TODO: Rename "xstats" to something opaque, so TRex is not privileged?
@@ -717,7 +718,7 @@ class TrafficGenerator(AbstractMeasurer):
def set_rate_provider_defaults(
self, frame_size, traffic_profile, warmup_time=0.0,
- traffic_directions=2):
+ traffic_directions=2, negative_loss=True):
"""Store values accessed by measure().
:param frame_size: Frame size identifier or value [B].
@@ -726,15 +727,18 @@ class TrafficGenerator(AbstractMeasurer):
:param warmup_time: Traffic duration before measurement starts [s].
:param traffic_directions: Traffic is bi- (2) or uni- (1) directional.
Default: 2
+ :param negative_loss: If false, negative loss is reported as zero loss.
:type frame_size: str or int
:type traffic_profile: str
:type warmup_time: float
:type traffic_directions: int
+ :type negative_loss: bool
"""
self.frame_size = frame_size
self.traffic_profile = str(traffic_profile)
self.warmup_time = float(warmup_time)
self.traffic_directions = traffic_directions
+ self.negative_loss = negative_loss
def get_measurement_result(self, duration=None, transmit_rate=None):
"""Return the result of last measurement as ReceiveRateMeasurement.
@@ -760,6 +764,8 @@ class TrafficGenerator(AbstractMeasurer):
transmit_rate = self._rate * self.traffic_directions
transmit_count = int(self.get_sent())
loss_count = int(self.get_loss())
+ if loss_count < 0 and not self.negative_loss:
+ loss_count = 0
measurement = ReceiveRateMeasurement(
duration, transmit_rate, transmit_count, loss_count
)
@@ -916,7 +922,8 @@ class OptimizedSearch:
u"resources.libraries.python.TrafficGenerator"
)
tg_instance.set_rate_provider_defaults(
- frame_size, traffic_profile, traffic_directions=traffic_directions)
+ frame_size, traffic_profile, traffic_directions=traffic_directions,
+ negative_loss=False)
algorithm = PLRsearch(
measurer=tg_instance, trial_duration_per_trial=tdpt,
packet_loss_ratio_target=plr_target,