Skip to content

Commit c771a89

Browse files
Merge pull request #368 from networktocode/develop
Merge 1.6.0 into main
2 parents 1e7355b + 93597ec commit c771a89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+4432
-588
lines changed

.bandit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
exclude_dirs:
44
- "./tests/"
55
- "./docs/"
6-
- "netutils/oui_mappings.py"
6+
- "netutils/data_files/"

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ jobs:
204204
run: "docker image ls"
205205
- name: "Run Tests"
206206
run: "poetry run invoke pytest"
207-
- name: "Install Napalm"
208-
run: "pip install napalm"
207+
- name: "Install Optional Dependencies"
208+
run: "poetry run poetry install --extras optionals"
209209
- name: "Run Optional Tests"
210-
run: "poetry run pytest tests/unit/test_lib_helpers_optionals.py"
210+
run: "poetry run pytest tests/unit/test_lib_helpers_optionals.py tests/unit/test_acl.py"
211211
needs:
212212
- "pylint"
213213
publish_gh:

.github/workflows/oui_filepull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "OUI-Updates"
33

44
on: # yamllint disable-line rule:truthy
55
schedule:
6-
- cron: "0 8 * * 4"
6+
- cron: "0 2 1 * *"
77

88
jobs:
99
data_gathering:

.github/workflows/proto_filepull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: "Protocol-Updates"
33

44
on: # yamllint disable-line rule:truthy
55
schedule:
6-
- cron: "0 8 * * 4"
6+
- cron: "0 2 1 * *"
77

88
jobs:
99
data_gathering:

.readthedocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ mkdocs:
2020
python:
2121
install:
2222
- requirements: "docs/requirements.txt"
23+
- method: "pip"
24+
path: "."

