aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-09-21 00:21:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-21 00:21:58 +0000
commit173c6ad6f464c514185efc0b5a608ceb6cc118ae (patch)
treedf09191193a799737c7632e215a564bc7ee09d30
parent1a4eb9cbdab6010e6c3f8f9842b856513aba2232 (diff)
parentd472f51170132b6735511ed01e42306d088c41f4 (diff)
Merge "tg_rfc2544_ixia: renamed traffic_profile.execute to traffic_profile.execute_traffic tg_rfc2544_ixia: pass ports to generate_samples"
-rw-r--r--yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index a73c691b9..449f22296 100644
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -144,11 +144,11 @@ class IxiaResourceHelper(ClientResourceHelper):
# Generate ixia traffic config...
try:
while not self._terminated.value:
- traffic_profile.execute(self, self.client, mac, ixia_file)
+ traffic_profile.execute_traffic(self, self.client, mac, ixia_file)
self.client_started.value = 1
time.sleep(WAIT_FOR_TRAFFIC)
self.client.ix_stop_traffic()
- samples = self.generate_samples()
+ samples = self.generate_samples(traffic_profile.ports)
self._queue.put(samples)
status, samples = traffic_profile.get_drop_percentage(self, samples, min_tol,
max_tol, self.client, mac,