commit aae5804c60eb6d2b6ce6c6f2c657ed8401e0b9bf
author Alex <osavatieiev@mirantis.com> Thu Dec 31 11:48:28 2020 -0600
committer Alex <osavatieiev@mirantis.com> Thu Dec 31 11:48:28 2020 -0600
tree a903f9f19e59d29671e903bd71b3ff5718f39fa5
parent 34874cd4872d17646b604c0820aaec2e4f5fa8f6

Network pinger module fix

Change-Id: I7fc47c4db8e995d40da104ffc0802cc67b39ec32
Related-PROD: PROD-35903

cfg_checker/modules/network/pinger.py

diff --git a/cfg_checker/modules/network/pinger.py b/cfg_checker/modules/network/pinger.py
index 17f8597..075012c 100644
--- a/cfg_checker/modules/network/pinger.py
+++ b/cfg_checker/modules/network/pinger.py
@@ -3,16 +3,14 @@
 
 from cfg_checker.common import logger_cli
 from cfg_checker.helpers.console_utils import Progress
-from cfg_checker.modules.network.mapper import NetworkMapper
 from cfg_checker.modules.network.network_errors import NetworkErrors
-from cfg_checker.nodes import SaltNodes
 
 
 # This is independent class with a salt.nodes input
 class NetworkPinger(object):
     def __init__(
         self,
-        config,
+        mapper,
         mtu=None,
         detailed=False,
         errors_class=None,
@@ -20,13 +18,7 @@
         skip_list_file=None
     ):
         logger_cli.info("# Initializing Pinger")
-        self.salt_master = SaltNodes(config)
-        # all active nodes in the cloud
-        self.target_nodes = self.salt_master.get_nodes(
-            skip_list=skip_list,
-            skip_list_file=skip_list_file
-        )
-
+        self.mapper = mapper
         # default MTU value
         self.target_mtu = mtu if mtu else 64
         # only data
@@ -42,8 +34,7 @@
     def _collect_node_addresses(self, target_net):
         # use reclass model and standard methods
         # to create list of nodes with target network
-        _mapper = NetworkMapper(errors_class=self.errors)
-        _reclass = _mapper.map_network(_mapper.RUNTIME)
+        _reclass = self.mapper.map_network(self.mapper.RUNTIME)
         if target_net in _reclass:
             return _reclass[target_net]
         else:
@@ -119,7 +110,7 @@
 
         # do ping of packets
         logger_cli.info("# Pinging nodes: MTU={}".format(self.target_mtu))
-        self.salt_master.prepare_script_on_active_nodes("ping.py")
+        self.mapper.master.prepare_script_on_active_nodes("ping.py")
         _progress = Progress(_count)
         _progress_index = 0
         _node_index = 0
@@ -127,13 +118,13 @@
             _targets = src_data["targets"]
             _node_index += 1
             # create 'targets.json' on source host
-            _path = self.salt_master.prepare_json_on_node(
+            _path = self.mapper.master.prepare_json_on_node(
                 src,
                 _targets,
                 "targets.json"
             )
             # execute ping.py
-            _results = self.salt_master.execute_script_on_node(
+            _results = self.mapper.master.execute_script_on_node(
                 src,
                 "ping.py",
                 args=[_path]