Signed-off-by: Jan Tluka <jtluka(a)redhat.com>
---
.../ENRT/ConfigMixins/BaseHWConfigMixin.py | 17 ++++++++++++++++-
.../ENRT/ConfigMixins/CommonHWSubConfigMixin.py | 16 +---------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py
b/lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py
index 6fce028d..327f0efa 100644
--- a/lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py
+++ b/lnst/Recipes/ENRT/ConfigMixins/BaseHWConfigMixin.py
@@ -1,4 +1,19 @@
-class BaseHWConfigMixin(object):
+from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
+
+class BaseHWConfigMixin(BaseSubConfigMixin):
+ def apply_sub_configuration(self, config):
+ super().apply_sub_configuration(config)
+ self.hw_config(config)
+
+ def remove_sub_configuration(self, config):
+ self.hw_deconfig(config)
+ return super().remove_sub_configuration(config)
+
+ def generate_sub_configuration_description(self, config):
+ desc = super().generate_sub_configuration_description(config)
+ desc.extend(self.describe_hw_config(config))
+ return desc
+
def hw_config(self, config):
config.hw_config = {}
diff --git a/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
b/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
index d119381f..cea7148a 100644
--- a/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
+++ b/lnst/Recipes/ENRT/ConfigMixins/CommonHWSubConfigMixin.py
@@ -11,7 +11,6 @@ from lnst.Recipes.ENRT.ConfigMixins.MTUHWConfigMixin import
MTUHWConfigMixin
from lnst.Recipes.ENRT.ConfigMixins.PauseFramesHWConfigMixin import (
PauseFramesHWConfigMixin,
)
-from lnst.Recipes.ENRT.ConfigMixins.BaseSubConfigMixin import BaseSubConfigMixin
class CommonHWSubConfigMixin(
@@ -20,23 +19,10 @@ class CommonHWSubConfigMixin(
DevInterruptHWConfigMixin,
CoalescingHWConfigMixin,
MTUHWConfigMixin,
- BaseSubConfigMixin,
):
"""
This class groups few related :any:`BaseSubConfigMixin` s for user's
convenience. For more details, see the documentation of the individual
ancestor classes.
"""
-
- def apply_sub_configuration(self, config):
- super().apply_sub_configuration(config)
- self.hw_config(config)
-
- def remove_sub_configuration(self, config):
- self.hw_deconfig(config)
- return super().remove_sub_configuration(config)
-
- def generate_sub_configuration_description(self, config):
- desc = super().generate_sub_configuration_description(config)
- desc.extend(self.describe_hw_config(config))
- return desc
+ pass
--
2.26.3