Skip to content

Commit

Permalink
Consolidating shared constants
Browse files Browse the repository at this point in the history
  • Loading branch information
ktbyers committed Sep 20, 2024
1 parent d1791fa commit cff3d4c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 31 deletions.
9 changes: 9 additions & 0 deletions netmiko/cli_tools/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,10 @@
import os


__version__ = "5.0.0"
MAX_WORKERS = int(os.environ.get("NETMIKO_MAX_THREADS", 10))
ERROR_PATTERN = "%%%failed%%%"

GREP = "/bin/grep"
if not os.path.exists(GREP):
GREP = "/usr/bin/grep"
13 changes: 2 additions & 11 deletions netmiko/cli_tools/netmiko_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,10 @@
from netmiko.utilities import load_devices, display_inventory
from netmiko.utilities import write_tmp_file, ensure_dir_exists
from netmiko.utilities import find_netmiko_dir
from netmiko.cli_tools import ERROR_PATTERN
from netmiko.cli_tools import ERROR_PATTERN, GREP, MAX_WORKERS, __version__
from netmiko.cli_tools.cli_helpers import obtain_devices, update_device_params, ssh_conn


max_workers = int(os.environ.get("NETMIKO_MAX_THREADS", 10))

GREP = "/bin/grep"
if not os.path.exists(GREP):
GREP = "/usr/bin/grep"
NETMIKO_BASE_DIR = "~/.netmiko"
__version__ = "5.0.0"


def grepx(files, pattern, grep_options, use_colors=True):
"""Call system grep"""
if not isinstance(files, (list, tuple)):
Expand Down Expand Up @@ -150,7 +141,7 @@ def main(args):
)

# THREADING #####
with ThreadPoolExecutor(max_workers=max_workers) as executor:
with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
futures = [executor.submit(ssh_conn, **kwargs) for kwargs in device_tasks]
for future in as_completed(futures):
device_name, output = future.result()
Expand Down
12 changes: 2 additions & 10 deletions netmiko/cli_tools/netmiko_grep.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,9 @@
from netmiko.utilities import obtain_netmiko_filename, write_tmp_file, ensure_dir_exists
from netmiko.utilities import find_netmiko_dir
from netmiko.utilities import SHOW_RUN_MAPPER
from netmiko.cli_tools import ERROR_PATTERN
from netmiko.cli_tools import ERROR_PATTERN, GREP, MAX_WORKERS, __version__
from netmiko.cli_tools.cli_helpers import obtain_devices, update_device_params, ssh_conn

GREP = "/bin/grep"
if not os.path.exists(GREP):
GREP = "/usr/bin/grep"
NETMIKO_BASE_DIR = "~/.netmiko"
__version__ = "5.0.0"

max_workers = int(os.environ.get("NETMIKO_MAX_THREADS", 10))


def grepx(files, pattern, grep_options, use_colors=True):
"""Call system grep"""
Expand Down Expand Up @@ -147,7 +139,7 @@ def main(args):
)

# THREADING #####
with ThreadPoolExecutor(max_workers=max_workers) as executor:
with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
futures = [executor.submit(ssh_conn, **kwargs) for kwargs in device_tasks]
for future in as_completed(futures):
device_name, output = future.result()
Expand Down
12 changes: 2 additions & 10 deletions netmiko/cli_tools/netmiko_show.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,9 @@
from netmiko.utilities import obtain_netmiko_filename, write_tmp_file, ensure_dir_exists
from netmiko.utilities import find_netmiko_dir
from netmiko.utilities import SHOW_RUN_MAPPER
from netmiko.cli_tools import ERROR_PATTERN
from netmiko.cli_tools import ERROR_PATTERN, GREP, MAX_WORKERS, __version__
from netmiko.cli_tools.cli_helpers import obtain_devices, update_device_params, ssh_conn

GREP = "/bin/grep"
if not os.path.exists(GREP):
GREP = "/usr/bin/grep"
NETMIKO_BASE_DIR = "~/.netmiko"
__version__ = "5.0.0"

max_workers = int(os.environ.get("NETMIKO_MAX_THREADS", 10))


def grepx(files, pattern, grep_options, use_colors=True):
"""Call system grep"""
Expand Down Expand Up @@ -149,7 +141,7 @@ def main(args):
)

# THREADING #####
with ThreadPoolExecutor(max_workers=max_workers) as executor:
with ThreadPoolExecutor(max_workers=MAX_WORKERS) as executor:
futures = [executor.submit(ssh_conn, **kwargs) for kwargs in device_tasks]
for future in as_completed(futures):
device_name, output = future.result()
Expand Down

0 comments on commit cff3d4c

Please sign in to comment.