From 1341a308b07b7e126378007d770058e0ac16d17f Mon Sep 17 00:00:00 2001 From: Alberto Villarreal Date: Thu, 22 Jun 2023 21:04:03 -0500 Subject: [PATCH] Added __init__.py under hero_helper directory. Fixed TCP_BG config when ENI_COUNT=8 and split_networks is True. Changed TCP_BG test objective from 1M to 15M --- .../hero_scale/hero_helper/__init__.py | 0 .../hero_scale/hero_helper/hero_helper.py | 11 +++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 stateful_traffic_gen/hero_scale/hero_helper/__init__.py diff --git a/stateful_traffic_gen/hero_scale/hero_helper/__init__.py b/stateful_traffic_gen/hero_scale/hero_helper/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/stateful_traffic_gen/hero_scale/hero_helper/hero_helper.py b/stateful_traffic_gen/hero_scale/hero_helper/hero_helper.py index fb7565d..7d016cc 100644 --- a/stateful_traffic_gen/hero_scale/hero_helper/hero_helper.py +++ b/stateful_traffic_gen/hero_scale/hero_helper/hero_helper.py @@ -41,7 +41,7 @@ class HeroHelper: 'userObjectiveType_cps': "connectionRate", 'userObjectiveType_tcp_bg': "concurrentConnections", 'initial_objective': 15000000, - 'initial_objective_tcp_bg': 4000000, + 'initial_objective_tcp_bg': 15000000, 'threshold': 100000, 'target_failures': 1000, 'MAX_CPS': 32000000, @@ -347,9 +347,9 @@ def _adjust_to_port_settings(self): if slot_total == 4: self.user_init_obj = 3600000 - self.user_init_obj_tcp_bg = 1000000 + #self.user_init_obj_tcp_bg = 1000000 self.url_patch_dict['initial_objective'] = self.user_init_obj - self.url_patch_dict['initial_objective_tcp_bg'] = self.user_init_obj_tcp_bg + #self.url_patch_dict['initial_objective_tcp_bg'] = self.user_init_obj_tcp_bg self.enis = ENI_COUNT self.nsgs = self.enis * self.ip_ranges_per_vpc @@ -903,7 +903,10 @@ def _create_server_ipmacvlan(self, nsgs, enis, ip_ranges_per_vpc): server_ip_range_settings = [] server_mac_range_settings = [] server_vlan_range_settings = [] - bg_net_split = int(enis * self.tcp_bg_adjust_percentage) + if enis == 2: + bg_net_split = 1 + else: + bg_net_split = int(enis * self.tcp_bg_adjust_percentage) if self.split_networks is True and self.test_config_type == 'cps': eni = 1