Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.0.2 #73

Merged
merged 7 commits into from
May 4, 2024
Merged

Release 1.0.2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
551c3b9
Update regex expression
jbemmel Oct 27, 2023
b254964
* Remove end-of-life Python 3.7
jbemmel Oct 27, 2023
5543379
Bump ncclient version
jbemmel Oct 27, 2023
b34491c
Merge branch 'napalm-automation-community:master' into master
jbemmel Oct 29, 2023
826a89c
Merge branch 'napalm-automation-community:master' into master
jbemmel Mar 1, 2024
b24e2e3
Update get_config method signature, handle mock attribute
jbemmel May 4, 2024
b6218e4
Update to release 1.0.2, remove Python 3.7 aligned with NAPALM core p…
jbemmel May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/napalm-sros-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ dist: ## This creates a ./dist directory with wheel package
release: dist ## release to PyPi
python3 -m pip install --upgrade twine
# --repository testpypi
python3 -m twine upload dist/*
python3 -m twine upload --repository napalm-sros dist/*
5 changes: 3 additions & 2 deletions napalm_sros/sros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,7 @@ def get_config(
retrieve="all",
full=False,
sanitized=False,
format="text",
):
"""
Return the configuration of a device.
Expand All @@ -1128,7 +1129,7 @@ def get_config(
"""
try:
configuration = {"running": "", "candidate": "", "startup": ""}
if self.sros_get_format == "cli" and (sanitized is True or sanitized is False):
if self.sros_get_format == "cli" or format == "cli":
# Getting output in MD-CLI format
# retrieving config using md-cli
cmd_running = "admin show configuration | no-more"
Expand Down Expand Up @@ -1190,7 +1191,7 @@ def _update_buff(buff):
return configuration

# returning the config in xml format
elif self.sros_get_format == "xml" and (sanitized is True or sanitized is False):
elif self.sros_get_format == "xml" or format == "xml":
config_data_running_xml = ""
if retrieve == "running" or retrieve == "all":
config_data_running = to_ele(
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ build-backend = "setuptools.build_meta"

[project]
name = "napalm-sros"
version="1.0.1"
version="1.0.2"
description="Network Automation and Programmability Abstraction Layer driver for Nokia SR OS"
readme = "README.md"
requires-python = ">=3.7"
requires-python = ">=3.8"
dynamic = [ "dependencies" ]
classifiers = [
"Topic :: System :: Networking",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Natural Language :: English",
]

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pip>=21.3.1
textfsm
paramiko>=2.11.0
lxml>=4.9.1
ncclient>=0.6.13
ncclient>=0.6.15
xmltodict>=0.12.0
dictdiffer>=0.9.0
datetime>=4.7
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name="napalm-sros",
version="1.0.1",
version="1.0.2",
packages=find_packages(),
package_data={"napalm_sros.templates": ["*.js"], "napalm_sros.utils.textfsm_templates": ["*.tpl"]},
author="Nokia",
Expand All @@ -17,11 +17,11 @@
classifiers=[
"Topic :: Utilities",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Natural Language :: English",
"Development Status :: 4 - Beta",
"License :: OSI Approved :: Apache Software License",
Expand Down
1 change: 1 addition & 0 deletions test/unit/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class FakeNokiaSROSDevice(BaseTestDouble):
def __init__(self):
self.get = FakeGetMethod(self)
self.get_config = FakeGetConfigMethod(self)
self.server_capabilities = []

def open(self):
pass
Expand Down
Loading