Skip to content

Commit b5ebd39

Browse files
author
bakebot
committed
Cookie updated by NetworkToCode Cookie Drift Manager Tool
Template: ``` { "template": "https://github.com/networktocode-llc/cookiecutter-ntc.git", "dir": "python", "ref": "main", "path": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python" } ``` Cookie: ``` { "remote": "https://github.com/networktocode/netutils.git", "path": "/tmp/tmppx3c8g92/netutils", "repository_path": "/tmp/tmppx3c8g92/netutils", "dir": "", "branch_prefix": "drift-manager", "context": { "codeowner_github_usernames": "@itdependsnetworks @jeffkala @qduk", "full_name": "Network to Code, LLC", "email": "[email protected]", "github_org": "networktocode", "description": "Common helper functions useful in network automation.", "project_name": "netutils", "project_slug": "netutils", "repo_url": "https://github.com/networktocode/netutils", "base_url": "netutils", "project_python_name": "netutils", "project_python_base_version": "3.9", "project_with_config_settings": "no", "generate_docs": "yes", "version": "1.15.1", "original_publish_year": "2025", "_template": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_output_dir": "/tmp/tmppx3c8g92", "_repo_dir": "/__w/cookiecutter-nautobot-app-drift-manager/cookiecutter-nautobot-app-drift-manager/cookiecutter-ntc/python", "_checkout": null }, "base_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.UPDATE_OR_CREATE", "post_actions": [], "baked_commit_ref": "cb8b5e31dece5ab2663d2ffd218a96ca1ae794c5", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": false, "json_filename": "", "output_dir": "", "push": true, "template": "./cookiecutter-ntc", "template_dir": "python", "template_ref": "main", "pull_request": "update-or-create", "post_action": [], "disable_post_actions": true, "draft": null } ```
1 parent 673229a commit b5ebd39

File tree

10 files changed

+96
-1
lines changed

10 files changed

+96
-1
lines changed

‎.cookiecutter.json‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"repo_url": "https://github.com/networktocode/netutils",
1111
"base_url": "netutils",
1212
"project_python_name": "netutils",
13+
<<<<<<< HEAD
1314
<<<<<<< HEAD
1415
"project_python_base_version": "3.9",
1516
=======
@@ -19,20 +20,31 @@
1920
"generate_docs": "yes",
2021
"version": "1.15.1",
2122
"original_publish_year": "2021",
23+
=======
24+
"project_python_base_version": "3.9",
25+
"project_with_config_settings": "no",
26+
"generate_docs": "yes",
27+
"version": "1.15.1",
28+
"original_publish_year": "2025",
29+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
2230
"_drift_manager": {
2331
"template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
2432
"template_dir": "python",
2533
"template_ref": "main",
2634
"cookie_dir": "",
2735
"branch_prefix": "drift-manager",
28-
"pull_request_strategy": "create",
36+
"pull_request_strategy": "update-or-create",
2937
"post_actions": [],
3038
"draft": false,
39+
<<<<<<< HEAD
3140
<<<<<<< HEAD
3241
"baked_commit_ref": "cb8b5e31dece5ab2663d2ffd218a96ca1ae794c5"
3342
=======
3443
"baked_commit_ref": "a9772e1a48d3ff17371da29d817541ecf9cd9e4c"
3544
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
45+
=======
46+
"baked_commit_ref": "6e903d3c14d2fd9a9e73ac9725d2eb2efdc315e7"
47+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
3648
}
3749
}
3850
}

‎.github/workflows/ci.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,15 @@ jobs:
107107
strategy:
108108
fail-fast: true
109109
matrix:
110+
<<<<<<< HEAD
110111
<<<<<<< HEAD
111112
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
112113
=======
113114
python-version: ["3.10", "3.13"]
114115
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
116+
=======
117+
python-version: ["3.10", "3.13"]
118+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
115119
env:
116120
INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}"
117121
steps:
@@ -147,11 +151,15 @@ jobs:
147151
strategy:
148152
fail-fast: true
149153
matrix:
154+
<<<<<<< HEAD
150155
<<<<<<< HEAD
151156
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
152157
=======
153158
python-version: ["3.10", "3.11", "3.12", "3.13"]
154159
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
160+
=======
161+
python-version: ["3.10", "3.11", "3.12", "3.13"]
162+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
155163
runs-on: "ubuntu-latest"
156164
env:
157165
INVOKE_NETUTILS_PYTHON_VER: "${{ matrix.python-version }}"
@@ -200,6 +208,7 @@ jobs:
200208
run: |
201209
git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
202210
poetry run towncrier check --compare-with origin/${{ github.base_ref }}
211+
<<<<<<< HEAD
203212
<<<<<<< HEAD
204213
publish_gh:
205214
name: "Publish to GitHub"
@@ -299,3 +308,5 @@ jobs:
299308
SLACK_WEBHOOK_TYPE: "INCOMING_WEBHOOK"
300309
=======
301310
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
311+
=======
312+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)

