Network Module class structure for Kube support
Related-PROD: PROD-35903
Change-Id: I474a347452b472df3e2272357d1a036b4893e844
diff --git a/cfg_checker/modules/network/checker.py b/cfg_checker/modules/network/checker.py
index eaa2428..f7b55db 100644
--- a/cfg_checker/modules/network/checker.py
+++ b/cfg_checker/modules/network/checker.py
@@ -1,24 +1,14 @@
from cfg_checker.common import logger_cli
-from cfg_checker.modules.network.mapper import NetworkMapper
+from cfg_checker.modules.network.mapper import SaltNetworkMapper, \
+ KubeNetworkMapper
from cfg_checker.modules.network.network_errors import NetworkErrors
from cfg_checker.reports import reporter
class NetworkChecker(object):
- def __init__(
- self,
- config,
- skip_list=None,
- skip_list_file=None
- ):
+ def __init__(self):
logger_cli.debug("... init error logs folder")
self.errors = NetworkErrors()
- self.mapper = NetworkMapper(
- config,
- errors_class=self.errors,
- skip_list=skip_list,
- skip_list_file=skip_list_file
- )
def check_networks(self, map=True):
self.mapper.map_network(self.mapper.RECLASS)
@@ -47,7 +37,7 @@
"""
logger_cli.info("### Generating report to '{}'".format(filename))
_report = reporter.ReportToFile(
- reporter.HTMLNetworkReport(self.mapper.salt_master),
+ reporter.HTMLNetworkReport(self.mapper.master),
filename
)
_report(
@@ -60,3 +50,34 @@
}
)
logger_cli.info("-> Done")
+
+
+class SaltNetworkChecker(NetworkChecker):
+ def __init__(
+ self,
+ config,
+ skip_list=None,
+ skip_list_file=None
+ ):
+ super(SaltNetworkChecker, self).__init__()
+ self.mapper = SaltNetworkMapper(
+ config,
+ errors_class=self.errors,
+ skip_list=skip_list,
+ skip_list_file=skip_list_file
+ )
+
+class KubeNetworkChecker(NetworkChecker):
+ def __init__(
+ self,
+ config,
+ skip_list=None,
+ skip_list_file=None
+ ):
+ super(SaltNetworkChecker, self).__init__()
+ self.mapper = KubeNetworkMapper(
+ config,
+ errors_class=self.errors,
+ skip_list=skip_list,
+ skip_list_file=skip_list_file
+ )
\ No newline at end of file