From ab6ab66e52631b30176e4a2a1649c70a0549a574 Mon Sep 17 00:00:00 2001 From: Deepak S Date: Wed, 23 Aug 2017 03:33:05 -0700 Subject: Fix Scale-up issue in HWLB Change-Id: I62e23bf0c9811ecf0eedb1cd8adc8cf541cd4b7e Signed-off-by: Deepak S --- yardstick/network_services/helpers/samplevnf_helper.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'yardstick/network_services/helpers') diff --git a/yardstick/network_services/helpers/samplevnf_helper.py b/yardstick/network_services/helpers/samplevnf_helper.py index dbc10b8c5..3aa843784 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): -- cgit 1.2.3-korg