From c4a36239f6fa7719c2592e6e4b4fe3a01b2c0127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Kl=C3=ADma?= Date: Fri, 29 Mar 2024 15:51:28 +0100 Subject: [PATCH] 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 --- requirements-dev.txt | 8 +++----- requirements.txt | 6 +++--- .../test_get_arp_table/SG300-10/expected_result.json | 2 +- .../test_get_arp_table/SG350X-48P-K9/expected_result.json | 4 ++-- .../test_get_arp_table/SG500-28-K9/expected_result.json | 4 ++-- .../SG550X-24MP-K9/expected_result.json | 4 ++-- .../SG300-10/expected_result.json | 2 +- .../SG350X-48P-K9/expected_result.json | 4 ++-- .../SG500-28-K9/expected_result.json | 4 ++-- .../SG550X-24MP-K9/expected_result.json | 4 ++-- .../CBS350-24P-4G/expected_result.json | 4 ++-- .../test_get_interfaces_ip/SG300-10/expected_result.json | 2 +- .../SG350X-48P-K9/expected_result.json | 4 ++-- .../SG500-28-K9/expected_result.json | 2 +- .../SG550X-24MP-K9/expected_result.json | 2 +- 15 files changed, 27 insertions(+), 29 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index a8b9916..bf3ef10 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,16 +1,14 @@ -napalm<=4.0.0 -netmiko<=4.0.0 -black<=24.3.0 # CVE-2024-21503 +napalm>=4.0.0 +netmiko>=4.0.0 +black>=24.3.0 # CVE-2024-21503 coveralls ddt flake8-import-order -# pytest==6.2.5 pytest pytest-cov pytest-json pytest-pythonpath pylama -# pyflakes==2.4.0 #prevent problems pyflakes mock tox diff --git a/requirements.txt b/requirements.txt index be9a920..7510853 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -napalm<=4.0.0 -netmiko<=4.0.0 -netaddr<=1.2.1 +napalm>=4.0.0 +netmiko>=4.0.0 +netaddr>=1.2.1 diff --git a/test/unit/mocked_data/test_get_arp_table/SG300-10/expected_result.json b/test/unit/mocked_data/test_get_arp_table/SG300-10/expected_result.json index 3bd353c..75c5e8b 100644 --- a/test/unit/mocked_data/test_get_arp_table/SG300-10/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table/SG300-10/expected_result.json @@ -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} ] diff --git a/test/unit/mocked_data/test_get_arp_table/SG350X-48P-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table/SG350X-48P-K9/expected_result.json index 05c1b7e..98534dc 100644 --- a/test/unit/mocked_data/test_get_arp_table/SG350X-48P-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table/SG350X-48P-K9/expected_result.json @@ -7,6 +7,6 @@ {"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": "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} ] diff --git a/test/unit/mocked_data/test_get_arp_table/SG500-28-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table/SG500-28-K9/expected_result.json index 62f8007..5452c31 100644 --- a/test/unit/mocked_data/test_get_arp_table/SG500-28-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table/SG500-28-K9/expected_result.json @@ -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} ] diff --git a/test/unit/mocked_data/test_get_arp_table/SG550X-24MP-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table/SG550X-24MP-K9/expected_result.json index b03f87b..87ad7d6 100644 --- a/test/unit/mocked_data/test_get_arp_table/SG550X-24MP-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table/SG550X-24MP-K9/expected_result.json @@ -37,7 +37,7 @@ }, { "age" : 0.0, - "interface" : "vlan 1", + "interface" : "VLAN1", "ip" : "192.168.0.4", "mac" : "AB:50:EF:12:34:56" }, @@ -55,7 +55,7 @@ }, { "age" : 0.0, - "interface" : "vlan 1", + "interface" : "VLAN1", "ip" : "192.168.0.142", "mac" : "AB:50:EF:12:34:56" } diff --git a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG300-10/expected_result.json b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG300-10/expected_result.json index 3bd353c..75c5e8b 100644 --- a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG300-10/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG300-10/expected_result.json @@ -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} ] diff --git a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG350X-48P-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG350X-48P-K9/expected_result.json index 05c1b7e..98534dc 100644 --- a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG350X-48P-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG350X-48P-K9/expected_result.json @@ -7,6 +7,6 @@ {"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": "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} ] diff --git a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG500-28-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG500-28-K9/expected_result.json index 62f8007..5452c31 100644 --- a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG500-28-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG500-28-K9/expected_result.json @@ -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} ] diff --git a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG550X-24MP-K9/expected_result.json b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG550X-24MP-K9/expected_result.json index b03f87b..87ad7d6 100644 --- a/test/unit/mocked_data/test_get_arp_table_with_vrf/SG550X-24MP-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_arp_table_with_vrf/SG550X-24MP-K9/expected_result.json @@ -37,7 +37,7 @@ }, { "age" : 0.0, - "interface" : "vlan 1", + "interface" : "VLAN1", "ip" : "192.168.0.4", "mac" : "AB:50:EF:12:34:56" }, @@ -55,7 +55,7 @@ }, { "age" : 0.0, - "interface" : "vlan 1", + "interface" : "VLAN1", "ip" : "192.168.0.142", "mac" : "AB:50:EF:12:34:56" } diff --git a/test/unit/mocked_data/test_get_interfaces_ip/CBS350-24P-4G/expected_result.json b/test/unit/mocked_data/test_get_interfaces_ip/CBS350-24P-4G/expected_result.json index b23d0ea..313b531 100644 --- a/test/unit/mocked_data/test_get_interfaces_ip/CBS350-24P-4G/expected_result.json +++ b/test/unit/mocked_data/test_get_interfaces_ip/CBS350-24P-4G/expected_result.json @@ -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 } } } } diff --git a/test/unit/mocked_data/test_get_interfaces_ip/SG300-10/expected_result.json b/test/unit/mocked_data/test_get_interfaces_ip/SG300-10/expected_result.json index 143a01d..a6f4009 100644 --- a/test/unit/mocked_data/test_get_interfaces_ip/SG300-10/expected_result.json +++ b/test/unit/mocked_data/test_get_interfaces_ip/SG300-10/expected_result.json @@ -1 +1 @@ -{ "vlan 1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } } +{ "VLAN1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } } diff --git a/test/unit/mocked_data/test_get_interfaces_ip/SG350X-48P-K9/expected_result.json b/test/unit/mocked_data/test_get_interfaces_ip/SG350X-48P-K9/expected_result.json index 49ac0f8..acedffa 100644 --- a/test/unit/mocked_data/test_get_interfaces_ip/SG350X-48P-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_interfaces_ip/SG350X-48P-K9/expected_result.json @@ -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 } } } } diff --git a/test/unit/mocked_data/test_get_interfaces_ip/SG500-28-K9/expected_result.json b/test/unit/mocked_data/test_get_interfaces_ip/SG500-28-K9/expected_result.json index 0d90d50..2e58fc6 100644 --- a/test/unit/mocked_data/test_get_interfaces_ip/SG500-28-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_interfaces_ip/SG500-28-K9/expected_result.json @@ -1 +1 @@ -{"vlan 202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}} +{"VLAN202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}} diff --git a/test/unit/mocked_data/test_get_interfaces_ip/SG550X-24MP-K9/expected_result.json b/test/unit/mocked_data/test_get_interfaces_ip/SG550X-24MP-K9/expected_result.json index 2365906..6087495 100644 --- a/test/unit/mocked_data/test_get_interfaces_ip/SG550X-24MP-K9/expected_result.json +++ b/test/unit/mocked_data/test_get_interfaces_ip/SG550X-24MP-K9/expected_result.json @@ -1 +1 @@ -{"vlan 1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}} +{"VLAN1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}}