Signed-off-by: Jan Tluka jtluka@redhat.com --- .../PerfTestMixins/BasePerfTestTweakMixin.py | 6 +++++- .../SctpFirewallPerfTestMixin.py | 21 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/lnst/Recipes/ENRT/PerfTestMixins/BasePerfTestTweakMixin.py b/lnst/Recipes/ENRT/PerfTestMixins/BasePerfTestTweakMixin.py index a444384d..380fc72e 100644 --- a/lnst/Recipes/ENRT/PerfTestMixins/BasePerfTestTweakMixin.py +++ b/lnst/Recipes/ENRT/PerfTestMixins/BasePerfTestTweakMixin.py @@ -4,8 +4,12 @@ class BasePerfTestTweakMixin(object): mixin classes. """
+ def generate_perf_test_tweak_description(self, perf_config): + return ["Performance test tweaks:"] + def apply_perf_test_tweak(self, perf_config): - pass + perf_config.perf_test_tweak_config = {}
def remove_perf_test_tweak(self, perf_config): + # TODO: check if anything left in the perf_config.perf_test_tweak_config pass diff --git a/lnst/Recipes/ENRT/PerfTestMixins/SctpFirewallPerfTestMixin.py b/lnst/Recipes/ENRT/PerfTestMixins/SctpFirewallPerfTestMixin.py index 46963dd2..6c6cc416 100644 --- a/lnst/Recipes/ENRT/PerfTestMixins/SctpFirewallPerfTestMixin.py +++ b/lnst/Recipes/ENRT/PerfTestMixins/SctpFirewallPerfTestMixin.py @@ -20,6 +20,9 @@ class SctpFirewallPerfTestMixin(BasePerfTestTweakMixin): job_level=ResultLevel.NORMAL, )
+ tweak_config = perf_config.perf_test_tweak_config + tweak_config["iptables_sctp"] = True + def remove_perf_test_tweak(self, perf_config): flow_measurement = self._get_flow_measurement_from_config(perf_config) flow = flow_measurement.conf[0] @@ -29,5 +32,23 @@ class SctpFirewallPerfTestMixin(BasePerfTestTweakMixin): "iptables -D OUTPUT ! -o %s -p sctp -j DROP" % nic.name, job_level=ResultLevel.NORMAL, ) + tweak_config = perf_config.perf_test_tweak_config + del tweak_config["iptables_sctp"]
super().remove_perf_test_tweak(perf_config) + + def generate_perf_test_tweak_description(self, perf_config): + description = super().generate_perf_test_tweak_description(perf_config) + tweak_config = perf_config.perf_test_tweak_config + if "iptables_sctp" in tweak_config: + description.append( + "added iptables rules to drop SCTP packets on other than " + "tested interface" + ) + else: + description.append( + "skipped addition of iptables rules to drop SCTP packets on " + "other than tested interface" + ) + + return description