This is a series of patches that attempts to remove the duplicated code in Recipes/ENRT in case of cross-vlan ping runs.
The changes include: * split of ping command execution and evaluation of results * introducing two basic Ping evaluators * replacing the duplicated code in Recipes/ENRT with the new reusable code
v2:
* fixed a whitespace error * moved Perf BaseEvaluator to BaseResultEvaluator * used plural for ping_confing argument in ping_test() * instead of overriding the do_ping_tests base class method I added few mixin classes that do the same thing in even more reusable way * be aware of additional patches compared to previous v1
v3: * renamed get_ping_evaluators to generate_ping_evaluators * added PingEndpoints class that holds the information whether the endpoints are reachable * removed PingConditionMixin because PingEndpoints provides the needed information about endpoint reachability
Jan Tluka (17): RecipeCommon.Ping: rename running_ping to ping RecipeCommon.Ping: move prepare_job to ping_init RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report Tests.Ping: update failure logic Tests.Ping: do not check rtt data if no packets were received RecipeCommon.Ping: rename ping_evaluate_and_report method lnst.RecipeCommon: move Ping Recipe to separate directory lnst.RecipeCommon: rename Perf BaseEvaluator to BaseResultEvaluator lnst.RecipeCommon.Ping: add Ping evaluators RecipeCommon.Ping.Recipe: add evaluators to PingConf object lnst.RecipeCommon.Ping: add PingEndpoints class Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations Recipes.ENRT.BaseEnrtRecipe: register default PingEvaluator RecipeCommon.Ping.Recipe: split report and evaluate lnst.Recipes.ENRT: add PingMixins lnst.Recipes.ENRT: use PingMixins to override Ping evaluators lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test
...aseEvaluator.py => BaseResultEvaluator.py} | 2 +- .../Perf/Evaluators/BaselineEvaluator.py | 4 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 4 +- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + lnst/RecipeCommon/Ping/PingEndpoints.py | 20 +++++ lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 55 +++++++----- lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 19 ++-- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/BondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 16 ++-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 26 +++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 4 +- .../ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 + lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 +- lnst/Recipes/ENRT/TeamRecipe.py | 7 +- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 77 +++-------------- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 +- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 +- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 86 ++++--------------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 +- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +- .../VirtualOvsBridgeVlansOverBondRecipe.py | 86 ++++--------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 64 ++------------ lnst/Recipes/ENRT/VlansRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 +- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 +- lnst/Tests/Ping.py | 20 ++--- 41 files changed, 317 insertions(+), 459 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (63%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py index 62cbc2ff..f6ad47e9 100644 --- a/lnst/RecipeCommon/Ping.py +++ b/lnst/RecipeCommon/Ping.py @@ -50,20 +50,20 @@ class PingTestAndEvaluate(BaseRecipe): def ping_test(self, ping_config): results = {}
- running_ping_array = [] + ping_array = [] for pingconf in ping_config: ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) + ping = client.prepare_job(ping) + ping.start(bg = True) + ping_array.append((pingconf, ping))
- for _, pingjob in running_ping_array: + for _, pingjob in ping_array: try: pingjob.wait() finally: pingjob.kill()
- for pingconf, pingjob in running_ping_array: + for pingconf, pingjob in ping_array: result = pingjob.result results[pingconf] = result
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py index f6ad47e9..985f4073 100644 --- a/lnst/RecipeCommon/Ping.py +++ b/lnst/RecipeCommon/Ping.py @@ -52,8 +52,7 @@ class PingTestAndEvaluate(BaseRecipe):
ping_array = [] for pingconf in ping_config: - ping, client = self.ping_init(pingconf) - ping = client.prepare_job(ping) + ping = self.ping_init(pingconf) ping.start(bg = True) ping_array.append((pingconf, ping))
@@ -72,8 +71,8 @@ class PingTestAndEvaluate(BaseRecipe): def ping_init(self, ping_config): client = ping_config.client kwargs = self._generate_ping_kwargs(ping_config) - ping = Ping(**kwargs) - return (ping, client) + ping = client.prepare_job(Ping(**kwargs)) + return ping
def ping_evaluate_and_report(self, ping_config, results): for pingconf, result in results.items():
This parameter is never used. The value is a list of PingConf objects and these are available in the results parameter anyway.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping.py | 2 +- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 2 +- lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 2 +- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 2 +- lnst/Recipes/ENRT/VlansRecipe.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py index 985f4073..792b0e52 100644 --- a/lnst/RecipeCommon/Ping.py +++ b/lnst/RecipeCommon/Ping.py @@ -74,7 +74,7 @@ class PingTestAndEvaluate(BaseRecipe): ping = client.prepare_job(Ping(**kwargs)) return ping
- def ping_evaluate_and_report(self, ping_config, results): + def ping_evaluate_and_report(self, results): for pingconf, result in results.items(): self.single_ping_evaluate_and_report(pingconf, result)
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index a90c837e..edd4da70 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -99,7 +99,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): def do_ping_tests(self, recipe_config): for ping_config in self.generate_ping_configurations(recipe_config): result = self.ping_test(ping_config) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def do_perf_tests(self, recipe_config): for perf_config in self.generate_perf_configurations(recipe_config): diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index fd8b1bda..6d7e1c1c 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -186,7 +186,7 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, return (ping_result, pa_config, pa_result)
def ping_evaluate_and_report(self, ping_config, result): - super().ping_evaluate_and_report(ping_config, result[0]) + super().ping_evaluate_and_report(result[0]) self.packet_assert_evaluate_and_report(result[1], result[2])
def get_dev_by_ip(self, netns, ip): diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py index 26ecda03..7ecb5ae1 100644 --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py @@ -217,7 +217,7 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
def ping_evaluate_and_report(self, ping_config, result): for res in result: - super().ping_evaluate_and_report(ping_config, res[0]) + super().ping_evaluate_and_report(res[0]) self.packet_assert_evaluate_and_report(res[1], res[2])
def get_dev_by_ip(self, netns, ip): diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py index bb04e169..1b1dec41 100644 --- a/lnst/Recipes/ENRT/PingFloodRecipe.py +++ b/lnst/Recipes/ENRT/PingFloodRecipe.py @@ -43,4 +43,4 @@ class PingFloodRecipe(PingTestAndEvaluate): pcfg=PingConf(host1, ip1, host2, ip2, count = cn, interval = iv, size = sz) result = self.ping_test([pcfg]) - self.ping_evaluate_and_report(pcfg, result) + self.ping_evaluate_and_report(result) diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py index f7c7511c..c1fc1478 100644 --- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py @@ -154,7 +154,7 @@ class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py index c12d1945..8edf4234 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py @@ -190,7 +190,7 @@ class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index e8efd1d8..7cc9641f 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -194,7 +194,7 @@ class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py b/lnst/Recipes/ENRT/VlansOverBondRecipe.py index f47d0a2c..12ce812d 100644 --- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py @@ -182,7 +182,7 @@ class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py index 4b62be8d..679ab35f 100644 --- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py @@ -179,7 +179,7 @@ class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {} diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py index bfaa51dd..38f1f454 100644 --- a/lnst/Recipes/ENRT/VlansRecipe.py +++ b/lnst/Recipes/ENRT/VlansRecipe.py @@ -148,7 +148,7 @@ class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, pconf.destination_address) exp_fail.append(cond) result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(ping_config, result) + self.ping_evaluate_and_report(result)
def ping_test(self, ping_config, exp_fail): results = {}
This patch modifies the code to leave the pass/fail decision to a user of the test module.
The module will now return with failure only if exit code is higher than 1. Exit code 1 is used to report that ping did not receive any reply packets at all or fewer packets than expected are received. Ping exits with exit code 2 on other errors.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Tests/Ping.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/lnst/Tests/Ping.py b/lnst/Tests/Ping.py index 17de8abf..b6ab9d55 100644 --- a/lnst/Tests/Ping.py +++ b/lnst/Tests/Ping.py @@ -53,16 +53,13 @@ class Ping(BaseTestModule): except KeyboardInterrupt: pass
- self._res_data["stderr"] = stderr - - if stderr != "": - self._res_data["msg"] = "errors reported by ping" - logging.error(self._res_data["msg"]) - logging.error(self._res_data["stderr"]) - - if ping_process.returncode > 0: + if ping_process.returncode > 1: self._res_data["msg"] = "returncode = {}".format(ping_process.returncode) logging.error(self._res_data["msg"]) + if stderr != "": + self._res_data["stderr"] = stderr + logging.error("errors reported by ping") + logging.error(self._res_data["stderr"]) return False
stat_pttr1 = r'(\d+) packets transmitted, (\d+) received'
If no packets are received there's no rtt data reported by ping. Still, this could be a valid case, e.g. when we expect no packets should pass.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Tests/Ping.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lnst/Tests/Ping.py b/lnst/Tests/Ping.py index b6ab9d55..c42e2f6a 100644 --- a/lnst/Tests/Ping.py +++ b/lnst/Tests/Ping.py @@ -82,9 +82,10 @@ class Ping(BaseTestModule):
match = re.search(stat_pttr2, stdout) if not match: - self._res_data = {"msg": "expected pattern not found"} - logging.error(self._res_data["msg"]) - return False + if self._res_data['rate'] > 0: + self._res_data = {"msg": "expected pattern not found"} + logging.error(self._res_data["msg"]) + return False else: tmin, tavg, tmax, tmdev = [float(x) for x in match.groups()] logging.debug("rtt min "%.3f", avg "%.3f", max "%.3f", "
This is to match Perf pattern.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping.py | 6 +++--- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping.py index 792b0e52..320e4ac5 100644 --- a/lnst/RecipeCommon/Ping.py +++ b/lnst/RecipeCommon/Ping.py @@ -74,11 +74,11 @@ class PingTestAndEvaluate(BaseRecipe): ping = client.prepare_job(Ping(**kwargs)) return ping
- def ping_evaluate_and_report(self, results): + def ping_report_and_evaluate(self, results): for pingconf, result in results.items(): - self.single_ping_evaluate_and_report(pingconf, result) + self.single_ping_report_and_evaluate(pingconf, result)
- def single_ping_evaluate_and_report(self, ping_config, result): + def single_ping_report_and_evaluate(self, ping_config, result): fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ "<{0.destination.hostid} ({0.destination_address})>" description = fmt.format(ping_config) diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index edd4da70..08faa5c4 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -99,7 +99,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): def do_ping_tests(self, recipe_config): for ping_config in self.generate_ping_configurations(recipe_config): result = self.ping_test(ping_config) - self.ping_evaluate_and_report(result) + self.ping_report_and_evaluate(result)
def do_perf_tests(self, recipe_config): for perf_config in self.generate_perf_configurations(recipe_config): diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 6d7e1c1c..014891c0 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -186,7 +186,7 @@ class IpsecEspAeadRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe, return (ping_result, pa_config, pa_result)
def ping_evaluate_and_report(self, ping_config, result): - super().ping_evaluate_and_report(result[0]) + super().ping_report_and_evaluate(result[0]) self.packet_assert_evaluate_and_report(result[1], result[2])
def get_dev_by_ip(self, netns, ip): diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py index 7ecb5ae1..eb67e236 100644 --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py @@ -217,7 +217,7 @@ class IpsecEspAhCompRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe,
def ping_evaluate_and_report(self, ping_config, result): for res in result: - super().ping_evaluate_and_report(res[0]) + super().ping_report_and_evaluate(res[0]) self.packet_assert_evaluate_and_report(res[1], res[2])
def get_dev_by_ip(self, netns, ip): diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py index 1b1dec41..964f956b 100644 --- a/lnst/Recipes/ENRT/PingFloodRecipe.py +++ b/lnst/Recipes/ENRT/PingFloodRecipe.py @@ -43,4 +43,4 @@ class PingFloodRecipe(PingTestAndEvaluate): pcfg=PingConf(host1, ip1, host2, ip2, count = cn, interval = iv, size = sz) result = self.ping_test([pcfg]) - self.ping_evaluate_and_report(result) + self.ping_report_and_evaluate(result)
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 0 lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (100%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping/Recipe.py similarity index 100% rename from lnst/RecipeCommon/Ping.py rename to lnst/RecipeCommon/Ping/Recipe.py diff --git a/lnst/RecipeCommon/Ping/__init__.py b/lnst/RecipeCommon/Ping/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 08faa5c4..d5d52bb9 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -7,7 +7,7 @@ from lnst.Common.IpAddress import AF_INET, AF_INET6
from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
-from lnst.RecipeCommon.Ping import PingTestAndEvaluate, PingConf +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate, PingConf from lnst.RecipeCommon.Perf.Recipe import Recipe as PerfRecipe from lnst.RecipeCommon.Perf.Recipe import RecipeConf as PerfRecipeConf from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow diff --git a/lnst/Recipes/ENRT/BasePvPRecipe.py b/lnst/Recipes/ENRT/BasePvPRecipe.py index 34fa2e3d..89e42938 100644 --- a/lnst/Recipes/ENRT/BasePvPRecipe.py +++ b/lnst/Recipes/ENRT/BasePvPRecipe.py @@ -4,7 +4,7 @@ from enum import Enum from lnst.Common.LnstError import LnstError from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress -from lnst.RecipeCommon.Ping import PingTestAndEvaluate +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate from lnst.Tests import Ping
from lnst.RecipeCommon.Perf.Recipe import Recipe as PerfRecipe diff --git a/lnst/Recipes/ENRT/OvS_DPDK_PvP.py b/lnst/Recipes/ENRT/OvS_DPDK_PvP.py index 63a6af45..899057d9 100644 --- a/lnst/Recipes/ENRT/OvS_DPDK_PvP.py +++ b/lnst/Recipes/ENRT/OvS_DPDK_PvP.py @@ -9,7 +9,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Common.Logs import log_exc_traceback from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam from lnst.Common.IpAddress import ipaddress -from lnst.RecipeCommon.Ping import PingTestAndEvaluate, PingConf +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate, PingConf from lnst.Tests import Ping from lnst.Tests.TestPMD import TestPMD
diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py index 964f956b..d5c00ce1 100644 --- a/lnst/Recipes/ENRT/PingFloodRecipe.py +++ b/lnst/Recipes/ENRT/PingFloodRecipe.py @@ -1,7 +1,7 @@ from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam -from lnst.RecipeCommon.Ping import PingConf, PingTestAndEvaluate +from lnst.RecipeCommon.Ping.Recipe import PingConf, PingTestAndEvaluate
class PingFloodRecipe(PingTestAndEvaluate): driver = StrParam(default='ixgbe')
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 0 lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 2 +- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 2 +- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 2 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 2 +- lnst/Recipes/ENRT/SimpleMacsecRecipe.py | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (100%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py
diff --git a/lnst/RecipeCommon/Ping.py b/lnst/RecipeCommon/Ping/Recipe.py similarity index 100% rename from lnst/RecipeCommon/Ping.py rename to lnst/RecipeCommon/Ping/Recipe.py diff --git a/lnst/RecipeCommon/Ping/__init__.py b/lnst/RecipeCommon/Ping/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index 14372d5..9705a66 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -14,7 +14,7 @@ from lnst.Common.IpAddress import AF_INET, AF_INET6
from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
-from lnst.RecipeCommon.Ping import PingTestAndEvaluate, PingConf +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate, PingConf from lnst.RecipeCommon.Perf.Recipe import Recipe as PerfRecipe from lnst.RecipeCommon.Perf.Recipe import RecipeConf as PerfRecipeConf from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow diff --git a/lnst/Recipes/ENRT/BasePvPRecipe.py b/lnst/Recipes/ENRT/BasePvPRecipe.py index 34fa2e3..89e4293 100644 --- a/lnst/Recipes/ENRT/BasePvPRecipe.py +++ b/lnst/Recipes/ENRT/BasePvPRecipe.py @@ -4,7 +4,7 @@ from enum import Enum from lnst.Common.LnstError import LnstError from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress -from lnst.RecipeCommon.Ping import PingTestAndEvaluate +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate from lnst.Tests import Ping
from lnst.RecipeCommon.Perf.Recipe import Recipe as PerfRecipe diff --git a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py index 014891c..71345b3 100644 --- a/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAeadRecipe.py @@ -14,7 +14,7 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( from lnst.RecipeCommon.PacketAssert import (PacketAssertConf, PacketAssertTestAndEvaluate) from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow -from lnst.RecipeCommon.Ping import PingConf +from lnst.RecipeCommon.Ping.Recipe import PingConf from lnst.Recipes.ENRT.XfrmTools import (configure_ipsec_esp_aead, generate_key)
diff --git a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py index eb67e23..6ac4c1f 100644 --- a/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py +++ b/lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py @@ -14,7 +14,7 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( from lnst.RecipeCommon.PacketAssert import (PacketAssertConf, PacketAssertTestAndEvaluate) from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow -from lnst.RecipeCommon.Ping import PingConf +from lnst.RecipeCommon.Ping.Recipe import PingConf from lnst.Recipes.ENRT.XfrmTools import (configure_ipsec_esp_ah_comp, generate_key)
diff --git a/lnst/Recipes/ENRT/OvS_DPDK_PvP.py b/lnst/Recipes/ENRT/OvS_DPDK_PvP.py index 63a6af4..899057d 100644 --- a/lnst/Recipes/ENRT/OvS_DPDK_PvP.py +++ b/lnst/Recipes/ENRT/OvS_DPDK_PvP.py @@ -9,7 +9,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Common.Logs import log_exc_traceback from lnst.Common.Parameters import Param, IntParam, StrParam, BoolParam from lnst.Common.IpAddress import ipaddress -from lnst.RecipeCommon.Ping import PingTestAndEvaluate, PingConf +from lnst.RecipeCommon.Ping.Recipe import PingTestAndEvaluate, PingConf from lnst.Tests import Ping from lnst.Tests.TestPMD import TestPMD
diff --git a/lnst/Recipes/ENRT/PingFloodRecipe.py b/lnst/Recipes/ENRT/PingFloodRecipe.py index 964f956..d5c00ce 100644 --- a/lnst/Recipes/ENRT/PingFloodRecipe.py +++ b/lnst/Recipes/ENRT/PingFloodRecipe.py @@ -1,7 +1,7 @@ from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam -from lnst.RecipeCommon.Ping import PingConf, PingTestAndEvaluate +from lnst.RecipeCommon.Ping.Recipe import PingConf, PingTestAndEvaluate
class PingFloodRecipe(PingTestAndEvaluate): driver = StrParam(default='ixgbe') diff --git a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py index a48d34e..131a62a 100644 --- a/lnst/Recipes/ENRT/SimpleMacsecRecipe.py +++ b/lnst/Recipes/ENRT/SimpleMacsecRecipe.py @@ -12,7 +12,7 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) from lnst.RecipeCommon.Perf.Recipe import RecipeConf as PerfRecipeConf from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow -from lnst.RecipeCommon.Ping import PingConf +from lnst.RecipeCommon.Ping.Recipe import PingConf
class SimpleMacsecRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): host1 = HostReq()
The base class can be later reused to implement non-Perf evaluators.
Signed-off-by: Jan Tluka jtluka@redhat.com --- .../Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} | 2 +- lnst/RecipeCommon/Perf/Evaluators/BaselineEvaluator.py | 4 ++-- lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%)
diff --git a/lnst/RecipeCommon/Perf/Evaluators/BaseEvaluator.py b/lnst/RecipeCommon/BaseResultEvaluator.py similarity index 70% rename from lnst/RecipeCommon/Perf/Evaluators/BaseEvaluator.py rename to lnst/RecipeCommon/BaseResultEvaluator.py index be828412..f8902b9a 100644 --- a/lnst/RecipeCommon/Perf/Evaluators/BaseEvaluator.py +++ b/lnst/RecipeCommon/BaseResultEvaluator.py @@ -1,3 +1,3 @@ -class BaseEvaluator(object): +class BaseResultEvaluator(object): def evaluate_results(self, recipe, results): raise NotImplementedError() diff --git a/lnst/RecipeCommon/Perf/Evaluators/BaselineEvaluator.py b/lnst/RecipeCommon/Perf/Evaluators/BaselineEvaluator.py index 74fb6d37..20e3887a 100644 --- a/lnst/RecipeCommon/Perf/Evaluators/BaselineEvaluator.py +++ b/lnst/RecipeCommon/Perf/Evaluators/BaselineEvaluator.py @@ -1,7 +1,7 @@ -from lnst.RecipeCommon.Perf.Evaluators.BaseEvaluator import BaseEvaluator +from lnst.RecipeCommon.BaseResultEvaluator import BaseResultEvaluator
-class BaselineEvaluator(BaseEvaluator): +class BaselineEvaluator(BaseResultEvaluator): def evaluate_results(self, recipe, results): filtered_results = self.filter_results(recipe, results)
diff --git a/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py b/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py index 86dc146f..0d0921cb 100644 --- a/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py +++ b/lnst/RecipeCommon/Perf/Evaluators/NonzeroFlowEvaluator.py @@ -1,4 +1,4 @@ -from lnst.RecipeCommon.Perf.Evaluators.BaseEvaluator import BaseEvaluator +from lnst.RecipeCommon.BaseResultEvaluator import BaseResultEvaluator
from lnst.RecipeCommon.Perf.Measurements.BaseFlowMeasurement import ( FlowMeasurementResults, @@ -6,7 +6,7 @@ from lnst.RecipeCommon.Perf.Measurements.BaseFlowMeasurement import ( )
-class NonzeroFlowEvaluator(BaseEvaluator): +class NonzeroFlowEvaluator(BaseResultEvaluator): def evaluate_results(self, recipe, results): for flow_results in results: result = True
This patch adds ZeroPassPingEvaluator and RatePingEvaluator evaluators that can be used to evaluate results of Ping test module.
ZeroPassPingEvaluator passes when no packets could be sent. RatePingEvaluator uses the rate reported by the Ping test module and compares with the configured min_rate, max_rate and rate parameters.
Signed-off-by: Jan Tluka jtluka@redhat.com --- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + 3 files changed, 82 insertions(+) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py
diff --git a/lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py b/lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py new file mode 100644 index 00000000..6760d32a --- /dev/null +++ b/lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py @@ -0,0 +1,59 @@ +from lnst.RecipeCommon.BaseResultEvaluator import BaseResultEvaluator + +class RatePingEvaluator(BaseResultEvaluator): + def __init__(self, min_rate=None, max_rate=None, rate=None): + self.min_rate = min_rate + self.max_rate = max_rate + self.rate = rate + + if min_rate is None and max_rate is None and rate is None: + raise Exception('{} requires at least one of min_rate, ' + 'max_rate and rate parameters specified'.format( + self.__class__.__name__) + ) + + def evaluate_results(self, recipe, result): + result_status = True + ping_rate = int(result['rate']) + + result_text = [] + + if self.min_rate is not None: + rate_text = 'measured rate {} is {} than min_rate({})' + if ping_rate < int(self.min_rate): + result_status = False + result_text.append( + rate_text.format(ping_rate, 'less', self.min_rate) + ) + else: + result_text.append( + rate_text.format(ping_rate, 'more', self.min_rate) + ) + + if self.max_rate is not None: + rate_text = 'measured rate {} is {} than max_rate({})' + if ping_rate > int(self.max_rate): + result_status = False + result_text.append( + rate_text.format(ping_rate, 'more', self.max_rate) + ) + else: + result_text.append( + rate_text.format(ping_rate, 'less', self.max_rate) + ) + + if self.rate is not None: + rate_text = 'measured rate {} is {} rate({})'.format( + ping_rate, self.rate) + + if ping_rate != int(self.rate): + result_status = False + result_text.append( + rate_text.format(ping_rate, 'different than', self.rate) + ) + else: + result_text.append( + rate_text.format(ping_rate, 'equal to', self.rate) + ) + + recipe.add_result(result_status, "\n".join(result_text)) diff --git a/lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py b/lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py new file mode 100644 index 00000000..350e157e --- /dev/null +++ b/lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py @@ -0,0 +1,21 @@ +from lnst.RecipeCommon.BaseResultEvaluator import BaseResultEvaluator + +class ZeroPassPingEvaluator(BaseResultEvaluator): + def evaluate_results(self, recipe, result): + result_status = True + trans_packets = int(result['trans_pkts']) + recv_packets = int(result['recv_pkts']) + + if recv_packets > 0: + result_status = False + result_text = [ + 'expected zero packets but {} of {} packets ' + 'were received'.format( + recv_packets, trans_packets) + ] + else: + result_text = ['received {} of {} packets as expected'.format( + recv_packets, trans_packets) + ] + + recipe.add_result(result_status, "\n".join(result_text)) diff --git a/lnst/RecipeCommon/Ping/Evaluators/__init__.py b/lnst/RecipeCommon/Ping/Evaluators/__init__.py new file mode 100644 index 00000000..2270cce7 --- /dev/null +++ b/lnst/RecipeCommon/Ping/Evaluators/__init__.py @@ -0,0 +1,2 @@ +from lnst.RecipeCommon.Ping.Evaluators.ZeroPassPingEvaluator import ZeroPassPingEvaluator +from lnst.RecipeCommon.Ping.Evaluators.RatePingEvaluator import RatePingEvaluator
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping/Recipe.py | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/lnst/RecipeCommon/Ping/Recipe.py b/lnst/RecipeCommon/Ping/Recipe.py index 320e4ac5..2ca86e07 100644 --- a/lnst/RecipeCommon/Ping/Recipe.py +++ b/lnst/RecipeCommon/Ping/Recipe.py @@ -13,6 +13,7 @@ class PingConf(object): self._count = count self._interval = interval self._size = size + self._evaluators = list()
@property def client(self): @@ -46,6 +47,14 @@ class PingConf(object): def size(self, value): self._size = value
+ @property + def evaluators(self): + return self._evaluators + + def register_evaluators(self, evaluators): + self._evaluators = list(evaluators) + + class PingTestAndEvaluate(BaseRecipe): def ping_test(self, ping_config): results = {}
PingEndpoints class can be used to store additional information about the source and destination endpoints passed to the Ping test.
Besides the source and destination IpAddresses it contains a user provided information whether the two endpoints are reachable. This information will be used later in VlanPingEvaluator.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping/PingEndpoints.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py
diff --git a/lnst/RecipeCommon/Ping/PingEndpoints.py b/lnst/RecipeCommon/Ping/PingEndpoints.py new file mode 100644 index 00000000..938dd519 --- /dev/null +++ b/lnst/RecipeCommon/Ping/PingEndpoints.py @@ -0,0 +1,20 @@ +class PingEndpoints(): + def __init__(self, endpoint1, endpoint2, reachable=True): + self.endpoints = [endpoint1, endpoint2] + self.reachable = reachable + + @property + def endpoints(self): + return self._endpoints + + @endpoints.setter + def endpoints(self, endpoints): + self._endpoints = endpoints + + @property + def reachable(self): + return self._reachable + + @reachable.setter + def reachable(self, reachable): + self._reachable = reachable
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 3 ++- lnst/Recipes/ENRT/BondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 ++- lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 ++- lnst/Recipes/ENRT/TeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +++++-- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 11 ++++++++++- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 ++- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- ...irtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 ++- ...VirtualOvsBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 ++- .../VirtualOvsBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 3 ++- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 4 +++- lnst/Recipes/ENRT/VlansRecipe.py | 3 ++- lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 ++++- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 ++- 24 files changed, 96 insertions(+), 29 deletions(-)
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index d5d52bb9..b69ed1f4 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -107,7 +107,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): self.perf_report_and_evaluate(result)
def generate_ping_configurations(self, config): - for endpoint1, endpoint2 in self.generate_ping_endpoints(config): + for endpoints in self.generate_ping_endpoints(config): for ipv in self.params.ip_versions: ip_filter = {} if ipv == "ipv4": @@ -116,6 +116,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): ip_filter.update(family = AF_INET6) ip_filter.update(is_link_local = False)
+ endpoint1, endpoint2 = endpoints.endpoints endpoint1_ips = endpoint1.ips_filter(**ip_filter) endpoint2_ips = endpoint2.ips_filter(**ip_filter)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py index 2757829b..466684cf 100644 --- a/lnst/Recipes/ENRT/BondRecipe.py +++ b/lnst/Recipes/ENRT/BondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BondDevice
class BondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -83,7 +84,7 @@ class BondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.bond0, self.matched.host2.eth0)] + return [PingEndpoints(self.matched.host1.bond0, self.matched.host2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.bond0, self.matched.host2.eth0)] diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py b/lnst/Recipes/ENRT/DoubleBondRecipe.py index c3759283..25f10ac1 100644 --- a/lnst/Recipes/ENRT/DoubleBondRecipe.py +++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BondDevice
class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -90,7 +91,7 @@ class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.bond0, self.matched.host2.bond0)] + return [PingEndpoints(self.matched.host1.bond0, self.matched.host2.bond0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.bond0, self.matched.host2.bond0)] diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py b/lnst/Recipes/ENRT/DoubleTeamRecipe.py index 193b2c41..82762af3 100644 --- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py +++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice
class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -87,8 +88,10 @@ class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.team0), - (self.matched.host2.team0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.team0), + PingEndpoints(self.matched.host2.team0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.team0), diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py index ecddb70a..44cd4b6f 100644 --- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py @@ -3,6 +3,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -89,7 +90,7 @@ class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.int0, self.matched.host2.int0)] + return [PingEndpoints(self.matched.host1.int0, self.matched.host2.int0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.int0, self.matched.host2.int0)] diff --git a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py index 911a9960..06893f67 100644 --- a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py +++ b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py @@ -8,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin, ) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
class SimpleNetworkRecipe( CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe @@ -56,7 +57,7 @@ class SimpleNetworkRecipe( super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.eth0, self.matched.host2.eth0)] + return [PingEndpoints(self.matched.host1.eth0, self.matched.host2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.eth0, self.matched.host2.eth0)] diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py index 2b2594a6..3a30b019 100644 --- a/lnst/Recipes/ENRT/TeamRecipe.py +++ b/lnst/Recipes/ENRT/TeamRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice
class TeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -82,8 +83,10 @@ class TeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.eth0), - (self.matched.host2.eth0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.eth0), + PingEndpoints(self.matched.host2.eth0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.eth0), diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py index 8dfa0ed1..4b66199f 100644 --- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py +++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice from lnst.Devices import BondDevice
@@ -104,8 +105,10 @@ class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.bond0), - (self.matched.host2.bond0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.bond0), + PingEndpoints(self.matched.host2.bond0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.bond0), diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py index c1fc1478..fda03f5a 100644 --- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py @@ -4,6 +4,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -124,7 +125,15 @@ class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) devs = [guest1.eth0, guest2.eth0, guest3.eth0, guest4.eth0] - return combinations(devs, 2) + dev_combinations = combinations(devs, 2) + + return [ + PingEndpoints(comb[0], comb[1], + (comb[0].host, comb[1].host) in [ + (guest1, guest3), (guest2, guest4) + ] + ) for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py index 2a134f87..13eacd03 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -121,7 +122,7 @@ class VirtualBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.guest2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py index ad872799..d557dd57 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import BridgeDevice @@ -106,7 +107,7 @@ class VirtualBridgeVlanInGuestRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py index 6f068b52..52d88dec 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -120,7 +121,7 @@ class VirtualBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.guest2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py index b87aeaf5..728cf06e 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -104,7 +105,7 @@ class VirtualBridgeVlanInHostRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py index 8edf4234..804dc9c7 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py @@ -1,4 +1,5 @@ import logging +from itertools import product from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam @@ -7,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BondDevice from lnst.Devices import BridgeDevice @@ -167,8 +169,20 @@ class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, def generate_ping_endpoints(self, config): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) - return [(guest1.eth0, guest3.eth0), (guest4.eth0, guest2.eth0), - (guest1.eth0, guest4.eth0), (guest3.eth0, guest2.eth0)] + dev_combinations = product( + [guest1.eth0, guest2.eth0], + [guest3.eth0, guest4.eth0] + ) + return [ + PingEndpoints( + comb[0], comb[1], + (comb[0].host, comb[1].host) in [ + (guest1, guest3), + (guest2, guest4) + ] + ) + for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py index 00d95b8f..2bdc0aaf 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -115,7 +116,7 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.guest2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py index 5da0903e..5ca44f87 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -99,7 +100,7 @@ class VirtualOvsBridgeVlanInGuestRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host2.vlan0, self.matched.guest1.vlan0)] + return [PingEndpoints(self.matched.host2.vlan0, self.matched.guest1.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.host2.vlan0, self.matched.guest1.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py index 328b9db8..00720968 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, @@ -97,7 +98,7 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.guest2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py index ea83b156..ee97fa74 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -90,7 +91,7 @@ class VirtualOvsBridgeVlanInHostRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index 7cc9641f..9e2dfa6d 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -1,4 +1,5 @@ import logging +from itertools import product from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam @@ -7,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, @@ -136,8 +138,20 @@ class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, def generate_ping_endpoints(self, config): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) - return [(guest1.eth0, guest3.eth0), (guest4.eth0, guest2.eth0), - (guest1.eth0, guest4.eth0), (guest3.eth0, guest2.eth0)] + dev_combinations = product( + [guest1.eth0, guest2.eth0], + [guest3.eth0, guest4.eth0] + ) + return [ + PingEndpoints( + comb[0], comb[1], + (comb[0].host, comb[1].host) in [ + (guest1, guest3), + (guest2, guest4) + ] + ) + for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py b/lnst/Recipes/ENRT/VlansOverBondRecipe.py index 12ce812d..93c62720 100644 --- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py @@ -9,6 +9,7 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import BondDevice +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): @@ -129,7 +130,7 @@ class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, src.vlan_id == dst.vlan_id)] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py index 679ab35f..a96b6a94 100644 --- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py @@ -6,6 +6,8 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import TeamDevice @@ -126,7 +128,7 @@ class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, src.vlan_id == dst.vlan_id)] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py index 38f1f454..592bc0ac 100644 --- a/lnst/Recipes/ENRT/VlansRecipe.py +++ b/lnst/Recipes/ENRT/VlansRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice
class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -101,7 +102,7 @@ class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, src.vlan_id == dst.vlan_id)] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py index bef96550..235e64e9 100644 --- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py +++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py @@ -4,6 +4,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BridgeDevice, VxlanDevice
class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -100,7 +101,9 @@ class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): host1, host2, guest1 = (self.matched.host1, self.matched.host2, self.matched.guest1) devs = [host1.vxlan0, host2.vxlan0, guest1.vxlan0] - return permutations(devs,2) + dev_permutations = permutations(devs,2) + return [ PingEndpoints(dev_permutation[0], dev_permutation[1]) for + dev_permutation in dev_permutations ]
def generate_perf_endpoints(self, config): host1, host2, guest1 = (self.matched.host1, self.matched.host2, diff --git a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py index 6335e3ac..4978b6dc 100644 --- a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py +++ b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py @@ -3,6 +3,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VxlanDevice
class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -84,7 +85,7 @@ class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.vxlan0, self.matched.host2.vxlan0)] + return [PingEndpoints(self.matched.host1.vxlan0, self.matched.host2.vxlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.vxlan0, self.matched.host2.vxlan0)]
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 3 ++- lnst/Recipes/ENRT/BondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 ++- lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 ++- lnst/Recipes/ENRT/TeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +++++-- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 11 ++++++++++- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 ++- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- ...irtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 ++- ...VirtualOvsBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 ++- .../VirtualOvsBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 4 +++- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 5 ++++- lnst/Recipes/ENRT/VlansRecipe.py | 4 +++- lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 ++++- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 ++- 24 files changed, 99 insertions(+), 29 deletions(-)
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index d5d52bb9..b69ed1f4 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -107,7 +107,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): self.perf_report_and_evaluate(result)
def generate_ping_configurations(self, config): - for endpoint1, endpoint2 in self.generate_ping_endpoints(config): + for endpoints in self.generate_ping_endpoints(config): for ipv in self.params.ip_versions: ip_filter = {} if ipv == "ipv4": @@ -116,6 +116,7 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): ip_filter.update(family = AF_INET6) ip_filter.update(is_link_local = False)
+ endpoint1, endpoint2 = endpoints.endpoints endpoint1_ips = endpoint1.ips_filter(**ip_filter) endpoint2_ips = endpoint2.ips_filter(**ip_filter)
diff --git a/lnst/Recipes/ENRT/BondRecipe.py b/lnst/Recipes/ENRT/BondRecipe.py index 2757829b..466684cf 100644 --- a/lnst/Recipes/ENRT/BondRecipe.py +++ b/lnst/Recipes/ENRT/BondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BondDevice
class BondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -83,7 +84,7 @@ class BondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.bond0, self.matched.host2.eth0)] + return [PingEndpoints(self.matched.host1.bond0, self.matched.host2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.bond0, self.matched.host2.eth0)] diff --git a/lnst/Recipes/ENRT/DoubleBondRecipe.py b/lnst/Recipes/ENRT/DoubleBondRecipe.py index c3759283..25f10ac1 100644 --- a/lnst/Recipes/ENRT/DoubleBondRecipe.py +++ b/lnst/Recipes/ENRT/DoubleBondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BondDevice
class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -90,7 +91,7 @@ class DoubleBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.bond0, self.matched.host2.bond0)] + return [PingEndpoints(self.matched.host1.bond0, self.matched.host2.bond0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.bond0, self.matched.host2.bond0)] diff --git a/lnst/Recipes/ENRT/DoubleTeamRecipe.py b/lnst/Recipes/ENRT/DoubleTeamRecipe.py index 193b2c41..82762af3 100644 --- a/lnst/Recipes/ENRT/DoubleTeamRecipe.py +++ b/lnst/Recipes/ENRT/DoubleTeamRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice
class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -87,8 +88,10 @@ class DoubleTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.team0), - (self.matched.host2.team0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.team0), + PingEndpoints(self.matched.host2.team0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.team0), diff --git a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py index ecddb70a..44cd4b6f 100644 --- a/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py @@ -3,6 +3,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -89,7 +90,7 @@ class NoVirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.int0, self.matched.host2.int0)] + return [PingEndpoints(self.matched.host1.int0, self.matched.host2.int0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.int0, self.matched.host2.int0)] diff --git a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py index 911a9960..06893f67 100644 --- a/lnst/Recipes/ENRT/SimpleNetworkRecipe.py +++ b/lnst/Recipes/ENRT/SimpleNetworkRecipe.py @@ -8,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin, ) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
class SimpleNetworkRecipe( CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe @@ -56,7 +57,7 @@ class SimpleNetworkRecipe( super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.eth0, self.matched.host2.eth0)] + return [PingEndpoints(self.matched.host1.eth0, self.matched.host2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.eth0, self.matched.host2.eth0)] diff --git a/lnst/Recipes/ENRT/TeamRecipe.py b/lnst/Recipes/ENRT/TeamRecipe.py index 2b2594a6..3a30b019 100644 --- a/lnst/Recipes/ENRT/TeamRecipe.py +++ b/lnst/Recipes/ENRT/TeamRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice
class TeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -82,8 +83,10 @@ class TeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.eth0), - (self.matched.host2.eth0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.eth0), + PingEndpoints(self.matched.host2.eth0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.eth0), diff --git a/lnst/Recipes/ENRT/TeamVsBondRecipe.py b/lnst/Recipes/ENRT/TeamVsBondRecipe.py index 8dfa0ed1..4b66199f 100644 --- a/lnst/Recipes/ENRT/TeamVsBondRecipe.py +++ b/lnst/Recipes/ENRT/TeamVsBondRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import TeamDevice from lnst.Devices import BondDevice
@@ -104,8 +105,10 @@ class TeamVsBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.team0, self.matched.host2.bond0), - (self.matched.host2.bond0, self.matched.host1.team0)] + return [ + PingEndpoints(self.matched.host1.team0, self.matched.host2.bond0), + PingEndpoints(self.matched.host2.bond0, self.matched.host1.team0) + ]
def generate_perf_endpoints(self, config): return [(self.matched.host1.team0, self.matched.host2.bond0), diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py index c1fc1478..f038af21 100644 --- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py @@ -4,6 +4,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -124,7 +125,15 @@ class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) devs = [guest1.eth0, guest2.eth0, guest3.eth0, guest4.eth0] - return combinations(devs, 2) + dev_combinations = combinations(devs, 2) + + return [ + PingEndpoints(comb[0], comb[1], + reachable=((comb[0].host, comb[1].host) in [ + (guest1, guest3), (guest2, guest4) + ]) + ) for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py index 2a134f87..13eacd03 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -121,7 +122,7 @@ class VirtualBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.guest2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py index ad872799..d557dd57 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInGuestRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import BridgeDevice @@ -106,7 +107,7 @@ class VirtualBridgeVlanInGuestRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py index 6f068b52..52d88dec 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -120,7 +121,7 @@ class VirtualBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.guest2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py index b87aeaf5..728cf06e 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlanInHostRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BridgeDevice
@@ -104,7 +105,7 @@ class VirtualBridgeVlanInHostRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py index 8edf4234..0115bbfc 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py @@ -1,4 +1,5 @@ import logging +from itertools import product from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam @@ -7,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BondDevice from lnst.Devices import BridgeDevice @@ -167,8 +169,20 @@ class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, def generate_ping_endpoints(self, config): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) - return [(guest1.eth0, guest3.eth0), (guest4.eth0, guest2.eth0), - (guest1.eth0, guest4.eth0), (guest3.eth0, guest2.eth0)] + dev_combinations = product( + [guest1.eth0, guest2.eth0], + [guest3.eth0, guest4.eth0] + ) + return [ + PingEndpoints( + comb[0], comb[1], + reachable=((comb[0].host, comb[1].host) in [ + (guest1, guest3), + (guest2, guest4) + ]) + ) + for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py index 00d95b8f..2bdc0aaf 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -115,7 +116,7 @@ class VirtualOvsBridgeVlanInGuestMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] + return [PingEndpoints(self.matched.guest1.vlan0, self.matched.guest2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.vlan0, self.matched.guest2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py index 5da0903e..5ca44f87 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInGuestRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -99,7 +100,7 @@ class VirtualOvsBridgeVlanInGuestRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host2.vlan0, self.matched.guest1.vlan0)] + return [PingEndpoints(self.matched.host2.vlan0, self.matched.guest1.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.host2.vlan0, self.matched.guest1.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py index 328b9db8..00720968 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostMirroredRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, @@ -97,7 +98,7 @@ class VirtualOvsBridgeVlanInHostMirroredRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.guest2.eth0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest2.eth0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py index ea83b156..ee97fa74 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlanInHostRecipe.py @@ -7,6 +7,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import OvsBridgeDevice
@@ -90,7 +91,7 @@ class VirtualOvsBridgeVlanInHostRecipe(CommonHWSubConfigMixin, super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] + return [PingEndpoints(self.matched.guest1.eth0, self.matched.host2.vlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.host2.vlan0)] diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index 7cc9641f..ea50b293 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -1,4 +1,5 @@ import logging +from itertools import product from lnst.Common.Parameters import Param, IntParam, StrParam from lnst.Common.IpAddress import ipaddress from lnst.Controller import HostReq, DeviceReq, RecipeParam @@ -7,6 +8,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, @@ -136,8 +138,20 @@ class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, def generate_ping_endpoints(self, config): guest1, guest2, guest3, guest4 = (self.matched.guest1, self.matched.guest2, self.matched.guest3, self.matched.guest4) - return [(guest1.eth0, guest3.eth0), (guest4.eth0, guest2.eth0), - (guest1.eth0, guest4.eth0), (guest3.eth0, guest2.eth0)] + dev_combinations = product( + [guest1.eth0, guest2.eth0], + [guest3.eth0, guest4.eth0] + ) + return [ + PingEndpoints( + comb[0], comb[1], + reachable=((comb[0].host, comb[1].host) in [ + (guest1, guest3), + (guest2, guest4) + ]) + ) + for comb in dev_combinations + ]
def generate_perf_endpoints(self, config): return [(self.matched.guest1.eth0, self.matched.guest3.eth0)] diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py b/lnst/Recipes/ENRT/VlansOverBondRecipe.py index 12ce812d..0eeaeb46 100644 --- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py @@ -9,6 +9,7 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import BondDevice +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): @@ -129,7 +130,8 @@ class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, + reachable=(src.vlan_id == dst.vlan_id))] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py index 679ab35f..a2a598b0 100644 --- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py @@ -6,6 +6,8 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import TeamDevice @@ -126,7 +128,8 @@ class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, + reachable=(src.vlan_id == dst.vlan_id))] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py index 38f1f454..cebb15f5 100644 --- a/lnst/Recipes/ENRT/VlansRecipe.py +++ b/lnst/Recipes/ENRT/VlansRecipe.py @@ -6,6 +6,7 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice
class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @@ -101,7 +102,8 @@ class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, result = [] for src in [host1.vlan0, host1.vlan1, host1.vlan2]: for dst in [host2.vlan0, host2.vlan1, host2.vlan2]: - result += [(src, dst)] + result += [PingEndpoints(src, dst, + reachable=(src.vlan_id == dst.vlan_id))] return result
def generate_perf_endpoints(self, config): diff --git a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py index bef96550..235e64e9 100644 --- a/lnst/Recipes/ENRT/VxlanMulticastRecipe.py +++ b/lnst/Recipes/ENRT/VxlanMulticastRecipe.py @@ -4,6 +4,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import BridgeDevice, VxlanDevice
class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -100,7 +101,9 @@ class VxlanMulticastRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): host1, host2, guest1 = (self.matched.host1, self.matched.host2, self.matched.guest1) devs = [host1.vxlan0, host2.vxlan0, guest1.vxlan0] - return permutations(devs,2) + dev_permutations = permutations(devs,2) + return [ PingEndpoints(dev_permutation[0], dev_permutation[1]) for + dev_permutation in dev_permutations ]
def generate_perf_endpoints(self, config): host1, host2, guest1 = (self.matched.host1, self.matched.host2, diff --git a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py index 6335e3ac..4978b6dc 100644 --- a/lnst/Recipes/ENRT/VxlanRemoteRecipe.py +++ b/lnst/Recipes/ENRT/VxlanRemoteRecipe.py @@ -3,6 +3,7 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VxlanDevice
class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): @@ -84,7 +85,7 @@ class VxlanRemoteRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): super().test_wide_deconfiguration(config)
def generate_ping_endpoints(self, config): - return [(self.matched.host1.vxlan0, self.matched.host2.vxlan0)] + return [PingEndpoints(self.matched.host1.vxlan0, self.matched.host2.vxlan0)]
def generate_perf_endpoints(self, config): return [(self.matched.host1.vxlan0, self.matched.host2.vxlan0)]
On Thu, Apr 02, 2020 at 04:36:05PM +0200, Jan Tluka wrote:
Signed-off-by: Jan Tluka jtluka@redhat.com
lnst/Recipes/ENRT/BaseEnrtRecipe.py | 3 ++- lnst/Recipes/ENRT/BondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 ++- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 ++- lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 ++- lnst/Recipes/ENRT/TeamRecipe.py | 7 +++++-- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +++++-- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 11 ++++++++++- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 ++- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 ++- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- ...irtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 ++- ...VirtualOvsBridgeVlanInHostMirroredRecipe.py | 3 ++- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 ++- .../VirtualOvsBridgeVlansOverBondRecipe.py | 18 ++++++++++++++++-- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 4 +++- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 5 ++++- lnst/Recipes/ENRT/VlansRecipe.py | 4 +++- lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 ++++- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 ++- 24 files changed, 99 insertions(+), 29 deletions(-)
Ack to series with this fixed patch.
-Ondrej
Unless the generate_ping_evaluators() method is overriden, the default Ping evaluator will be set to RatePingEvaluator with the minimum ping rate of 50%.
v2:
I moved the registration of default Ping evaluator to separate class method because individual classes may need specific evaluators for specific Ping configurations.
v3:
Rename of get_ping_evaluators() to generate_ping_evaluators(). The method now takes also instance of PingEndpoints class.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/BaseEnrtRecipe.py | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/lnst/Recipes/ENRT/BaseEnrtRecipe.py b/lnst/Recipes/ENRT/BaseEnrtRecipe.py index b69ed1f4..f8e6a57a 100644 --- a/lnst/Recipes/ENRT/BaseEnrtRecipe.py +++ b/lnst/Recipes/ENRT/BaseEnrtRecipe.py @@ -14,6 +14,7 @@ from lnst.RecipeCommon.Perf.Measurements import Flow as PerfFlow from lnst.RecipeCommon.Perf.Measurements import IperfFlowMeasurement from lnst.RecipeCommon.Perf.Measurements import StatCPUMeasurement from lnst.RecipeCommon.Perf.Evaluators import NonzeroFlowEvaluator +from lnst.RecipeCommon.Ping.Evaluators import RatePingEvaluator
class EnrtConfiguration(object): pass @@ -134,6 +135,10 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): size = self.params.ping_psize, )
+ ping_evaluators = self.generate_ping_evaluators( + pconf, endpoints) + pconf.register_evaluators(ping_evaluators) + ping_conf_list.append(pconf)
if self.params.ping_bidirect: @@ -147,6 +152,9 @@ class BaseEnrtRecipe(BaseSubConfigMixin, PingTestAndEvaluate, PerfRecipe): def generate_ping_endpoints(self, config): return []
+ def generate_ping_evaluators(self, pconf, endpoints): + return [RatePingEvaluator(min_rate=50)] + def generate_perf_configurations(self, config): for flows in self.generate_flow_combinations(config): perf_recipe_conf=dict(
The report part will now add result about the ping command status. The evaluation part will be handled separately by configured Ping evaluators.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/RecipeCommon/Ping/Recipe.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/lnst/RecipeCommon/Ping/Recipe.py b/lnst/RecipeCommon/Ping/Recipe.py index 2ca86e07..128d7356 100644 --- a/lnst/RecipeCommon/Ping/Recipe.py +++ b/lnst/RecipeCommon/Ping/Recipe.py @@ -72,7 +72,7 @@ class PingTestAndEvaluate(BaseRecipe): pingjob.kill()
for pingconf, pingjob in ping_array: - result = pingjob.result + result = (pingjob.passed, pingjob.result) results[pingconf] = result
return results @@ -88,15 +88,20 @@ class PingTestAndEvaluate(BaseRecipe): self.single_ping_report_and_evaluate(pingconf, result)
def single_ping_report_and_evaluate(self, ping_config, result): + self.single_ping_report(ping_config, result) + + self.single_ping_evaluate(ping_config, result) + + def single_ping_report(self, ping_config, result): fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ "<{0.destination.hostid} ({0.destination_address})>" description = fmt.format(ping_config) - if result["rate"] > 50: - message = "Ping successful --- " + description - self.add_result(True, message, result) - else: - message = "Ping unsuccessful --- " + description - self.add_result(False, message, result) + message = "Ping result --- " + description + self.add_result(result[0], message, result[1]) + + def single_ping_evaluate(self, ping_config, result): + for evaluator in ping_config.evaluators: + evaluator.evaluate_results(self, result[1])
def _generate_ping_kwargs(self, ping_config): kwargs = dict(dst=ping_config.destination_address,
These mixins will be used to override the default Ping evaluator of the BaseEnrtRecipe class.
The module provides VlanPingEvaluator mixin that will be used in all vlan-like (e.g. VLAN, VXLAN) tests where we try to ping from a vlan to another one that is meant to be unreachable.
v3: * remove PingConditionMixin completely
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++++++++++++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
diff --git a/lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py b/lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py new file mode 100644 index 00000000..26158bdb --- /dev/null +++ b/lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py @@ -0,0 +1,13 @@ +from lnst.RecipeCommon.Ping.Evaluators import ( + ZeroPassPingEvaluator, RatePingEvaluator) + +class PingEvaluatorMixin(object): + def generate_ping_evaluators(self, ping_config, endpoints): + pass + +class VlanPingEvaluatorMixin(PingEvaluatorMixin): + def generate_ping_evaluators(self, ping_config, endpoints): + if endpoints.reachable: + return [RatePingEvaluator(min_rate=50)] + else: + return [ZeroPassPingEvaluator()] diff --git a/lnst/Recipes/ENRT/PingMixins/__init__.py b/lnst/Recipes/ENRT/PingMixins/__init__.py new file mode 100644 index 00000000..a536dbee --- /dev/null +++ b/lnst/Recipes/ENRT/PingMixins/__init__.py @@ -0,0 +1,3 @@ +from lnst.Recipes.ENRT.PingMixins.PingEvaluatorMixins import ( + VlanPingEvaluatorMixin, + )
This patch removes some code duplicity by using code from the base and Ping mixin classes.
For pings within the vlan the RatePingEvaluator is used, for cross-vlan ping the ZeroPassPingEvaluator is used.
Signed-off-by: Jan Tluka jtluka@redhat.com --- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 66 +----------------- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 68 +------------------ .../VirtualOvsBridgeVlansOverBondRecipe.py | 68 +------------------ lnst/Recipes/ENRT/VlansOverBondRecipe.py | 60 +--------------- lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 60 +--------------- lnst/Recipes/ENRT/VlansRecipe.py | 60 +--------------- 6 files changed, 18 insertions(+), 364 deletions(-)
diff --git a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py index fda03f5a..e7fcee1d 100644 --- a/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py +++ b/lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py @@ -4,10 +4,12 @@ from lnst.Controller import HostReq, DeviceReq, RecipeParam from lnst.Recipes.ENRT.BaseEnrtRecipe import BaseEnrtRecipe from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
-class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): +class VirtOvsVxlanRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="to_switch", driver=RecipeParam("driver")) host1.tap0 = DeviceReq(label="to_guest1") @@ -155,68 +157,6 @@ class VirtOvsVxlanRecipe(CommonHWSubConfigMixin, BaseEnrtRecipe): def parallel_stream_qdisc_hw_config_dev_list(self): return [self.matched.host1.eth0, self.matched.host2.eth0]
- def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations(recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.tun_id_match(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def tun_id_match(self, src_addr, dst_addr): - guest1, guest2, guest3, guest4 = (self.matched.guest1, - self.matched.guest2, self.matched.guest3, self.matched.guest4) - - matching_pairs = [] - for pair in [(guest1, guest3), (guest2, guest4)]: - matching_pairs.extend([pair, pair[::-1]]) - - devs = [] - for dev in (guest1.devices + guest2.devices + guest3.devices + - guest4.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return (devs[0].host, devs[1].host) not in matching_pairs - except IndexError: - return False - def hw_config(self, config): host1, host2, guest1, guest2, guest3, guest4 = (self.matched.host1, self.matched.host2, self.matched.guest1, self.matched.guest2, diff --git a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py index 804dc9c7..6b45e678 100644 --- a/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualBridgeVlansOverBondRecipe.py @@ -8,13 +8,14 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices import BondDevice from lnst.Devices import BridgeDevice
-class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, - OffloadSubConfigMixin, BaseEnrtRecipe): +class VirtualBridgeVlansOverBondRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="to_switch", driver=RecipeParam("driver")) host1.eth1 = DeviceReq(label="to_switch", driver=RecipeParam("driver")) @@ -195,69 +196,6 @@ class VirtualBridgeVlansOverBondRecipe(CommonHWSubConfigMixin,
self.ctl.wait_for_condition(condition, timeout=5)
- def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations( - recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.vlan_id_match(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def vlan_id_match(self, src_addr, dst_addr): - guest1, guest2, guest3, guest4 = (self.matched.guest1, - self.matched.guest2, self.matched.guest3, self.matched.guest4) - - matching_pairs = [] - for pair in [(guest1, guest3), (guest2, guest4)]: - matching_pairs.extend([pair, pair[::-1]]) - - devs = [] - for dev in (guest1.devices + guest2.devices + guest3.devices + - guest4.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return (devs[0].host, devs[1].host) not in matching_pairs - except IndexError: - return False - @property def offload_nics(self): host1, host2, guest1, guest2, guest3, guest4 = (self.matched.host1, diff --git a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py index 9e2dfa6d..45f59d07 100644 --- a/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VirtualOvsBridgeVlansOverBondRecipe.py @@ -8,11 +8,12 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import OvsBridgeDevice
-class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, - OffloadSubConfigMixin, BaseEnrtRecipe): +class VirtualOvsBridgeVlansOverBondRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="to_switch", driver=RecipeParam("driver")) host1.eth1 = DeviceReq(label="to_switch", driver=RecipeParam("driver")) @@ -198,66 +199,3 @@ class VirtualOvsBridgeVlansOverBondRecipe(CommonHWSubConfigMixin, def parallel_stream_qdisc_hw_config_dev_list(self): return [self.matched.host1.eth0, self.matched.host1.eth1, self.matched.host2.eth0, self.matched.host2.eth1] - - def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations( - recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.vlan_id_match(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def vlan_id_match(self, src_addr, dst_addr): - guest1, guest2, guest3, guest4 = (self.matched.guest1, - self.matched.guest2, self.matched.guest3, self.matched.guest4) - - matching_pairs = [] - for pair in [(guest1, guest3), (guest2, guest4)]: - matching_pairs.extend([pair, pair[::-1]]) - - devs = [] - for dev in (guest1.devices + guest2.devices + guest3.devices + - guest4.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return (devs[0].host, devs[1].host) not in matching_pairs - except IndexError: - return False diff --git a/lnst/Recipes/ENRT/VlansOverBondRecipe.py b/lnst/Recipes/ENRT/VlansOverBondRecipe.py index 93c62720..69357d94 100644 --- a/lnst/Recipes/ENRT/VlansOverBondRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverBondRecipe.py @@ -9,9 +9,11 @@ from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import BondDevice +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints
-class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, +class VlansOverBondRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver")) @@ -173,59 +175,3 @@ class VlansOverBondRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, def parallel_stream_qdisc_hw_config_dev_list(self): host1, host2 = self.matched.host1, self.matched.host2 return [host1.eth0, host1.eth1, host2.eth0] - - def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations( - recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.vlan_id_same(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def vlan_id_same(self, src_addr, dst_addr): - host1, host2 = self.matched.host1, self.matched.host2 - devs = [] - for dev in (host1.devices + host2.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return devs[0].vlan_id != devs[1].vlan_id - except (IndexError, AttributeError): - return False diff --git a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py index a96b6a94..1ed41312 100644 --- a/lnst/Recipes/ENRT/VlansOverTeamRecipe.py +++ b/lnst/Recipes/ENRT/VlansOverTeamRecipe.py @@ -11,8 +11,10 @@ from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice from lnst.Devices.VlanDevice import VlanDevice as Vlan from lnst.Devices import TeamDevice +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin
-class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, +class VlansOverTeamRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="tnet", driver=RecipeParam("driver")) @@ -171,59 +173,3 @@ class VlansOverTeamRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, def parallel_stream_qdisc_hw_config_dev_list(self): host1, host2 = self.matched.host1, self.matched.host2 return [host1.eth0, host1.eth1, host2.eth0] - - def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations( - recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.vlan_id_same(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def vlan_id_same(self, src_addr, dst_addr): - host1, host2 = self.matched.host1, self.matched.host2 - devs = [] - for dev in (host1.devices + host2.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return devs[0].vlan_id != devs[1].vlan_id - except (IndexError, AttributeError): - return False diff --git a/lnst/Recipes/ENRT/VlansRecipe.py b/lnst/Recipes/ENRT/VlansRecipe.py index 592bc0ac..ddaf1033 100644 --- a/lnst/Recipes/ENRT/VlansRecipe.py +++ b/lnst/Recipes/ENRT/VlansRecipe.py @@ -6,10 +6,12 @@ from lnst.Recipes.ENRT.ConfigMixins.OffloadSubConfigMixin import ( OffloadSubConfigMixin) from lnst.Recipes.ENRT.ConfigMixins.CommonHWSubConfigMixin import ( CommonHWSubConfigMixin) +from lnst.Recipes.ENRT.PingMixins import VlanPingEvaluatorMixin from lnst.RecipeCommon.Ping.PingEndpoints import PingEndpoints from lnst.Devices import VlanDevice
-class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, +class VlansRecipe(VlanPingEvaluatorMixin, + CommonHWSubConfigMixin, OffloadSubConfigMixin, BaseEnrtRecipe): host1 = HostReq() host1.eth0 = DeviceReq(label="net1", driver=RecipeParam("driver")) @@ -139,59 +141,3 @@ class VlansRecipe(CommonHWSubConfigMixin, OffloadSubConfigMixin, @property def parallel_stream_qdisc_hw_config_dev_list(self): return [self.matched.host1.eth0, self.matched.host2.eth0] - - def do_ping_tests(self, recipe_config): - for ping_config in self.generate_ping_configurations( - recipe_config): - exp_fail = [] - for pconf in ping_config: - cond = self.vlan_id_same(pconf.client_bind, - pconf.destination_address) - exp_fail.append(cond) - result = self.ping_test(ping_config, exp_fail) - self.ping_evaluate_and_report(result) - - def ping_test(self, ping_config, exp_fail): - results = {} - - running_ping_array = [] - for pingconf, fail in zip(ping_config, exp_fail): - ping, client = self.ping_init(pingconf) - running_ping = client.prepare_job(ping, fail=fail) - running_ping.start(bg = True) - running_ping_array.append((pingconf, running_ping)) - - for _, pingjob in running_ping_array: - try: - pingjob.wait() - finally: - pingjob.kill() - - for pingconf, pingjob in running_ping_array: - result = pingjob.result - passed = pingjob.passed - results[pingconf] = (result, passed) - - return results - - def single_ping_evaluate_and_report(self, ping_config, result): - fmt = "From: <{0.client.hostid} ({0.client_bind})> To: " \ - "<{0.destination.hostid} ({0.destination_address})>" - description = fmt.format(ping_config) - if result[0].get("rate", 0) > 50: - message = "Ping successful --- " + description - self.add_result(result[1], message, result[0]) - else: - message = "Ping unsuccessful --- " + description - self.add_result(result[1], message, result[0]) - - def vlan_id_same(self, src_addr, dst_addr): - host1, host2 = self.matched.host1, self.matched.host2 - devs = [] - for dev in (host1.devices + host2.devices): - if src_addr in dev.ips or dst_addr in dev.ips: - devs.append(dev) - try: - return devs[0].vlan_id != devs[1].vlan_id - except (IndexError, AttributeError): - return False
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@redhat.com --- 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 f8e6a57a..f9b09ce8 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()
On Fri, Mar 27, 2020 at 06:46:35PM +0100, Jan Tluka wrote:
This is a series of patches that attempts to remove the duplicated code in Recipes/ENRT in case of cross-vlan ping runs.
The changes include:
- split of ping command execution and evaluation of results
- introducing two basic Ping evaluators
- replacing the duplicated code in Recipes/ENRT with the new reusable code
v2:
- fixed a whitespace error
- moved Perf BaseEvaluator to BaseResultEvaluator
- used plural for ping_confing argument in ping_test()
- instead of overriding the do_ping_tests base class method I added few mixin classes that do the same thing in even more reusable way
- be aware of additional patches compared to previous v1
v3:
- renamed get_ping_evaluators to generate_ping_evaluators
- added PingEndpoints class that holds the information whether the endpoints are reachable
- removed PingConditionMixin because PingEndpoints provides the needed information about endpoint reachability
Jan Tluka (17): RecipeCommon.Ping: rename running_ping to ping RecipeCommon.Ping: move prepare_job to ping_init RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report Tests.Ping: update failure logic Tests.Ping: do not check rtt data if no packets were received RecipeCommon.Ping: rename ping_evaluate_and_report method lnst.RecipeCommon: move Ping Recipe to separate directory lnst.RecipeCommon: rename Perf BaseEvaluator to BaseResultEvaluator lnst.RecipeCommon.Ping: add Ping evaluators RecipeCommon.Ping.Recipe: add evaluators to PingConf object lnst.RecipeCommon.Ping: add PingEndpoints class Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations Recipes.ENRT.BaseEnrtRecipe: register default PingEvaluator RecipeCommon.Ping.Recipe: split report and evaluate lnst.Recipes.ENRT: add PingMixins lnst.Recipes.ENRT: use PingMixins to override Ping evaluators lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test
...aseEvaluator.py => BaseResultEvaluator.py} | 2 +- .../Perf/Evaluators/BaselineEvaluator.py | 4 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 4 +- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + lnst/RecipeCommon/Ping/PingEndpoints.py | 20 +++++ lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 55 +++++++----- lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 19 ++-- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/BondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 16 ++-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 26 +++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 4 +- .../ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 + lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 +- lnst/Recipes/ENRT/TeamRecipe.py | 7 +- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 77 +++-------------- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 +- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 +- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 86 ++++--------------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 +- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +- .../VirtualOvsBridgeVlansOverBondRecipe.py | 86 ++++--------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 64 ++------------ lnst/Recipes/ENRT/VlansRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 +- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 +- lnst/Tests/Ping.py | 20 ++--- 41 files changed, 317 insertions(+), 459 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (63%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
-- 2.21.1 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Looks good I think. One question though, I don't see reachable=False being used anywhere. So that means that we'll still only use the RatePingEvaluator in practice? Am I missing something, is that intentional?
-Ondrej
Thu, Apr 02, 2020 at 01:48:21PM CEST, olichtne@redhat.com wrote:
On Fri, Mar 27, 2020 at 06:46:35PM +0100, Jan Tluka wrote:
This is a series of patches that attempts to remove the duplicated code in Recipes/ENRT in case of cross-vlan ping runs.
The changes include:
- split of ping command execution and evaluation of results
- introducing two basic Ping evaluators
- replacing the duplicated code in Recipes/ENRT with the new reusable code
v2:
- fixed a whitespace error
- moved Perf BaseEvaluator to BaseResultEvaluator
- used plural for ping_confing argument in ping_test()
- instead of overriding the do_ping_tests base class method I added few mixin classes that do the same thing in even more reusable way
- be aware of additional patches compared to previous v1
v3:
- renamed get_ping_evaluators to generate_ping_evaluators
- added PingEndpoints class that holds the information whether the endpoints are reachable
- removed PingConditionMixin because PingEndpoints provides the needed information about endpoint reachability
Jan Tluka (17): RecipeCommon.Ping: rename running_ping to ping RecipeCommon.Ping: move prepare_job to ping_init RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report Tests.Ping: update failure logic Tests.Ping: do not check rtt data if no packets were received RecipeCommon.Ping: rename ping_evaluate_and_report method lnst.RecipeCommon: move Ping Recipe to separate directory lnst.RecipeCommon: rename Perf BaseEvaluator to BaseResultEvaluator lnst.RecipeCommon.Ping: add Ping evaluators RecipeCommon.Ping.Recipe: add evaluators to PingConf object lnst.RecipeCommon.Ping: add PingEndpoints class Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations Recipes.ENRT.BaseEnrtRecipe: register default PingEvaluator RecipeCommon.Ping.Recipe: split report and evaluate lnst.Recipes.ENRT: add PingMixins lnst.Recipes.ENRT: use PingMixins to override Ping evaluators lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test
...aseEvaluator.py => BaseResultEvaluator.py} | 2 +- .../Perf/Evaluators/BaselineEvaluator.py | 4 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 4 +- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + lnst/RecipeCommon/Ping/PingEndpoints.py | 20 +++++ lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 55 +++++++----- lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 19 ++-- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/BondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 16 ++-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 26 +++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 4 +- .../ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 + lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 +- lnst/Recipes/ENRT/TeamRecipe.py | 7 +- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 77 +++-------------- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 +- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 +- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 86 ++++--------------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 +- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +- .../VirtualOvsBridgeVlansOverBondRecipe.py | 86 ++++--------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 64 ++------------ lnst/Recipes/ENRT/VlansRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 +- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 +- lnst/Tests/Ping.py | 20 ++--- 41 files changed, 317 insertions(+), 459 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (63%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
-- 2.21.1 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Looks good I think. One question though, I don't see reachable=False being used anywhere. So that means that we'll still only use the RatePingEvaluator in practice? Am I missing something, is that intentional?
-Ondrej
It's used in this patch: [PATCH v3 12/17] Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations
For example VlansRecipe.
However I did not explicitly wrote reachable=*, but instead put a condition that either returns True/False. I guess I should make this explicit instead as it may be more clear.
-Jan
On Thu, Apr 02, 2020 at 03:07:02PM +0200, Jan Tluka wrote:
Thu, Apr 02, 2020 at 01:48:21PM CEST, olichtne@redhat.com wrote:
On Fri, Mar 27, 2020 at 06:46:35PM +0100, Jan Tluka wrote:
This is a series of patches that attempts to remove the duplicated code in Recipes/ENRT in case of cross-vlan ping runs.
The changes include:
- split of ping command execution and evaluation of results
- introducing two basic Ping evaluators
- replacing the duplicated code in Recipes/ENRT with the new reusable code
v2:
- fixed a whitespace error
- moved Perf BaseEvaluator to BaseResultEvaluator
- used plural for ping_confing argument in ping_test()
- instead of overriding the do_ping_tests base class method I added few mixin classes that do the same thing in even more reusable way
- be aware of additional patches compared to previous v1
v3:
- renamed get_ping_evaluators to generate_ping_evaluators
- added PingEndpoints class that holds the information whether the endpoints are reachable
- removed PingConditionMixin because PingEndpoints provides the needed information about endpoint reachability
Jan Tluka (17): RecipeCommon.Ping: rename running_ping to ping RecipeCommon.Ping: move prepare_job to ping_init RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report Tests.Ping: update failure logic Tests.Ping: do not check rtt data if no packets were received RecipeCommon.Ping: rename ping_evaluate_and_report method lnst.RecipeCommon: move Ping Recipe to separate directory lnst.RecipeCommon: rename Perf BaseEvaluator to BaseResultEvaluator lnst.RecipeCommon.Ping: add Ping evaluators RecipeCommon.Ping.Recipe: add evaluators to PingConf object lnst.RecipeCommon.Ping: add PingEndpoints class Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations Recipes.ENRT.BaseEnrtRecipe: register default PingEvaluator RecipeCommon.Ping.Recipe: split report and evaluate lnst.Recipes.ENRT: add PingMixins lnst.Recipes.ENRT: use PingMixins to override Ping evaluators lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test
...aseEvaluator.py => BaseResultEvaluator.py} | 2 +- .../Perf/Evaluators/BaselineEvaluator.py | 4 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 4 +- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + lnst/RecipeCommon/Ping/PingEndpoints.py | 20 +++++ lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 55 +++++++----- lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 19 ++-- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/BondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 16 ++-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 26 +++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 4 +- .../ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 + lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 +- lnst/Recipes/ENRT/TeamRecipe.py | 7 +- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 77 +++-------------- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 +- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 +- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 86 ++++--------------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 +- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +- .../VirtualOvsBridgeVlansOverBondRecipe.py | 86 ++++--------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 64 ++------------ lnst/Recipes/ENRT/VlansRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 +- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 +- lnst/Tests/Ping.py | 20 ++--- 41 files changed, 317 insertions(+), 459 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (63%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
-- 2.21.1 _______________________________________________ LNST-developers mailing list -- lnst-developers@lists.fedorahosted.org To unsubscribe send an email to lnst-developers-leave@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/lnst-developers@lists.fedorahos...
Looks good I think. One question though, I don't see reachable=False being used anywhere. So that means that we'll still only use the RatePingEvaluator in practice? Am I missing something, is that intentional?
-Ondrej
It's used in this patch: [PATCH v3 12/17] Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations
For example VlansRecipe.
However I did not explicitly wrote reachable=*, but instead put a condition that either returns True/False. I guess I should make this explicit instead as it may be more clear.
-Jan
Ah I see... yeah, I think actually adding reachable=(condition) would look better.
-Ondrej
Thu, Apr 02, 2020 at 03:26:43PM CEST, olichtne@redhat.com wrote:
On Thu, Apr 02, 2020 at 03:07:02PM +0200, Jan Tluka wrote:
Thu, Apr 02, 2020 at 01:48:21PM CEST, olichtne@redhat.com wrote:
Looks good I think. One question though, I don't see reachable=False being used anywhere. So that means that we'll still only use the RatePingEvaluator in practice? Am I missing something, is that intentional?
-Ondrej
It's used in this patch: [PATCH v3 12/17] Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations
For example VlansRecipe.
However I did not explicitly wrote reachable=*, but instead put a condition that either returns True/False. I guess I should make this explicit instead as it may be more clear.
-Jan
Ah I see... yeah, I think actually adding reachable=(condition) would look better.
-Ondrej
I sent a fix for the patch as a reply to that patch.
-Jan
Fri, Mar 27, 2020 at 06:46:35PM CET, jtluka@redhat.com wrote:
This is a series of patches that attempts to remove the duplicated code in Recipes/ENRT in case of cross-vlan ping runs.
The changes include:
- split of ping command execution and evaluation of results
- introducing two basic Ping evaluators
- replacing the duplicated code in Recipes/ENRT with the new reusable code
v2:
- fixed a whitespace error
- moved Perf BaseEvaluator to BaseResultEvaluator
- used plural for ping_confing argument in ping_test()
- instead of overriding the do_ping_tests base class method I added few mixin classes that do the same thing in even more reusable way
- be aware of additional patches compared to previous v1
v3:
- renamed get_ping_evaluators to generate_ping_evaluators
- added PingEndpoints class that holds the information whether the endpoints are reachable
- removed PingConditionMixin because PingEndpoints provides the needed information about endpoint reachability
Jan Tluka (17): RecipeCommon.Ping: rename running_ping to ping RecipeCommon.Ping: move prepare_job to ping_init RecipeCommon.Ping: remove ping_config from ping_evaluate_and_report Tests.Ping: update failure logic Tests.Ping: do not check rtt data if no packets were received RecipeCommon.Ping: rename ping_evaluate_and_report method lnst.RecipeCommon: move Ping Recipe to separate directory lnst.RecipeCommon: rename Perf BaseEvaluator to BaseResultEvaluator lnst.RecipeCommon.Ping: add Ping evaluators RecipeCommon.Ping.Recipe: add evaluators to PingConf object lnst.RecipeCommon.Ping: add PingEndpoints class Recipes.ENRT.BaseEnrtRecipe: use PingEndpoints in generate_ping_configurations Recipes.ENRT.BaseEnrtRecipe: register default PingEvaluator RecipeCommon.Ping.Recipe: split report and evaluate lnst.Recipes.ENRT: add PingMixins lnst.Recipes.ENRT: use PingMixins to override Ping evaluators lnst.RecipeCommon.Ping.Recipe: use plural for ping_config in ping_test
...aseEvaluator.py => BaseResultEvaluator.py} | 2 +- .../Perf/Evaluators/BaselineEvaluator.py | 4 +- .../Perf/Evaluators/NonzeroFlowEvaluator.py | 4 +- .../Ping/Evaluators/RatePingEvaluator.py | 59 +++++++++++++ .../Ping/Evaluators/ZeroPassPingEvaluator.py | 21 +++++ lnst/RecipeCommon/Ping/Evaluators/__init__.py | 2 + lnst/RecipeCommon/Ping/PingEndpoints.py | 20 +++++ lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} | 55 +++++++----- lnst/RecipeCommon/Ping/__init__.py | 0 lnst/Recipes/ENRT/BaseEnrtRecipe.py | 19 ++-- lnst/Recipes/ENRT/BasePvPRecipe.py | 2 +- lnst/Recipes/ENRT/BondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleBondRecipe.py | 3 +- lnst/Recipes/ENRT/DoubleTeamRecipe.py | 7 +- lnst/Recipes/ENRT/IpsecEspAeadRecipe.py | 16 ++-- lnst/Recipes/ENRT/IpsecEspAhCompRecipe.py | 26 +++--- lnst/Recipes/ENRT/NoVirtOvsVxlanRecipe.py | 3 +- lnst/Recipes/ENRT/OvS_DPDK_PvP.py | 2 +- lnst/Recipes/ENRT/PingFloodRecipe.py | 4 +- .../ENRT/PingMixins/PingEvaluatorMixins.py | 13 +++ lnst/Recipes/ENRT/PingMixins/__init__.py | 3 + lnst/Recipes/ENRT/SimpleNetworkRecipe.py | 3 +- lnst/Recipes/ENRT/TeamRecipe.py | 7 +- lnst/Recipes/ENRT/TeamVsBondRecipe.py | 7 +- lnst/Recipes/ENRT/VirtOvsVxlanRecipe.py | 77 +++-------------- .../VirtualBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInGuestRecipe.py | 3 +- .../VirtualBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualBridgeVlanInHostRecipe.py | 3 +- .../ENRT/VirtualBridgeVlansOverBondRecipe.py | 86 ++++--------------- ...rtualOvsBridgeVlanInGuestMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInGuestRecipe.py | 3 +- ...irtualOvsBridgeVlanInHostMirroredRecipe.py | 3 +- .../ENRT/VirtualOvsBridgeVlanInHostRecipe.py | 3 +- .../VirtualOvsBridgeVlansOverBondRecipe.py | 86 ++++--------------- lnst/Recipes/ENRT/VlansOverBondRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VlansOverTeamRecipe.py | 64 ++------------ lnst/Recipes/ENRT/VlansRecipe.py | 63 ++------------ lnst/Recipes/ENRT/VxlanMulticastRecipe.py | 5 +- lnst/Recipes/ENRT/VxlanRemoteRecipe.py | 3 +- lnst/Tests/Ping.py | 20 ++--- 41 files changed, 317 insertions(+), 459 deletions(-) rename lnst/RecipeCommon/{Perf/Evaluators/BaseEvaluator.py => BaseResultEvaluator.py} (70%) create mode 100644 lnst/RecipeCommon/Ping/Evaluators/RatePingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/ZeroPassPingEvaluator.py create mode 100644 lnst/RecipeCommon/Ping/Evaluators/__init__.py create mode 100644 lnst/RecipeCommon/Ping/PingEndpoints.py rename lnst/RecipeCommon/{Ping.py => Ping/Recipe.py} (63%) create mode 100644 lnst/RecipeCommon/Ping/__init__.py create mode 100644 lnst/Recipes/ENRT/PingMixins/PingEvaluatorMixins.py create mode 100644 lnst/Recipes/ENRT/PingMixins/__init__.py
-- 2.21.1
I pushed the series with 2 updated patches.
-Jan
lnst-developers@lists.fedorahosted.org
-
Jan Tluka -
Ondrej Lichtner