‎Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<<<<<<< HEAD
2+
<<<<<<< HEAD
23
ARG PYTHON_VER="3.9"
34
=======
45
ARG PYTHON_VER="3.10"
56
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
7+
=======
8+
ARG PYTHON_VER="3.9"
9+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
610

711
FROM python:${PYTHON_VER}-slim
812

‎README.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# Netutils
22

33
<<<<<<< HEAD
4+
<<<<<<< HEAD
5+
=======
46
=======
7+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
58
<!--
69
Developer Note - Remove Me!
710
@@ -12,23 +15,31 @@ The logo of the project is a placeholder (docs/images/icon-netutils.png) - pleas
1215
To avoid extra work and temporary links, make sure that publishing docs (or merging a PR) is done at the same time as setting up the docs site on RTD, then test everything.
1316
-->
1417

18+
<<<<<<< HEAD
1519
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
20+
=======
21+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
1622
<p align="center">
1723
<img src="https://raw.githubusercontent.com/networktocode/netutils/develop/docs/images/icon-Netutils.png" class="logo" height="200px">
1824
<br>
1925
<a href="https://github.com/networktocode/netutils/actions"><img src="https://github.com/networktocode/netutils/actions/workflows/ci.yml/badge.svg?branch=main"></a>
26+
<<<<<<< HEAD
2027
<<<<<<< HEAD
2128
<a href="https://netutils.readthedocs.io/en/latest"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
2229
=======
2330
<a href="https://netutils.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
2431
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
32+
=======
33+
<a href="https://netutils.readthedocs.io/en/latest/"><img src="https://readthedocs.org/projects/netutils/badge/"></a>
34+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
2535
<a href="https://pypi.org/project/netutils/"><img src="https://img.shields.io/pypi/v/netutils"></a>
2636
<a href="https://pypi.org/project/netutils/"><img src="https://img.shields.io/pypi/dm/netutils"></a>
2737
<br>
2838
</p>
2939
3040
## Overview
3141

42+
<<<<<<< HEAD
3243
<<<<<<< HEAD
3344
A Python library that is a collection of functions that are used in the common network automation tasks. Tasks such as converting a BGP ASN to and from dotted format, normalizing an interface name, or "type 5" encrypting a password. The intention is to centralize these functions while keeping the library light.
3445

