diff --git a/.flake8 b/.flake8 index 2180ab7..eac7970 100644 --- a/.flake8 +++ b/.flake8 @@ -5,4 +5,4 @@ ignore = E203, E266, E501, W503 max-line-length = 120 max-complexity = 18 ; select = B,C,E,F,W,T4,B9 -exclude = ./mpls_in_the_sdn_era/spauto_batfish/ +exclude = ./spauto/spauto_batfish/ diff --git a/.gitignore b/.gitignore index c4bfdfa..d39af14 100644 --- a/.gitignore +++ b/.gitignore @@ -359,7 +359,7 @@ docs/public # ncs files ncs* -mpls_in_the_sdn_era/spauto_nornir/Logs/ +spauto/spauto_nornir/Logs/ *__pycache__* *.log *config* diff --git a/.pydocstyle.ini b/.pydocstyle.ini index 45dfcef..999db22 100644 --- a/.pydocstyle.ini +++ b/.pydocstyle.ini @@ -2,4 +2,4 @@ convention = google inherit = false match = (?!__init__).*\.py -match-dir = (?!tests)[^\.].* \ No newline at end of file +match-dir = (?!tests)[^\.].* diff --git a/.yamllint b/.yamllint index bb2a595..e6302d6 100644 --- a/.yamllint +++ b/.yamllint @@ -59,6 +59,6 @@ rules: level: "warning" extends: default ignore: | - mpls_in_the_sdn_era/spauto_batfish/ + spauto/spauto_batfish/ .github/ clab-spauto-topology.yml/ diff --git a/README.md b/README.md index 0043a64..b6c8b70 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ All of the study notes have now been moved to use auto-generated documentation t [Cisco Certified DevNet Specialist - Service Provider Automation and Programmability](https://developer.cisco.com/certification/devnet-sp-auto/) -## Why MPLS in the SDN Era? +### Why MPLS in the SDN Era? Simple. This is an incredible book for any and all Network Engineers interested in learning technologies used in Service Provider environments. The book is heavily focused on MPLS, SDN, Segment-Routing, BGP, L2VPN/L3VPNs, over-all traffic engineering and much more. These are common terms within SP networks and the book does an incredible job in guiding the readers while exploring the device configurations in this topology. However, many other topics are not covered by the book and this repository will hopefully fill in the gaps. This book lays the foundation for our lab topology, but it has increased and grown over time. Additional material used for studying is the book `Network Programmability with YANG`, which covers a lot of the topics in the blueprint! -![MPLS IN THE SDN ERA](mpls_in_the_sdn_era/images/mpls_sdn_era_topology.png) +![MPLS IN THE SDN ERA](./docs/images/mpls_sdn_era_topology.png) This book goes through a number of device configurations in a multi-vendor lab topology (Cisco IOSXR && Juniper). However, *For this lab, all devices have been replaced with Cisco-IOSXR/XE as we are working on a Cisco Certification.* @@ -140,7 +140,7 @@ poetry shell Locate the Nornir playground ``` -cd mpls_in_the_sdn_era/spauto_nornir +cd spauto/spauto_nornir ``` Automate diff --git a/docs/conf.py b/docs/conf.py index e363d45..76e2de2 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -33,7 +33,7 @@ # ones. extensions = ["autoapi.extension", "myst_parser"] # Document Python Code autoapi_type = "python" -autoapi_dirs = ["../mpls_in_the_sdn_era/"] +autoapi_dirs = ["../spauto/"] # Add any paths that contain templates here, relative to this directory. templates_path = ["_templates"] diff --git a/mpls_in_the_sdn_era/images/mpls_sdn_era_topology.png b/docs/images/mpls_sdn_era_topology.png similarity index 100% rename from mpls_in_the_sdn_era/images/mpls_sdn_era_topology.png rename to docs/images/mpls_sdn_era_topology.png diff --git a/poetry.lock b/poetry.lock index 8af6f05..96f2407 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2553,7 +2553,7 @@ reference = "pypi_" [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.10" -content-hash = "71b9bacfd38b84a8c9eb7e6921ca342e96559cc24b6e819dd726673df228ee6e" +content-hash = "12340fc93a6a4d482629dd0d49dad8305cab1ab87fb39d8033c4c94292f80f5b" [metadata.files] alabaster = [ diff --git a/pyproject.toml b/pyproject.toml index c362e06..f4b1512 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.poetry] -name = "mpls_in_the_sdn_era" +name = "spauto" version = "0.1.0" description = "Playground to study for Cisco Devnet Service Provider Automation exam." authors = ["h4ndzdatm0ld "] @@ -28,7 +28,6 @@ napalm = "^3.3.1" pyiosxr = "^0.53" markupsafe = "2.0.1" - [tool.poetry.dev-dependencies] isort = "*" flake8 = "*" @@ -41,8 +40,8 @@ myst-parser = "*" sphinx = "*" pytest = "*" ipython = "*" -pybandit = "^0.0.1" -ansible-lint = "^6.7.0" +pybandit = "*" +ansible-lint = "*" [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/mpls_in_the_sdn_era/__init__.py b/spauto/__init__.py similarity index 100% rename from mpls_in_the_sdn_era/__init__.py rename to spauto/__init__.py diff --git a/mpls_in_the_sdn_era/spauto_ansible/example.pb.yml b/spauto/spauto_ansible/example.pb.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/example.pb.yml rename to spauto/spauto_ansible/example.pb.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/filter_plugins/xml_to_json.py b/spauto/spauto_ansible/filter_plugins/xml_to_json.py similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/filter_plugins/xml_to_json.py rename to spauto/spauto_ansible/filter_plugins/xml_to_json.py diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/CORE_EDGE_ROUTER.yml b/spauto/spauto_ansible/group_vars/CORE_EDGE_ROUTER.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/CORE_EDGE_ROUTER.yml rename to spauto/spauto_ansible/group_vars/CORE_EDGE_ROUTER.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/CSR.yml b/spauto/spauto_ansible/group_vars/CSR.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/CSR.yml rename to spauto/spauto_ansible/group_vars/CSR.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/NTC.yml b/spauto/spauto_ansible/group_vars/NTC.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/NTC.yml rename to spauto/spauto_ansible/group_vars/NTC.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/XR_NETCONF_HOSTS.yml b/spauto/spauto_ansible/group_vars/XR_NETCONF_HOSTS.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/XR_NETCONF_HOSTS.yml rename to spauto/spauto_ansible/group_vars/XR_NETCONF_HOSTS.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/all.yml b/spauto/spauto_ansible/group_vars/all.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/all.yml rename to spauto/spauto_ansible/group_vars/all.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/group_vars/ios.yml b/spauto/spauto_ansible/group_vars/ios.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/group_vars/ios.yml rename to spauto/spauto_ansible/group_vars/ios.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/host_vars/AS65000_P1.yml b/spauto/spauto_ansible/host_vars/AS65000_P1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/host_vars/AS65000_P1.yml rename to spauto/spauto_ansible/host_vars/AS65000_P1.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/hosts.yml b/spauto/spauto_ansible/hosts.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/hosts.yml rename to spauto/spauto_ansible/hosts.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_get_bgp.yml.yml b/spauto/spauto_ansible/pb_get_bgp.yml.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_get_bgp.yml.yml rename to spauto/spauto_ansible/pb_get_bgp.yml.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_netconf_backup.yml b/spauto/spauto_ansible/pb_netconf_backup.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_netconf_backup.yml rename to spauto/spauto_ansible/pb_netconf_backup.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_netconf_edit_xr.yml b/spauto/spauto_ansible/pb_netconf_edit_xr.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_netconf_edit_xr.yml rename to spauto/spauto_ansible/pb_netconf_edit_xr.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_network_cli.yml b/spauto/spauto_ansible/pb_network_cli.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_network_cli.yml rename to spauto/spauto_ansible/pb_network_cli.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_remove_bgp.yml b/spauto/spauto_ansible/pb_remove_bgp.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_remove_bgp.yml rename to spauto/spauto_ansible/pb_remove_bgp.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_restconf_api.yml b/spauto/spauto_ansible/pb_restconf_api.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_restconf_api.yml rename to spauto/spauto_ansible/pb_restconf_api.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/pb_test_extra_vars.yml b/spauto/spauto_ansible/pb_test_extra_vars.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/pb_test_extra_vars.yml rename to spauto/spauto_ansible/pb_test_extra_vars.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/roles/command_runner/tasks/cisco.ios.ios.yml b/spauto/spauto_ansible/roles/command_runner/tasks/cisco.ios.ios.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/roles/command_runner/tasks/cisco.ios.ios.yml rename to spauto/spauto_ansible/roles/command_runner/tasks/cisco.ios.ios.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/roles/command_runner/tasks/main.yml b/spauto/spauto_ansible/roles/command_runner/tasks/main.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/roles/command_runner/tasks/main.yml rename to spauto/spauto_ansible/roles/command_runner/tasks/main.yml diff --git a/mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_lldp_neighbors.ttp b/spauto/spauto_ansible/templates/ios_show_lldp_neighbors.ttp similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_lldp_neighbors.ttp rename to spauto/spauto_ansible/templates/ios_show_lldp_neighbors.ttp diff --git a/mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_run_|_sec_bgp.ttp b/spauto/spauto_ansible/templates/ios_show_run_|_sec_bgp.ttp similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_run_|_sec_bgp.ttp rename to spauto/spauto_ansible/templates/ios_show_run_|_sec_bgp.ttp diff --git a/mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_run_|_sec_interface.ttp b/spauto/spauto_ansible/templates/ios_show_run_|_sec_interface.ttp similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/templates/ios_show_run_|_sec_interface.ttp rename to spauto/spauto_ansible/templates/ios_show_run_|_sec_interface.ttp diff --git a/mpls_in_the_sdn_era/spauto_ansible/ttp-ex.py b/spauto/spauto_ansible/ttp-ex.py similarity index 100% rename from mpls_in_the_sdn_era/spauto_ansible/ttp-ex.py rename to spauto/spauto_ansible/ttp-ex.py diff --git a/mpls_in_the_sdn_era/spauto_batfish/bf_mpls_sdn.py b/spauto/spauto_batfish/bf_mpls_sdn.py similarity index 94% rename from mpls_in_the_sdn_era/spauto_batfish/bf_mpls_sdn.py rename to spauto/spauto_batfish/bf_mpls_sdn.py index 62f1358..368f639 100644 --- a/mpls_in_the_sdn_era/spauto_batfish/bf_mpls_sdn.py +++ b/spauto/spauto_batfish/bf_mpls_sdn.py @@ -18,7 +18,7 @@ # At the moment this doesn't work. NAPALM Getters is extracting these configurations, however # the top line of the config is being stipped out, which identifies the IOSXR version - this is how # Batfish determines this is an iosxr device. (One method at least) -# CONFIGS = "../../mpls_in_the_sdn_era/spauto_nornir/napalm_getters/mpls_sdn_era/" +# CONFIGS = "../../spauto/spauto_nornir/napalm_getters/mpls_sdn_era/" # Run 'pytest' from root dir to rebuild the latest configs before running interactive CONFIGS = "../../tests/network_data/mpls_sdn_era" diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/acl-example.yml b/spauto/spauto_nornir/data_input/acl-example.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/acl-example.yml rename to spauto/spauto_nornir/data_input/acl-example.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_ios/AS65001_SW1.yml b/spauto/spauto_nornir/data_input/cisco_ios/AS65001_SW1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_ios/AS65001_SW1.yml rename to spauto/spauto_nornir/data_input/cisco_ios/AS65001_SW1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE1.yml b/spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE1.yml rename to spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE2.yml b/spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE2.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE2.yml rename to spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE2.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE3.yml b/spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE3.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE3.yml rename to spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE3.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE4.yml b/spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE4.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xe/AS65001_CE4.yml rename to spauto/spauto_nornir/data_input/cisco_xe/AS65001_CE4.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_P1.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_P1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_P1.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_P1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_P2.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_P2.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_P2.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_P2.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE1.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE1.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE100.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE100.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE100.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE100.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE101.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE101.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE101.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE101.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE2.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE2.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE2.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE2.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE3.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE3.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE3.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE3.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE4.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE4.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_PE4.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_PE4.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_RR1.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_RR1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_RR1.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_RR1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_RR2.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65000_RR2.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65000_RR2.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65000_RR2.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65001_H1.yml b/spauto/spauto_nornir/data_input/cisco_xr/AS65001_H1.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/data_input/cisco_xr/AS65001_H1.yml rename to spauto/spauto_nornir/data_input/cisco_xr/AS65001_H1.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/inventory/clab-hosts.yml b/spauto/spauto_nornir/inventory/clab-hosts.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/inventory/clab-hosts.yml rename to spauto/spauto_nornir/inventory/clab-hosts.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/inventory/defaults.yml b/spauto/spauto_nornir/inventory/defaults.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/inventory/defaults.yml rename to spauto/spauto_nornir/inventory/defaults.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/inventory/groups.yml b/spauto/spauto_nornir/inventory/groups.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/inventory/groups.yml rename to spauto/spauto_nornir/inventory/groups.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/inventory/hosts.yml b/spauto/spauto_nornir/inventory/hosts.yml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/inventory/hosts.yml rename to spauto/spauto_nornir/inventory/hosts.yml diff --git a/mpls_in_the_sdn_era/spauto_nornir/logs/.gitkeep b/spauto/spauto_nornir/logs/.gitkeep similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/logs/.gitkeep rename to spauto/spauto_nornir/logs/.gitkeep diff --git a/mpls_in_the_sdn_era/spauto_nornir/nr_add_device_nso.py b/spauto/spauto_nornir/nr_add_device_nso.py similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/nr_add_device_nso.py rename to spauto/spauto_nornir/nr_add_device_nso.py diff --git a/mpls_in_the_sdn_era/spauto_nornir/nr_get_nso_device_facts.py b/spauto/spauto_nornir/nr_get_nso_device_facts.py similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/nr_get_nso_device_facts.py rename to spauto/spauto_nornir/nr_get_nso_device_facts.py diff --git a/mpls_in_the_sdn_era/spauto_nornir/nr_remediate.py b/spauto/spauto_nornir/nr_remediate.py similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/nr_remediate.py rename to spauto/spauto_nornir/nr_remediate.py diff --git a/mpls_in_the_sdn_era/spauto_nornir/templates/nso/data.xml b/spauto/spauto_nornir/templates/nso/data.xml similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/templates/nso/data.xml rename to spauto/spauto_nornir/templates/nso/data.xml diff --git a/mpls_in_the_sdn_era/spauto_nornir/templates/nso/device_update.j2 b/spauto/spauto_nornir/templates/nso/device_update.j2 similarity index 100% rename from mpls_in_the_sdn_era/spauto_nornir/templates/nso/device_update.j2 rename to spauto/spauto_nornir/templates/nso/device_update.j2 diff --git a/tests/conftest.py b/tests/conftest.py index f6b1eb0..1e4c0f6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -10,7 +10,7 @@ # import itertools # # Tell nornir where our inventory data is -nornir_path = "mpls_in_the_sdn_era/spauto_nornir" +nornir_path = "spauto/spauto_nornir" # Evaluate wether running this locally or not to allow pipeline to execute # properly and as well as local testing with docker-compose. The batfish diff --git a/tests/integration/test_network_health.py b/tests/integration/test_network_health.py index 164c9a2..2b921cf 100644 --- a/tests/integration/test_network_health.py +++ b/tests/integration/test_network_health.py @@ -51,7 +51,7 @@ def batfish_setup(): """Initialize the test setup with correctly setting the snapshot into memory""" SNAPSHOT_PATH = "tests/network_data/mpls_sdn_era" - # configs_dir = "mpls_in_the_sdn_era/spauto_nornir/napalm_getters/ASN65000" + # configs_dir = "spauto/spauto_nornir/napalm_getters/ASN65000" snapshot_loader(SNAPSHOT_PATH, "mpls_sdn_era") yield # At the moment, there is no tear down necessary. diff --git a/tests/unit/test_mpls_in_the_sdn_era.py b/tests/unit/test_mpls_in_the_sdn_era.py index 4bcf7ab..40664f5 100644 --- a/tests/unit/test_mpls_in_the_sdn_era.py +++ b/tests/unit/test_mpls_in_the_sdn_era.py @@ -1,4 +1,4 @@ -from mpls_in_the_sdn_era import __version__ +from spauto import __version__ def test_version():