Skip to content

Commit a2be149

Browse files
Revert "Feature/platform mapper (#220)" (#476)
This reverts commit e835dc3.
1 parent db056d7 commit a2be149

10 files changed

Lines changed: 1 addition & 490 deletions

File tree

docs/dev/code_reference/nist.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/dev/code_reference/platform_mapper.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/user/include_jinja_list.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
| mac_to_int | netutils.mac.mac_to_int |
6060
| mac_type | netutils.mac.mac_type |
6161
| get_upgrade_path | netutils.os_version.get_upgrade_path |
62-
| juniper_junos_version_parser | netutils.os_version.juniper_junos_version_parser |
6362
| compare_cisco_type5 | netutils.password.compare_cisco_type5 |
6463
| compare_cisco_type7 | netutils.password.compare_cisco_type7 |
6564
| compare_cisco_type9 | netutils.password.compare_cisco_type9 |
@@ -76,7 +75,6 @@
7675
| encrypt_type7 | netutils.password.encrypt_type7 |
7776
| get_hash_salt | netutils.password.get_hash_salt |
7877
| tcp_ping | netutils.ping.tcp_ping |
79-
| os_platform_object_builder | netutils.platform_mapper.os_platform_object_builder |
8078
| regex_findall | netutils.regex.regex_findall |
8179
| regex_match | netutils.regex.regex_match |
8280
| regex_search | netutils.regex.regex_search |

mkdocs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,9 @@ nav:
147147
- Library Helpers: "dev/code_reference/lib_helpers.md"
148148
- Library Mapping: "dev/code_reference/lib_mapping.md"
149149
- Mac Address: "dev/code_reference/mac.md"
150-
- NIST: "dev/code_reference/nist.md"
151150
- OS Version: "dev/code_reference/os_version.md"
152151
- Password: "dev/code_reference/password.md"
153152
- Ping: "dev/code_reference/ping.md"
154-
- Platform Mapper: "dev/code_reference/platform_mapper.md"
155153
- Protocol Mapper: "dev/code_reference/protocol_mapper.md"
156154
- Regex: "dev/code_reference/regex.md"
157155
- Route: "dev/code_reference/route.md"

netutils/nist.py

Lines changed: 0 additions & 141 deletions
This file was deleted.

netutils/os_version.py

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
"""Functions for working with OS Versions."""
2-
import re
32
import typing as t
43
from distutils.version import LooseVersion # pylint: disable=deprecated-module
54

@@ -48,90 +47,3 @@ def get_upgrade_path(
4847
upgrade_path.append(target_version)
4948

5049
return upgrade_path
51-
52-
53-
def juniper_junos_version_parser(version: str) -> t.Dict[str, t.Any]:
54-
"""Parses JunOS Version into usable bits matching JunOS Standards.
55-
56-
Args:
57-
version
58-
59-
Returns:
60-
A dictionary containing parsed version information
61-
62-
Examples:
63-
>>> parsed_version = juniper_junos_version_parser("12.3R4")
64-
"""
65-
# Use regex to group the main, minor, type and build into useable pieces
66-
# re_main_minor_type_build = re.search(r"^(\d+)\.(\d+)([xXrRsS])?(\d+)?", split_version[0])
67-
re_main_minor_type_build: re.Pattern[str] = re.compile(
68-
r"""
69-
^
70-
(?P<main>\d+) # main train
71-
\. # dot separator
72-
(?P<minor>\d+) # minor version
73-
(?P<type>[xXrRsS])? # version type (optional)
74-
(?P<build>\d+)? # build (optional)
75-
""",
76-
re.VERBOSE,
77-
)
78-
re_service_build_respin: re.Pattern[str] = re.compile(
79-
r"""
80-
(?P<service>[sSdD])? # service (optional)
81-
(?P<service_build>\d+)? # service build (optional)
82-
\.?
83-
(?P<service_respin>\d+)? # service respin (optional)
84-
""",
85-
re.VERBOSE,
86-
)
87-
# Set empty params for service pieces and complete them if a second indice exists from the version split
88-
# Define isservice, isfrs, isspecial, ismaintenance
89-
parsed_version: t.Dict[str, t.Any] = {
90-
"isservice": False,
91-
"ismaintenance": False,
92-
"isfrs": False,
93-
"isspecial": False,
94-
"service": None,
95-
"service_build": None,
96-
"service_respin": None,
97-
}
98-
99-
# Juniper junos marks the division between main, minor, type and build from the service build and respin with a -
100-
version_core_part, *version_service_part = re.split("-|:", version)
101-
102-
# Parse out junos into sections that can be used for logic
103-
parsed_version.update(re_main_minor_type_build.search(version_core_part).groupdict()) # type:ignore
104-
105-
if version_service_part:
106-
parsed_version.update(re_service_build_respin.search(version_service_part[0]).groupdict()) # type:ignore
107-
if parsed_version.get("service", "").lower() == "s":
108-
parsed_version["isservice"] = True
109-
# Juniper looks at the D in special releases like it's the R in normal releases; Use it as the frs identifier
110-
elif parsed_version.get("service").lower() == "d" and ( # type:ignore
111-
parsed_version.get("service_build") is None or int(parsed_version.get("service_build", 1)) <= 1
112-
):
113-
parsed_version["isfrs"] = True
114-
115-
if parsed_version.get("type") is None:
116-
return parsed_version
117-
118-
if parsed_version["type"].lower() == "x":
119-
parsed_version["isspecial"] = True
120-
elif parsed_version["type"].lower() == "s":
121-
parsed_version["isservice"] = True
122-
123-
if parsed_version["type"].lower() == "r" and (
124-
parsed_version.get("build") is None or int(parsed_version.get("build")) <= 1 # type:ignore
125-
):
126-
parsed_version["isfrs"] = True
127-
elif parsed_version["type"].lower() == "r":
128-
parsed_version["ismaintenance"] = True
129-
130-
return parsed_version
131-
132-
133-
os_version_parsers = {
134-
"juniper": {
135-
"junos": juniper_junos_version_parser,
136-
}
137-
}

netutils/platform_mapper.py

Lines changed: 0 additions & 96 deletions
This file was deleted.

netutils/utils.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
"get_napalm_getters": "lib_helpers.get_napalm_getters",
8989
"paloalto_panos_brace_to_set": "config.conversion.paloalto_panos_brace_to_set",
9090
"get_upgrade_path": "os_version.get_upgrade_path",
91-
"os_platform_object_builder": "platform_mapper.os_platform_object_builder",
92-
"juniper_junos_version_parser": "os_version.juniper_junos_version_parser",
9391
"hash_data": "hash.hash_data",
9492
}
9593

0 commit comments

Comments
 (0)