Update interface_counters from develop (#96)

* adding read_timeout_override netmiko option

* adding netmiko option session_log

* Bump black from 20.8b1 to 24.3.0

Bumps [black](https://github.com/psf/black) from 20.8b1 to 24.3.0.
- [Release notes](https://github.com/psf/black/releases)
- [Changelog](https://github.com/psf/black/blob/main/CHANGES.md)
- [Commits](https://github.com/psf/black/commits/24.3.0)

---
updated-dependencies:
- dependency-name: black
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* remove demjson - blocking tests

* FIX minor formating fixes raised by pylama

* FIX limit napalm and netmiko o version 3.*, soften version requirements

* FIX minor formating fixes raised by pylama

* Allow testing on all supported Py versions

* FIX add platform name to driver s350

* FIX force interface speed as a float

* Update information about required versions to Py3.8+ and napalm 3

* Add scheduled check on develop branch

* Update pkg version in setup.py

* Update PublishToPIP.yml for manual run

* Napalm 4 compatibility, newer dependencies

* Full tox testing on "develop" and "master" branch.

* Remove Py13 - too early

* Do not test on PyPy, local test with local Py version only

* CI ThoroughTest for branches develop and master

* CI FastTest for all other branches.

* CI rename legacy jobs

* CI renaname job

* Updata docs

* Shorten name of publish workflow

* Check syntax for Py3.12

* use netmiko_args

* Add changes for 4.1.0 (#89)

* Update requirements.txt

* Typpo in requirements

* _send_command has only two parameters

* Adapt to stricter Unit tests

---------

Co-authored-by: Anton Gridnev <anton@gridnev.pro>

* Remove s350_base_interfaces custom map - it is allready in napalm base

* Adapt Unit tests to canonical_interface_name()

* Add format parameter to get_config()

* Add badges

* Tests for push are enought

* update CD actions

* add tests for device SG500-52

* Merge CI to develop (#95)

* Simplify CI

* CI update

* CI update

* Update CI from develop (#94)

* Add format parameter to get_config()

* Add badges

* Tests for push are enought

* update CD actions

* add tests for device SG500-52

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Dave <davama@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Anton Gridnev <anton@gridnev.pro>
This commit is contained in:
authored and GitHub committed 2024-04-23 12:45:29 +02:00
1 parent f500ec3150
commit 4d86beea46
46 files changed
+224 -212

No files matched your search

Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
Whitespace-only changes.
+1
View File
@@ -1,4 +1,5 @@
"""Test fixtures."""
from builtins import super
import pytest
@@ -1,3 +1,3 @@
[
{"interface": "vlan 1", "mac": "9C:EB:E8:AA:BB:CC", "ip": "192.168.1.1", "age": 0.0}
{"interface": "VLAN1", "mac": "9C:EB:E8:AA:BB:CC", "ip": "192.168.1.1", "age": 0.0}
]
@@ -1,12 +1,12 @@
[
{"interface": "TengigabitEthernet1/0/1", "mac": "00:00:0C:07:AC:01", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "E4:C7:22:FE:E0:43", "ip": "19.51.0.2", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:15:AA", "ip": "19.51.0.5", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:14:6F", "ip": "19.51.0.3", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "5C:8A:38:2E:BD:C0", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "5C:8A:38:2E:FD:E0", "ip": "19.51.0.8", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "00:50:56:93:19:B7", "ip": "19.51.1.4", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "00:50:56:92:2F:CB", "ip": "19.51.1.5", "age": 0.0},
{"interface": "vlan 852", "mac": "00:50:56:9E:51:F3", "ip": "19.51.1.2", "age": 0.0},
{"interface": "vlan 852", "mac": "A4:4C:C8:7D:37:03", "ip": "19.51.14.5", "age": 0.0}
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:00:0C:07:AC:01", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "E4:C7:22:FE:E0:43", "ip": "19.51.0.2", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:15:AA", "ip": "19.51.0.5", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:14:6F", "ip": "19.51.0.3", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "5C:8A:38:2E:BD:C0", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "5C:8A:38:2E:FD:E0", "ip": "19.51.0.8", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:50:56:93:19:B7", "ip": "19.51.1.4", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:50:56:92:2F:CB", "ip": "19.51.1.5", "age": 0.0},
{"interface": "VLAN852", "mac": "00:50:56:9E:51:F3", "ip": "19.51.1.2", "age": 0.0},
{"interface": "VLAN852", "mac": "A4:4C:C8:7D:37:03", "ip": "19.51.14.5", "age": 0.0}
]
@@ -1,4 +1,4 @@
[
{"interface": "vlan 202", "mac": "00:15:17:27:9C:4D", "ip": "10.0.3.1", "age": 0.0},
{"interface": "vlan 202", "mac": "00:50:56:90:23:E8", "ip": "10.0.3.4", "age": 0.0}
{"interface": "VLAN202", "mac": "00:15:17:27:9C:4D", "ip": "10.0.3.1", "age": 0.0},
{"interface": "VLAN202", "mac": "00:50:56:90:23:E8", "ip": "10.0.3.4", "age": 0.0}
]
@@ -1,61 +1,61 @@
[
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.1",
"mac" : "AB:00:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.2",
"mac" : "AB:C7:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.65",
"mac" : "AB:EA:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.73",
"mac" : "AB:EA:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.40",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.44",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.4",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.49",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.2",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.142",
"mac" : "AB:50:EF:12:34:56"
}
@@ -1,3 +1,3 @@
[
{"interface": "vlan 1", "mac": "9C:EB:E8:AA:BB:CC", "ip": "192.168.1.1", "age": 0.0}
{"interface": "VLAN1", "mac": "9C:EB:E8:AA:BB:CC", "ip": "192.168.1.1", "age": 0.0}
]
@@ -1,12 +1,12 @@
[
{"interface": "TengigabitEthernet1/0/1", "mac": "00:00:0C:07:AC:01", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "E4:C7:22:FE:E0:43", "ip": "19.51.0.2", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:15:AA", "ip": "19.51.0.5", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:14:6F", "ip": "19.51.0.3", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "5C:8A:38:2E:BD:C0", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "5C:8A:38:2E:FD:E0", "ip": "19.51.0.8", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "00:50:56:93:19:B7", "ip": "19.51.1.4", "age": 0.0},
{"interface": "TengigabitEthernet1/0/1", "mac": "00:50:56:92:2F:CB", "ip": "19.51.1.5", "age": 0.0},
{"interface": "vlan 852", "mac": "00:50:56:9E:51:F3", "ip": "19.51.1.2", "age": 0.0},
{"interface": "vlan 852", "mac": "A4:4C:C8:7D:37:03", "ip": "19.51.14.5", "age": 0.0}
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:00:0C:07:AC:01", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "E4:C7:22:FE:E0:43", "ip": "19.51.0.2", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:15:AA", "ip": "19.51.0.5", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "BC:EA:FA:B4:14:6F", "ip": "19.51.0.3", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "5C:8A:38:2E:BD:C0", "ip": "19.51.0.1", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "5C:8A:38:2E:FD:E0", "ip": "19.51.0.8", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:50:56:93:19:B7", "ip": "19.51.1.4", "age": 0.0},
{"interface": "TenGigabitEthernet1/0/1", "mac": "00:50:56:92:2F:CB", "ip": "19.51.1.5", "age": 0.0},
{"interface": "VLAN852", "mac": "00:50:56:9E:51:F3", "ip": "19.51.1.2", "age": 0.0},
{"interface": "VLAN852", "mac": "A4:4C:C8:7D:37:03", "ip": "19.51.14.5", "age": 0.0}
]
@@ -1,4 +1,4 @@
[
{"interface": "vlan 202", "mac": "00:15:17:27:9C:4D", "ip": "10.0.3.1", "age": 0.0},
{"interface": "vlan 202", "mac": "00:50:56:90:23:E8", "ip": "10.0.3.4", "age": 0.0}
{"interface": "VLAN202", "mac": "00:15:17:27:9C:4D", "ip": "10.0.3.1", "age": 0.0},
{"interface": "VLAN202", "mac": "00:50:56:90:23:E8", "ip": "10.0.3.4", "age": 0.0}
]
@@ -1,61 +1,61 @@
[
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.1",
"mac" : "AB:00:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.2",
"mac" : "AB:C7:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.65",
"mac" : "AB:EA:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.73",
"mac" : "AB:EA:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.40",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.44",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.4",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.49",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "TengigabitEthernet1/0/4",
"interface" : "TenGigabitEthernet1/0/4",
"ip" : "192.168.0.2",
"mac" : "AB:50:EF:12:34:56"
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.142",
"mac" : "AB:50:EF:12:34:56"
}
@@ -50,10 +50,10 @@
"GigabitEthernet1/0/46",
"GigabitEthernet1/0/47",
"GigabitEthernet1/0/48",
"TengigabitEthernet1/0/1",
"TengigabitEthernet1/0/2",
"TengigabitEthernet1/0/3",
"TengigabitEthernet1/0/4",
"TenGigabitEthernet1/0/1",
"TenGigabitEthernet1/0/2",
"TenGigabitEthernet1/0/3",
"TenGigabitEthernet1/0/4",
"Port-channel1",
"Port-channel2",
"Port-channel3",
@@ -50,10 +50,10 @@
"GigabitEthernet1/0/46",
"GigabitEthernet1/0/47",
"GigabitEthernet1/0/48",
"TengigabitEthernet1/0/1",
"TengigabitEthernet1/0/2",
"TengigabitEthernet1/0/3",
"TengigabitEthernet1/0/4",
"TenGigabitEthernet1/0/1",
"TenGigabitEthernet1/0/2",
"TenGigabitEthernet1/0/3",
"TenGigabitEthernet1/0/4",
"Port-channel1",
"Port-channel2",
"Port-channel3",
@@ -50,10 +50,10 @@
"GigabitEthernet1/0/46",
"GigabitEthernet1/0/47",
"GigabitEthernet1/0/48",
"TengigabitEthernet1/0/1",
"TengigabitEthernet1/0/2",
"TengigabitEthernet1/0/3",
"TengigabitEthernet1/0/4",
"TenGigabitEthernet1/0/1",
"TenGigabitEthernet1/0/2",
"TenGigabitEthernet1/0/3",
"TenGigabitEthernet1/0/4",
"Port-channel1",
"Port-channel2",
"Port-channel3",
@@ -26,10 +26,10 @@
"GigabitEthernet1/0/22",
"GigabitEthernet1/0/23",
"GigabitEthernet1/0/24",
"TengigabitEthernet1/0/1",
"TengigabitEthernet1/0/2",
"TengigabitEthernet1/0/3",
"TengigabitEthernet1/0/4",
"TenGigabitEthernet1/0/1",
"TenGigabitEthernet1/0/2",
"TenGigabitEthernet1/0/3",
"TenGigabitEthernet1/0/4",
"Port-channel1",
"Port-channel2",
"Port-channel3",
@@ -431,7 +431,7 @@
"mtu" : 9000,
"speed" : 0
},
"TengigabitEthernet1/0/1" : {
"TenGigabitEthernet1/0/1" : {
"description" : "T1",
"is_enabled" : true,
"is_up" : true,
@@ -440,7 +440,7 @@
"mtu" : 9000,
"speed" : 1000
},
"TengigabitEthernet1/0/2" : {
"TenGigabitEthernet1/0/2" : {
"description" : "",
"is_enabled" : false,
"is_up" : false,
@@ -449,7 +449,7 @@
"mtu" : 9000,
"speed" : 0
},
"TengigabitEthernet1/0/3" : {
"TenGigabitEthernet1/0/3" : {
"description" : "T2",
"is_enabled" : true,
"is_up" : true,
@@ -458,7 +458,7 @@
"mtu" : 9000,
"speed" : 1000
},
"TengigabitEthernet1/0/4" : {
"TenGigabitEthernet1/0/4" : {
"description" : "T3",
"is_enabled" : true,
"is_up" : true,
@@ -215,7 +215,7 @@
"mtu" : 9000,
"speed" : 0
},
"TengigabitEthernet1/0/1" : {
"TenGigabitEthernet1/0/1" : {
"description" : "SW switch-c",
"is_enabled" : true,
"is_up" : true,
@@ -224,7 +224,7 @@
"mtu" : 9000,
"speed" : 1000
},
"TengigabitEthernet1/0/2" : {
"TenGigabitEthernet1/0/2" : {
"description" : "",
"is_enabled" : false,
"is_up" : false,
@@ -233,7 +233,7 @@
"mtu" : 9000,
"speed" : 0
},
"TengigabitEthernet1/0/3" : {
"TenGigabitEthernet1/0/3" : {
"description" : "",
"is_enabled" : false,
"is_up" : false,
@@ -242,7 +242,7 @@
"mtu" : 9000,
"speed" : 0
},
"TengigabitEthernet1/0/4" : {
"TenGigabitEthernet1/0/4" : {
"description" : "SW switch-c",
"is_enabled" : true,
"is_up" : true,
@@ -1,4 +1,4 @@
{
"vlan 10" : { "ipv4" : { "10.1.2.2" : { "prefix_length" : 24 } } },
"vlan 80" : { "ipv4" : { "10.0.0.150" : { "prefix_length" : 24 } } }
"VLAN10" : { "ipv4" : { "10.1.2.2" : { "prefix_length" : 24 } } },
"VLAN80" : { "ipv4" : { "10.0.0.150" : { "prefix_length" : 24 } } }
}
@@ -1 +1 @@
{ "vlan 1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } }
{ "VLAN1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } }
@@ -1,4 +1,4 @@
{
"vlan 1" : { "ipv4" : { "198.51.100.2" : { "prefix_length" : 24 } } },
"vlan 852" : { "ipv4" : { "198.51.100.1" : { "prefix_length" : 16 } } }
"VLAN1" : { "ipv4" : { "198.51.100.2" : { "prefix_length" : 24 } } },
"VLAN852" : { "ipv4" : { "198.51.100.1" : { "prefix_length" : 16 } } }
}
@@ -1 +1 @@
{"vlan 202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}}
{"VLAN202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}}
@@ -1 +1 @@
{"vlan 1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}}
{"VLAN1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}}
@@ -7,15 +7,15 @@
"hostname" : "",
"port" : "34:e6:aa:ff:53:a8"
} ],
"TengigabitEthernet1/0/1" : [ {
"TenGigabitEthernet1/0/1" : [ {
"hostname" : "swzdsadas-vedc",
"port" : "Gi0/23"
} ],
"TengigabitEthernet1/0/3" : [ {
"TenGigabitEthernet1/0/3" : [ {
"hostname" : "sw1dsafdsfsdf.example.net",
"port" : "gi28"
} ],
"TengigabitEthernet1/0/4" : [ {
"TenGigabitEthernet1/0/4" : [ {
"hostname" : "sw2dsdfssddfd",
"port" : "te1/0/4"
} ]
@@ -7,15 +7,15 @@
"hostname" : "",
"port" : "34:e6:aa:ff:53:a8"
} ],
"TengigabitEthernet1/0/1" : [ {
"TenGigabitEthernet1/0/1" : [ {
"hostname" : "swzdsadas-vedc",
"port" : "Gi0/23"
} ],
"TengigabitEthernet1/0/3" : [ {
"TenGigabitEthernet1/0/3" : [ {
"hostname" : "sw1dsafdsfsdfsdd",
"port" : "gi28"
} ],
"TengigabitEthernet1/0/4" : [ {
"TenGigabitEthernet1/0/4" : [ {
"hostname" : "sw2dsdfssddfd",
"port" : "te1/0/4"
} ]
@@ -15,11 +15,11 @@
"hostname" : "ab:48:ef:12:34:56",
"port" : "ab:48:ef:12:34:56"
} ],
"TengigabitEthernet1/0/1" : [ {
"TenGigabitEthernet1/0/1" : [ {
"hostname" : "switch-c",
"port" : "gi1/0/1"
} ],
"TengigabitEthernet1/0/4" : [ {
"TenGigabitEthernet1/0/4" : [ {
"hostname" : "switch-c.cb.madeta.cz",
"port" : "Gi1/0/26"
} ]
@@ -1,4 +1,4 @@
{ "TengigabitEthernet1/0/4" : [ {
{ "TenGigabitEthernet1/0/4" : [ {
"parent_interface" : "N/A",
"remote_chassis_id" : "ab:a5:ef:12:34:56",
"remote_port" : "GigabitEthernet1/0/26",
+1
View File
@@ -1,4 +1,5 @@
"""Tests for getters."""
from napalm.base.test.getters import BaseTestGetters
import pytest