X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2Fautogen%2FRegenerator.py;h=3011b06897dab7329dfbeefdffc898d5eb32df47;hb=31854f0cc48f0dde63b1ba82b467528181873435;hp=14a9fd0ddbd24444fb5e8290afa19cdea1335597;hpb=ec467277744783015a2da6713298b35d13d92e6f;p=csit.git diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py index 14a9fd0ddb..3011b06897 100644 --- a/resources/libraries/python/autogen/Regenerator.py +++ b/resources/libraries/python/autogen/Regenerator.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Cisco and/or its affiliates. +# Copyright (c) 2022 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -195,18 +195,30 @@ def add_iperf3_testcases(testcase, file_out, tc_kwargs_list): file_out.write(testcase.generate(**kwargs)) -def add_trex_testcases(testcase, file_out, tc_kwargs_list): +def add_trex_testcases(testcase, suite_id, file_out, tc_kwargs_list): """Add trex testcases to file. :param testcase: Testcase class. + :param suite_id: Suite ID. :param file_out: File to write testcases to. :param tc_kwargs_list: Key-value pairs used to construct testcases. :type testcase: Testcase + :type suite_id: str :type file_out: file :type tc_kwargs_list: dict """ for kwargs in tc_kwargs_list: - file_out.write(testcase.generate(**kwargs)) + # TODO: Is there a better way to disable some combinations? + emit = True + if ( + u"-cps-" in suite_id + or u"-pps-" in suite_id + or u"-tput-" in suite_id + ): + if kwargs[u"frame_size"] not in MIN_FRAME_SIZE_VALUES: + emit = False + if emit: + file_out.write(testcase.generate(**kwargs)) def write_default_files(in_filename, in_prolog, kwargs_list): @@ -437,8 +449,6 @@ def write_reconf_files(in_filename, in_prolog, kwargs_list): def write_tcp_files(in_filename, in_prolog, kwargs_list): """Using given filename and prolog, write all generated tcp suites. - TODO: Suport drivers. - :param in_filename: Template filename to derive real filenames from. :param in_prolog: Template content to derive real content from. :param kwargs_list: List of kwargs for add_default_testcase. @@ -450,20 +460,54 @@ def write_tcp_files(in_filename, in_prolog, kwargs_list): _, suite_id, suite_tag = get_iface_and_suite_ids(in_filename) testcase = Testcase.tcp(suite_id) for nic_name in Constants.NIC_NAME_TO_CODE: - out_filename = replace_defensively( + tmp_filename = replace_defensively( in_filename, u"10ge2p1x710", Constants.NIC_NAME_TO_CODE[nic_name], 1, u"File name should contain NIC code once.", in_filename ) - out_prolog = replace_defensively( + tmp_prolog = replace_defensively( in_prolog, u"Intel-X710", nic_name, 2, u"NIC name should appear twice (tag and variable).", in_filename ) - check_suite_tag(suite_tag, out_prolog) - with open(out_filename, u"wt") as file_out: - file_out.write(out_prolog) - add_tcp_testcases(testcase, file_out, kwargs_list) + iface, old_suite_id, old_suite_tag = get_iface_and_suite_ids( + tmp_filename + ) + for driver in Constants.NIC_NAME_TO_DRIVER[nic_name]: + out_filename = replace_defensively( + tmp_filename, old_suite_id, + Constants.NIC_DRIVER_TO_SUITE_PREFIX[driver] + old_suite_id, + 1, u"Error adding driver prefix.", in_filename + ) + out_prolog = replace_defensively( + tmp_prolog, u"vfio-pci", driver, 1, + u"Driver name should appear once.", in_filename + ) + out_prolog = replace_defensively( + out_prolog, Constants.NIC_DRIVER_TO_TAG[u"vfio-pci"], + Constants.NIC_DRIVER_TO_TAG[driver], 1, + u"Driver tag should appear once.", in_filename + ) + out_prolog = replace_defensively( + out_prolog, Constants.NIC_DRIVER_TO_PLUGINS[u"vfio-pci"], + Constants.NIC_DRIVER_TO_PLUGINS[driver], 1, + u"Driver plugin should appear once.", in_filename + ) + out_prolog = replace_defensively( + out_prolog, Constants.NIC_DRIVER_TO_VFS[u"vfio-pci"], + Constants.NIC_DRIVER_TO_VFS[driver], 1, + u"NIC VFs argument should appear once.", in_filename + ) + iface, suite_id, suite_tag = get_iface_and_suite_ids(out_filename) + out_prolog = replace_defensively( + out_prolog, old_suite_tag, suite_tag, 1, + u"Perf suite tag should appear once.", in_filename + ) + check_suite_tag(suite_tag, out_prolog) + testcase = Testcase.tcp(suite_id) + with open(out_filename, u"wt") as file_out: + file_out.write(out_prolog) + add_tcp_testcases(testcase, file_out, kwargs_list) def write_iperf3_files(in_filename, in_prolog, kwargs_list): @@ -478,20 +522,21 @@ def write_iperf3_files(in_filename, in_prolog, kwargs_list): """ _, suite_id, suite_tag = get_iface_and_suite_ids(in_filename) testcase = Testcase.iperf3(suite_id) - out_filename = replace_defensively( - in_filename, u"10ge2p1x710", - Constants.NIC_NAME_TO_CODE[u"Intel-X710"], 1, - u"File name should contain NIC code once.", in_filename - ) - out_prolog = replace_defensively( - in_prolog, u"Intel-X710", u"Intel-X710", 2, - u"NIC name should appear twice (tag and variable).", - in_filename - ) - check_suite_tag(suite_tag, out_prolog) - with open(out_filename, u"wt") as file_out: - file_out.write(out_prolog) - add_iperf3_testcases(testcase, file_out, kwargs_list) + for nic_name in Constants.NIC_NAME_TO_CODE: + out_filename = replace_defensively( + in_filename, u"10ge2p1x710", + Constants.NIC_NAME_TO_CODE[nic_name], 1, + u"File name should contain NIC code once.", in_filename + ) + out_prolog = replace_defensively( + in_prolog, u"Intel-X710", nic_name, 2, + u"NIC name should appear twice (tag and variable).", + in_filename + ) + check_suite_tag(suite_tag, out_prolog) + with open(out_filename, u"wt") as file_out: + file_out.write(out_prolog) + add_iperf3_testcases(testcase, file_out, kwargs_list) def write_trex_files(in_filename, in_prolog, kwargs_list): @@ -549,7 +594,7 @@ def write_trex_files(in_filename, in_prolog, kwargs_list): check_suite_tag(suite_tag, out_prolog) with open(out_filename, u"wt") as file_out: file_out.write(out_prolog) - add_trex_testcases(testcase, file_out, kwargs_list) + add_trex_testcases(testcase, suite_id, file_out, kwargs_list) def write_device_files(in_filename, in_prolog, kwargs_list): @@ -642,7 +687,7 @@ class Regenerator: Log-like prints are emitted to sys.stderr. - :param pattern: Glob pattern to select files. Example: *-ndrpdr.robot + :param pattern: Glob pattern to select files. Example: \*-ndrpdr.robot :param protocol: String determining minimal frame size. Default: "ip4" :type pattern: str :type protocol: str @@ -735,7 +780,7 @@ class Regenerator: in_prolog = u"".join( file_in.read().partition(u"*** Test Cases ***")[:-1] ) - if "-tg-" in in_filename: + if "-tg" in in_filename: write_trex_files(in_filename, in_prolog, trex_kwargs_list) continue if in_filename.endswith(u"-ndrpdr.robot"):