[PATCH v2 15/15] lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test

The ping_config argument is a list of PingConfig instances, so to avoid confusion use plural. I also updated the method arguments in some classes that inherit from this base class. Signed-off-by: Jan Tluka <jtluka(a)redhat.com&gt; --- lnst/RecipeCommon/Ping/Recipe.py | 4 ++-- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 4 ++-- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 14 ++++++------- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 24 +++++++++++------------ 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lnst/RecipeCommon/Ping/Recipe.py b/lnst/RecipeCommon/Ping/Recipe.py index 128d7356..90cc0f6c 100644 --- a/lnst/RecipeCommon/Ping/Recipe.py +++ b/lnst/RecipeCommon/Ping/Recipe.py @@ -56,11 +56,11 @@ class PingConf(object): class PingTestAndEvaluate(BaseRecipe): - def ping_test(self, ping_config): + def ping_test(self, ping_configs): results = {} ping_array = [] - for pingconf in ping_config: + for pingconf in ping_configs: ping = self.ping_init(pingconf) ping.start(bg = True) ping_array.append((pingconf, ping)) diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 84d192ee..de72cd0a 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -98,8 +98,8 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): self.do_perf_tests(recipe_config) def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations(recipe_config): - result = self.ping_test(ping_config) + for ping_configs in self.generate_ping_configurations(recipe_config): + result = self.ping_test(ping_configs) self.ping_report_and_evaluate(result) def do_perf_tests(self, recipe_config): diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 014891c0..0bf41128 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -161,24 +161,24 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, reverse_flow = self._create_reverse_flow(flow) yield [reverse_flow] - def ping_test(self, ping_config): - m1, m2 = ping_config[0].client, ping_config[0].destination - ip1, ip2 = (ping_config[0].client_bind, - ping_config[0].destination_address) + def ping_test(self, ping_configs): + m1, m2 = ping_configs[0].client, ping_configs[0].destination + ip1, ip2 = (ping_configs[0].client_bind, + ping_configs[0].destination_address) if1_name = self.get_dev_by_ip(m1, ip1).name if2 = self.get_dev_by_ip(m2, ip2) pa_kwargs = {} pa_kwargs["p_filter"] = "esp" pa_kwargs["grep_for"] = ['ESP\(spi=' + self.spi_values[1]] - if ping_config[0].count: - pa_kwargs["p_min"] = ping_config[0].count + if ping_configs[0].count: + pa_kwargs["p_min"] = ping_configs[0].count pa_config = PacketAssertConf(m2, if2, **pa_kwargs) dump = m1.run("tcpdump -i %s -nn -vv" % if1_name, bg=True) self.packet_assert_test_start(pa_config) self.ctl.wait(2) - ping_result = super().ping_test(ping_config) + ping_result = super().ping_test(ping_configs) self.ctl.wait(2) pa_result = self.packet_assert_test_stop() dump.kill(signal=signal.SIGINT) diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py index eb67e236..fcb2d5fd 100644 --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py @@ -165,10 +165,10 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, reverse_flow = self._create_reverse_flow(flow) yield [reverse_flow] - def ping_test(self, ping_config): - m1, m2 = ping_config[0].client, ping_config[0].destination - ip1, ip2 = (ping_config[0].client_bind, - ping_config[0].destination_address) + def ping_test(self, ping_configs): + m1, m2 = ping_configs[0].client, ping_configs[0].destination + ip1, ip2 = (ping_configs[0].client_bind, + ping_configs[0].destination_address) if1_name = self.get_dev_by_ip(m1, ip1).name if2 = self.get_dev_by_ip(m2, ip2) @@ -176,14 +176,14 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, pa_kwargs["p_filter"] = "ah" pa_kwargs["grep_for"] = ["AH\(spi=" + self.spi_values[2], "ESP\(spi=" + self.spi_values[1]] - if ping_config[0].count: - pa_kwargs["p_min"] = 2 * ping_config[0].count + if ping_configs[0].count: + pa_kwargs["p_min"] = 2 * ping_configs[0].count pa_config = PacketAssertConf(m2, if2, **pa_kwargs) dump = m1.run("tcpdump -i %s -nn -vv" % if1_name, bg=True) self.packet_assert_test_start(pa_config) self.ctl.wait(2) - ping_result = super().ping_test(ping_config) + ping_result = super().ping_test(ping_configs) self.ctl.wait(2) pa_result = self.packet_assert_test_stop() dump.kill(signal=signal.SIGINT) @@ -193,18 +193,18 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, dump2 = m1.run("tcpdump -i %s -nn -vv" % if1_name, bg=True) no_trans = self.params.ipsec_mode != 'transport' - ping_config2 = copy.copy(ping_config) - ping_config2[0].size = 1500 + ping_configs2 = copy.copy(ping_configs) + ping_configs2[0].size = 1500 if no_trans: pa_kwargs2 = copy.copy(pa_kwargs) pa_kwargs2["p_filter"] = '' pa_kwargs2["grep_for"] = ["IPComp"] - if ping_config2[0].count: - pa_kwargs2["p_min"] = ping_config2[0].count + if ping_configs2[0].count: + pa_kwargs2["p_min"] = ping_configs2[0].count pa_config2 = PacketAssertConf(m2, if2, **pa_kwargs2) self.packet_assert_test_start(pa_config2) self.ctl.wait(2) - ping_result2 = super().ping_test(ping_config2) + ping_result2 = super().ping_test(ping_configs2) self.ctl.wait(2) if no_trans: pa_result2 = self.packet_assert_test_stop() -- 2.21.1