@@ -67,6 +78,26 @@ You can find all the Markdown source for the App documentation under the [`docs`
6778
If you need to view the fully-generated documentation site, you can build it with [MkDocs](https://www.mkdocs.org/). A container hosting the documentation can be started using the `invoke` commands (details in the [Development Environment Guide](https://netutils/dev/dev_environment/#docker-development-environment)) on [http://localhost:8001](http://localhost:8001). Using this container, as your changes to the documentation are saved, they will be automatically rebuilt and any pages currently being viewed will be reloaded in your browser.
6879
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
6980
81+
=======
82+
> Developer Note: Add a long (2-3 paragraphs) description of what the library does, what problems it solves, etc.
83+
84+
## Documentation
85+
86+
Full documentation for this library can be found over on the [Netutils Docs](https://netutils.readthedocs.io/) website:
87+
88+
- [User Guide](https://netutils.readthedocs.io/user/app_overview/) - Overview, Using the Library, Getting Started.
89+
- [Administrator Guide](https://netutils.readthedocs.io/admin/install/) - How to Install, Configure, Upgrade, or Uninstall the Library.
90+
- [Developer Guide](https://netutils.readthedocs.io/dev/contributing/) - Extending the Library, Code Reference, Contribution Guide.
91+
- [Release Notes / Changelog](https://netutils.readthedocs.io/admin/release_notes/).
92+
- [Frequently Asked Questions](https://netutils.readthedocs.io/user/faq/).
93+
94+
### Contributing to the Documentation
95+
96+
You can find all the Markdown source for the App documentation under the [`docs`](https://github.com/networktocode/netutils/tree/develop/docs) folder in this repository. For simple edits, a Markdown capable editor is sufficient: clone the repository and edit away.
97+
98+
If you need to view the fully-generated documentation site, you can build it with [MkDocs](https://www.mkdocs.org/). A container hosting the documentation can be started using the `invoke` commands (details in the [Development Environment Guide](https://netutils/dev/dev_environment/#docker-development-environment)) on [http://localhost:8001](http://localhost:8001). Using this container, as your changes to the documentation are saved, they will be automatically rebuilt and any pages currently being viewed will be reloaded in your browser.
99+
100+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
70101
Any PRs with fixes or improvements are very welcome!
71102

72103
## Questions

‎docs/admin/release_notes/version_1.0.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,23 @@
66
- Commit to SemVer
77
- F5 fixes
88

9+
<<<<<<< HEAD
910
<<<<<<< HEAD
1011
## v1.0.0 - 2021-11
1112
=======
1213
## [v1.0.0] - 2025-11-12
1314
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
15+
=======
16+
## [v1.0.0] - 2025-11-12
17+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
1418
1519
### Added
1620

1721
- [#69](https://github.com/networktocode/netutils/issues/69) Normalise banner delimiter for IOS to ^C & support parsing delimiter ^.
1822

1923
### Fixed
2024

25+
<<<<<<< HEAD
2126
<<<<<<< HEAD
2227
- [#79](https://github.com/networktocode/netutils/issues/79) F5 parser fix for irules with multiline single command lines.
2328

@@ -27,3 +32,6 @@
2732
=======
2833
- [#123](https://github.com/networktocode/netutils/issues/123) Fixed Tag filtering not working in job launch form.
2934
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
35+
=======
36+
- [#123](https://github.com/networktocode/netutils/issues/123) Fixed Tag filtering not working in job launch form.
37+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)

‎docs/dev/contributing.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,15 @@ The branching policy includes the following tenets:
109109
- PRs intended to address bug fixes and security patches should be sourced from the develop branch.
110110
- PRs intended to add new features that break backward compatibility should be discussed before a PR is created.
111111

112+
<<<<<<< HEAD
112113
<<<<<<< HEAD
113114
Netutils will observe semantic versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
114115
=======
115116
Netutils will observe Semantic Versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
116117
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
118+
=======
119+
Netutils will observe Semantic Versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
120+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
117121

118122
## Release Policy
119123

‎example.invoke.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
---
22
"netutils":
3+
<<<<<<< HEAD
34
<<<<<<< HEAD
45
python_ver: "3.9"
56
=======
67
python_ver: "3.10"
78
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
9+
=======
10+
python_ver: "3.9"
11+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
812
local: false
913
# image_name: "netutils"
1014
# image_ver: "latest"

‎pyproject.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,18 @@ version = "1.15.2a0"
44
description = "Common helper functions useful in network automation."
55
authors = ["Network to Code, LLC <[email protected]>"]
66
<<<<<<< HEAD
7+
<<<<<<< HEAD
8+
=======
79
=======
10+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
811
readme = "README.md"
912
homepage = "https://netutils.readthedocs.io/"
1013
repository = "https://github.com/networktocode/netutils"
1114
documentation = "https://netutils.readthedocs.io/"
15+
<<<<<<< HEAD
1216
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
17+
=======
18+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
1319
license = "Apache-2.0"
1420
homepage = "https://netutils.readthedocs.io"
1521
repository = "https://github.com/networktocode/netutils"
@@ -33,6 +39,7 @@ include = [
3339

3440
[tool.poetry.dependencies]
3541
<<<<<<< HEAD
42+
<<<<<<< HEAD
3643
python = ">=3.9,<3.14"
3744
napalm = {version = "^4.0.0", optional = true}
3845
jsonschema = {version = "^4.17.3", optional = true}
@@ -46,11 +53,17 @@ coverage = "*"
4653
invoke = "*"
4754
=======
4855
python = ">=3.10,<3.14"
56+
=======
57+
python = ">=3.9,<3.14"
58+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
4959
click = "*"
5060

5161
[tool.poetry.group.dev.dependencies]
5262
coverage = "*"
63+
<<<<<<< HEAD
5364
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
65+
=======
66+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
5467
pytest = "*"
5568
mock = "*"
5669
mypy = "*"

‎tasks.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,15 @@ def is_truthy(arg):
3636
{
3737
"netutils": {
3838
"project_name": "netutils",
39+
<<<<<<< HEAD
3940
<<<<<<< HEAD
4041
"python_ver": "3.9",
4142
=======
4243
"python_ver": "3.10",
4344
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
45+
=======
46+
"python_ver": "3.9",
47+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
4448
"local": is_truthy(os.getenv("INVOKE_NETUTILS_LOCAL", "false")),
4549
"image_name": "netutils",
4650
"image_ver": os.getenv("INVOKE_PARSER_IMAGE_VER", "latest"),

‎tests/unit/test_basics.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<<<<<<< HEAD
2+
<<<<<<< HEAD
23
"""Basic tests that do not require netutils."""
34
=======
45
"""Basic tests that do not require Netutils."""
56
>>>>>>> 725e2d2 (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
7+
=======
8+
"""Basic tests that do not require Netutils."""
9+
>>>>>>> 9ebf36e (Cookie updated by NetworkToCode Cookie Drift Manager Tool)
610

711
import os
812
import re

0 commit comments

Comments
 (0)