Skip to content

Commit 091e7fb

Browse files
committed
tft: cleanup parsing arguments
Introduce a helper function to cleanup the code. Signed-off-by: Thomas Haller <thaller@redhat.com>
1 parent 4bbcde8 commit 091e7fb

1 file changed

Lines changed: 22 additions & 16 deletions

File tree

tft.py

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,23 @@ def parse_args() -> argparse.Namespace:
8989
return args
9090

9191

92+
def parse_args_full() -> tuple[TestConfig, bool]:
93+
args = parse_args()
94+
95+
args_check = args.check
96+
tc = TestConfig(
97+
config_path=args.config,
98+
evaluator_config=args.evaluator_config,
99+
kubeconfigs=option_get_kubeconfigs(
100+
args.kubeconfig,
101+
args.kubeconfig_infra,
102+
),
103+
output_base=args.output_base,
104+
)
105+
106+
return tc, args_check
107+
108+
92109
def option_get_kubeconfigs(
93110
kubeconfig: Optional[str], kubeconfig_infra: Optional[str]
94111
) -> Optional[tuple[str, Optional[str]]]:
@@ -133,29 +150,18 @@ def option_get_kubeconfigs(
133150
def main() -> int:
134151
time_start = time.monotonic()
135152

136-
args = parse_args()
153+
tc, args_check = parse_args_full()
137154

138-
args_check = args.check
139-
tc = TestConfig(
140-
config_path=args.config,
141-
evaluator_config=args.evaluator_config,
142-
kubeconfigs=option_get_kubeconfigs(
143-
args.kubeconfig,
144-
args.kubeconfig_infra,
145-
),
146-
output_base=args.output_base,
147-
)
148155
tc.system_check()
149156
tc.log_config()
150157
tft = TrafficFlowTests()
151158

152159
evaluator = Evaluator(tc.evaluator_config)
153160

154-
tft_results_lst = []
155-
156-
for cfg_descr in ConfigDescriptor(tc).describe_all_tft():
157-
tft_results = tft.test_run(cfg_descr, evaluator)
158-
tft_results_lst.append(tft_results)
161+
tft_results_lst = [
162+
tft.test_run(cfg_descr, evaluator)
163+
for cfg_descr in ConfigDescriptor(tc).describe_all_tft()
164+
]
159165

160166
exit_code = 0
161167

0 commit comments

Comments
 (0)