aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/python/autogen/DefaultTestcase.py1
-rw-r--r--resources/libraries/python/autogen/Regenerator.py23
-rw-r--r--resources/libraries/robot/performance/performance_setup.robot14
3 files changed, 27 insertions, 11 deletions
diff --git a/resources/libraries/python/autogen/DefaultTestcase.py b/resources/libraries/python/autogen/DefaultTestcase.py
index 3c11cb073e..0aaf40d7ca 100644
--- a/resources/libraries/python/autogen/DefaultTestcase.py
+++ b/resources/libraries/python/autogen/DefaultTestcase.py
@@ -26,6 +26,7 @@ class DefaultTestcase(Testcase):
Example: ethip6srhip6-ip6base-srv6enc2sids-nodecaps-ndrpdr
:type suite_id: str
"""
+ self.suite_id = suite_id
template_string = r'''
| ${tc_num}-${frame_str}-${cores_str}c-''' + suite_id + r'''
| | [Tags] | ${frame_str} | ${cores_str}C
diff --git a/resources/libraries/python/autogen/Regenerator.py b/resources/libraries/python/autogen/Regenerator.py
index 4ed123ae7c..e7e0370325 100644
--- a/resources/libraries/python/autogen/Regenerator.py
+++ b/resources/libraries/python/autogen/Regenerator.py
@@ -59,24 +59,26 @@ class Regenerator(object):
protocol_to_min_framesize = {
"ip4": 64,
"ip6": 78,
- "vxlan+ip4": 114
+ "vxlan+ip4": 114 # What is the real minimum for latency stream?
}
- def get_suite_id(filename):
+ def get_iface_and_suite_id(filename):
dash_split = filename.split("-", 1)
if len(dash_split[0]) <= 4:
# It was something like "2n1l", we need one more split.
dash_split = dash_split[1].split("-", 1)
- return dash_split[1].split(".", 1)[0]
+ return dash_split[0], dash_split[1].split(".", 1)[0]
- def add_testcase(file_out, num, **kwargs):
- file_out.write(testcase.generate(num=num, **kwargs))
+ def add_testcase(testcase, iface, file_out, num, **kwargs):
+ # TODO: Is there a better way to disable some combinations?
+ if kwargs["framesize"] != 9000 or "vic1227" not in iface:
+ file_out.write(testcase.generate(num=num, **kwargs))
return num + 1
- def add_testcases(file_out, tc_kwargs_list):
+ def add_testcases(testcase, iface, file_out, tc_kwargs_list):
num = 1
for tc_kwargs in tc_kwargs_list:
- num = add_testcase(file_out, num, **tc_kwargs)
+ num = add_testcase(testcase, iface, file_out, num, **tc_kwargs)
print "Regenerator starts at {cwd}".format(cwd=getcwd())
min_framesize = protocol_to_min_framesize[protocol]
@@ -95,15 +97,14 @@ class Regenerator(object):
{"framesize": "IMIX_v4_1", "phy_cores": 4}
]
for filename in glob(pattern):
+ print "Regenerating filename:", filename
with open(filename, "r") as file_in:
text = file_in.read()
text_prolog = "".join(text.partition("*** Test Cases ***")[:-1])
- # TODO: Make the following work for 2n suites.
- suite_id = get_suite_id(filename)
- print "Regenerating suite_id:", suite_id
+ iface, suite_id = get_iface_and_suite_id(filename)
testcase = self.testcase_class(suite_id)
with open(filename, "w") as file_out:
file_out.write(text_prolog)
- add_testcases(file_out, kwargs_list)
+ add_testcases(testcase, iface, file_out, kwargs_list)
print "Regenerator ends."
print # To make autogen check output more readable.
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index e34e842352..eef624e50c 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -874,6 +874,20 @@
| | Run Keyword And Ignore Error
| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+| Tear down mrr test with MACIP ACL
+| | [Documentation] | Common test teardown for mrr performance \
+| | ... | tests with MACIP ACL feature used.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Tear down mrr test with MACIP ACL \|
+| | ...
+| | Tear down performance mrr test
+| | Run Keyword If Test Failed | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Settings | ${dut1}
+| | Run Keyword And Ignore Error
+| | ... | Vpp Log Macip Acl Interface Assignment | ${dut1}
+
| Tear down performance test with Ligato Kubernetes
| | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
| | ... | tests with Ligato Kubernetes.