development_scripts.py

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -35,89 +35,113 @@
3535
MAPPER = {
3636
"LIB_MAPPER_TEMPLATE": {
3737
"ansible": {
38-
"header_src": "NORMALIZED",
39-
"header_dst": "ANSIBLE",
38+
"header_src": "ANSIBLE",
39+
"header_dst": "NORMALIZED",
4040
"_dict": lib_mapper.ANSIBLE_LIB_MAPPER,
4141
"_file": "docs/user/lib_mapper/ansible.md",
4242
},
4343
"ansible_reverse": {
44-
"header_src": "ANSIBLE",
45-
"header_dst": "NORMALIZED",
44+
"header_src": "NORMALIZED",
45+
"header_dst": "ANSIBLE",
4646
"_dict": lib_mapper.ANSIBLE_LIB_MAPPER_REVERSE,
4747
"_file": "docs/user/lib_mapper/ansible_reverse.md",
4848
},
49-
"napalm": {
49+
"hierconfig": {
50+
"header_src": "HIERCONFIG",
51+
"header_dst": "NORMALIZED",
52+
"_dict": lib_mapper.HIERCONFIG_LIB_MAPPER,
53+
"_file": "docs/user/lib_mapper/hierconfig.md",
54+
},
55+
"hierconfig_reverse": {
5056
"header_src": "NORMALIZED",
51-
"header_dst": "NAPALM",
57+
"header_dst": "HIERCONFIG",
58+
"_dict": lib_mapper.HIERCONFIG_LIB_MAPPER_REVERSE,
59+
"_file": "docs/user/lib_mapper/hierconfig_reverse.md",
60+
},
61+
"napalm": {
62+
"header_src": "NAPALM",
63+
"header_dst": "NORMALIZED",
5264
"_dict": lib_mapper.NAPALM_LIB_MAPPER,
5365
"_file": "docs/user/lib_mapper/napalm.md",
5466
},
5567
"napalm_reverse": {
56-
"header_src": "NAPALM",
57-
"header_dst": "NORMALIZED",
68+
"header_src": "NORMALIZED",
69+
"header_dst": "NAPALM",
5870
"_dict": lib_mapper.NAPALM_LIB_MAPPER_REVERSE,
5971
"_file": "docs/user/lib_mapper/napalm_reverse.md",
6072
},
61-
"ntctemplates": {
73+
"netmiko": {
74+
"header_src": "NETMIKO",
75+
"header_dst": "NORMALIZED",
76+
"_dict": lib_mapper.NETMIKO_LIB_MAPPER,
77+
"_file": "docs/user/lib_mapper/netmiko.md",
78+
},
79+
"netmiko_reverse": {
6280
"header_src": "NORMALIZED",
63-
"header_dst": "NTCTEMPLATES",
81+
"header_dst": "NETMIKO",
82+
"_dict": lib_mapper.NETMIKO_LIB_MAPPER_REVERSE,
83+
"_file": "docs/user/lib_mapper/netmiko_reverse.md",
84+
},
85+
"netutilsparser": {
86+
"header_src": "NETUTILSPARSER",
87+
"header_dst": "NORMALIZED",
88+
"_dict": lib_mapper.NETUTILSPARSER_LIB_MAPPER,
89+
"_file": "docs/user/lib_mapper/netutilsparser.md",
90+
},
91+
"netutilsparser_reverse": {
92+
"header_src": "NORMALIZED",
93+
"header_dst": "NETUTILSPARSER",
94+
"_dict": lib_mapper.NETUTILSPARSER_LIB_MAPPER_REVERSE,
95+
"_file": "docs/user/lib_mapper/netutilsparser_reverse.md",
96+
},
97+
"ntctemplates": {
98+
"header_src": "NTCTEMPLATES",
99+
"header_dst": "NORMALIZED",
64100
"_dict": lib_mapper.NTCTEMPLATES_LIB_MAPPER,
65101
"_file": "docs/user/lib_mapper/ntctemplates.md",
66102
},
67103
"ntctemplates_reverse": {
68-
"header_src": "NTCTEMPLATES",
69-
"header_dst": "NORMALIZED",
104+
"header_src": "NORMALIZED",
105+
"header_dst": "NTCTEMPLATES",
70106
"_dict": lib_mapper.NTCTEMPLATES_LIB_MAPPER_REVERSE,
71107
"_file": "docs/user/lib_mapper/ntctemplates_reverse.md",
72108
},
73109
"pyats": {
74-
"header_src": "NORMALIZED",
75-
"header_dst": "PYATS",
110+
"header_src": "PYATS",
111+
"header_dst": "NORMALIZED",
76112
"_dict": lib_mapper.PYATS_LIB_MAPPER,
77113
"_file": "docs/user/lib_mapper/pyats.md",
78114
},
79115
"pyats_reverse": {
80-
"header_src": "PYATS",
81-
"header_dst": "NORMALIZED",
116+
"header_src": "NORMALIZED",
117+
"header_dst": "PYATS",
82118
"_dict": lib_mapper.PYATS_LIB_MAPPER_REVERSE,
83119
"_file": "docs/user/lib_mapper/pyats_reverse.md",
84120
},
85121
"pyntc": {
86-
"header_src": "NORMALIZED",
87-
"header_dst": "PYNTC",
122+
"header_src": "PYNTC",
123+
"header_dst": "NORMALIZED",
88124
"_dict": lib_mapper.PYNTC_LIB_MAPPER,
89125
"_file": "docs/user/lib_mapper/pyntc.md",
90126
},
91127
"pyntc_reverse": {
92-
"header_src": "PYNTC",
93-
"header_dst": "NORMALIZED",
128+
"header_src": "NORMALIZED",
129+
"header_dst": "PYNTC",
94130
"_dict": lib_mapper.PYNTC_LIB_MAPPER_REVERSE,
95131
"_file": "docs/user/lib_mapper/pyntc_reverse.md",
96132
},
97133
"scrapli": {
98-
"header_src": "NORMALIZED",
99-
"header_dst": "SCRAPLI",
134+
"header_src": "SCRAPLI",
135+
"header_dst": "NORMALIZED",
100136
"_dict": lib_mapper.SCRAPLI_LIB_MAPPER,
101137
"_file": "docs/user/lib_mapper/scrapli.md",
102138
},
103139
"scrapli_reverse": {
104-
"header_src": "SCRAPLI",
105-
"header_dst": "NORMALIZED",
140+
"header_src": "NORMALIZED",
141+
"header_dst": "SCRAPLI",
106142
"_dict": lib_mapper.SCRAPLI_LIB_MAPPER_REVERSE,
107143
"_file": "docs/user/lib_mapper/scrapli_reverse.md",
108144
},
109-
"hierconfig": {
110-
"header_src": "HIERCONFIG",
111-
"header_dst": "NORMALIZED",
112-
"_dict": lib_mapper.HIERCONFIG_LIB_MAPPER,
113-
"_file": "docs/user/lib_mapper/hierconfig.md",
114-
},
115-
"hierconfig_reverse": {
116-
"header_src": "NORMALIZED",
117-
"header_dst": "HIERCONFIG",
118-
"_dict": lib_mapper.HIERCONFIG_LIB_MAPPER_REVERSE,
119-
"_file": "docs/user/lib_mapper/hierconfig_reverse.md",
120-
},
121145
},
122146
"PARSER_MAPPER_TEMPLATE": {
123147
"default": {
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# v1.6 Release Notes
2+
3+
## Release Overview
4+
5+
- Added `ubiquiti_airos` parser.
6+
- Added `ACLRule` and `ACLRules` classes.
7+
- Added the `ip` functions `is_ip_range`, `is_ip_within`, `is_network`, and `get_range_ips`.
8+
- Added the `asn` function `int_to_asn` in the function.
9+
- Added `NETUTILSPARSER_LIB_MAPPER` and `NETUTILSPARSER_LIB_MAPPER_REVERSE` to lib mapper.
10+
- Added classy docs to view config parser classes.
11+
12+
13+
## [v1.6.0] - 2023-09
14+
15+
### Added
16+
17+
- [#290](https://github.com/networktocode/netutils/pull/290) Added `ACLRule` and `ACLRules` classes.
18+
- [#290](https://github.com/networktocode/netutils/pull/290) Added the `ip` functions `is_ip_range`, `is_ip_within`, `is_network`, and `get_range_ips`.
19+
- [#325](https://github.com/networktocode/netutils/pull/325) Added classy docs to view config parser classes.
20+
- [#329](https://github.com/networktocode/netutils/pull/329) Added `ubiquiti_airos` parser.
21+
- [#332](https://github.com/networktocode/netutils/pull/332) Added the `asn` function `int_to_asn` in the function.
22+
- [#352](https://github.com/networktocode/netutils/pull/352) Added `NETUTILSPARSER_LIB_MAPPER` and `NETUTILSPARSER_LIB_MAPPER_REVERSE` to lib mapper.
23+
24+
### Changed
25+
26+
- [#346](https://github.com/networktocode/netutils/pull/346) Updated `mac_to_format` docs.
27+
- [#352](https://github.com/networktocode/netutils/pull/352) Clean up docs and sorting for lib mapper.
28+
- [#358](https://github.com/networktocode/netutils/pull/358) Changed flatbot schedule.
29+
30+
### Fixed
31+
32+
- [#339](https://github.com/networktocode/netutils/pull/339) Fix for ASN functions.
33+
- [#340](https://github.com/networktocode/netutils/pull/340) Fixed Netscaler parser slug.
34+
- [#346](https://github.com/networktocode/netutils/pull/346) Fix issue where interface abbreviation not working.
35+
- [#350](https://github.com/networktocode/netutils/pull/350) Update library mappings to be correct order.
36+
- [#356](https://github.com/networktocode/netutils/pull/356) Fixed mkdocs dependencies.

0 commit comments

Comments
 (0)