diff --git a/docs/source/basic-tools.rst b/docs/source/basic-tools.rst index b2231745850e976b0fa269d572da7555537fbe68..5604e0109d1121b2dcd674391dbf892f37a0cc13 100644 --- a/docs/source/basic-tools.rst +++ b/docs/source/basic-tools.rst @@ -5,4 +5,4 @@ CLI Tools .. automodule:: resource_management.cli -.. automodule:: resource_management.hardware.router +.. automodule:: resource_management.hardware.juniper diff --git a/resource_management/cli.py b/resource_management/cli.py index 5967b585fa0d98546248e6959ded30204ef4fa5d..9936f42f77a25058ba6fab427fca934e220c034a 100644 --- a/resource_management/cli.py +++ b/resource_management/cli.py @@ -31,7 +31,7 @@ import click import logging from jsonschema import validate, ValidationError -from resource_management.hardware.router \ +from resource_management.hardware.juniper \ import load_router_ports, LINE_CARDS_LIST_SCHEMA from resource_management import db, config, environment from resource_management.db import model diff --git a/resource_management/hardware/router.py b/resource_management/hardware/juniper.py similarity index 99% rename from resource_management/hardware/router.py rename to resource_management/hardware/juniper.py index 46ac7d2c42987b5322dac948d4bc74787e4a489f..9720f0f59b45a630bb82e0ee392c0f4a39c83d15 100644 --- a/resource_management/hardware/router.py +++ b/resource_management/hardware/juniper.py @@ -5,13 +5,13 @@ router utilities .. contents:: :local: -.. autofunction:: resource_management.hardware.router.load_line_cards +.. autofunction:: resource_management.hardware.router.load_router_ports cf. https://www.juniper.net/documentation/us/en/software/junos-pyez/junos-pyez-developer/topics/task/junos-pyez-tables-op-defining.html https://www.juniper.net/documentation/us/en/software/junos-pyez/junos-pyez-developer/topics/task/junos-pyez-views-op-defining.html https://github.com/Juniper/py-junos-eznc/blob/master/lib/jnpr/junos/factory/factory_loader.py#L33-L54 -""" +""" # noqa: E501 import contextlib import logging import re @@ -308,8 +308,6 @@ def load_router_ports(hostname, ssh_config, port=830): .. asjson:: resource_management.hardware.router.LINE_CARDS_LIST_SCHEMA - - """ with router( diff --git a/test/test_db_model.py b/test/test_db_model.py index 0cbd445c2c17aa27bfc04cd894d10fba4e77d397..7f9138b880423d435510e79b5df0b38872381ff1 100644 --- a/test/test_db_model.py +++ b/test/test_db_model.py @@ -1,7 +1,7 @@ from resource_management.db import model from resource_management.db import session_scope from resource_management.cli import _save_router_info -from resource_management.hardware.router import load_router_ports +from resource_management.hardware.juniper import load_router_ports # # def test_model_sanity_check(resources_db, router_name): diff --git a/test/test_parse_router.py b/test/test_parse_router.py index 92ddaab85299df20d98c941e448676585eb294b8..07b6937eabadedd8daf8e3082b538d087b726174 100644 --- a/test/test_parse_router.py +++ b/test/test_parse_router.py @@ -3,7 +3,7 @@ import re from jsonschema import validate from lxml import etree -from resource_management.hardware.router \ +from resource_management.hardware.juniper \ import load_router_ports, LINE_CARDS_LIST_SCHEMA