summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-30 15:25:46 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-30 15:25:46 +0000
commit6fd861c845a42d6a1aae8adc7facc28fba6cac58 (patch)
treed8e39b0b62fb600264b226bb4dc45ae51a86e103
parent2c76fe2cdc8c3f5ff5101e80f0621da33fbfbe4f (diff)
parentab6ab66e52631b30176e4a2a1649c70a0549a574 (diff)
Merge "Fix Scale-up issue in HWLB"
-rw-r--r--yardstick/network_services/helpers/samplevnf_helper.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/yardstick/network_services/helpers/samplevnf_helper.py b/yardstick/network_services/helpers/samplevnf_helper.py
index ae5451020..dfc5cb972 100644
--- a/yardstick/network_services/helpers/samplevnf_helper.py
+++ b/yardstick/network_services/helpers/samplevnf_helper.py
@@ -333,10 +333,20 @@ class MultiPortConfig(object):
'nd_route_tbl': "(0100::,64,0,::1)"
}
self.pktq_out_os = swq_out_str.split(' ')
- # why?
+ # HWLB is a run to complition. So override the pktq_in/pktq_out
if self.lb_config == self.HW_LB:
- arpicmp_data['pktq_in'] = swq_in_str
self.swq = 0
+ swq_in_str = \
+ self.make_range_str('SWQ{}', self.swq,
+ offset=(self.lb_count * self.worker_threads))
+ arpicmp_data['pktq_in'] = swq_in_str
+ # WA: Since port_pairs will not be populated during arp pipeline
+ self.port_pairs = self.port_pair_list
+ port_iter = \
+ self.make_port_pairs_iter(self.float_x_plus_one_tenth_of_y, [self.mul])
+ pktq_out = self.make_str('TXQ{}', port_iter)
+ arpicmp_data['pktq_out'] = pktq_out
+
return arpicmp_data
def generate_final_txrx_data(self):