Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "bugfix: tc078 fails in some situations"
[yardstick.git]
/
yardstick
/
network_services
/
traffic_profile
/
prox_binsearch.py
diff --git
a/yardstick/network_services/traffic_profile/prox_binsearch.py
b/yardstick/network_services/traffic_profile/prox_binsearch.py
index
f98b1e5
..
1fd6ec4
100644
(file)
--- a/
yardstick/network_services/traffic_profile/prox_binsearch.py
+++ b/
yardstick/network_services/traffic_profile/prox_binsearch.py
@@
-57,8
+57,6
@@
class ProxBinSearchProfile(ProxProfile):
def run_test_with_pkt_size(self, traffic_gen, pkt_size, duration):
"""Run the test for a single packet size.
def run_test_with_pkt_size(self, traffic_gen, pkt_size, duration):
"""Run the test for a single packet size.
- :param queue: queue object we put samples into
- :type queue: Queue
:param traffic_gen: traffic generator instance
:type traffic_gen: TrafficGen
:param pkt_size: The packet size to test with.
:param traffic_gen: traffic generator instance
:type traffic_gen: TrafficGen
:param pkt_size: The packet size to test with.
@@
-86,8
+84,8
@@
class ProxBinSearchProfile(ProxProfile):
# throughput and packet loss from the most recent successful test
successful_pkt_loss = 0.0
for test_value in self.bounds_iterator(LOG):
# throughput and packet loss from the most recent successful test
successful_pkt_loss = 0.0
for test_value in self.bounds_iterator(LOG):
- result
= traffic_gen.resourc
e_helper.run_test(pkt_size, duration,
- test_value, self.tolerated_loss)
+ result
, port_samples = self._profil
e_helper.run_test(pkt_size, duration,
+
test_value, self.tolerated_loss)
if result.success:
LOG.debug("Success! Increasing lower bound")
if result.success:
LOG.debug("Success! Increasing lower bound")
@@
-97,5
+95,5
@@
class ProxBinSearchProfile(ProxProfile):
LOG.debug("Failure... Decreasing upper bound")
self.current_upper = test_value
LOG.debug("Failure... Decreasing upper bound")
self.current_upper = test_value
- samples = result.get_samples(pkt_size, successful_pkt_loss)
+ samples = result.get_samples(pkt_size, successful_pkt_loss
, port_samples
)
self.queue.put(samples)
self.queue.put(samples)