Skip to content

Commit

Permalink
Adapt to stricter Unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@qaxi
qaxi committed Mar 29, 2024
1 parent a46488e commit 61858d4
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion napalm_s350/s350.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
class S350Driver(NetworkDriver):
"""Napalm driver for S350."""

def __init__(self, hostname, username, password, timeout=30, optional_args=None):
def __init__(self, hostname, username, password, timeout=60, optional_args=None):
"""Constructor."""
self.device = None
self.hostname = hostname
Expand Down
2 changes: 1 addition & 1 deletion test/unit/mocked_data/test_get_arp_table/SG300-10/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table/SG350X-48P-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table/SG500-28-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table/SG550X-24MP-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.4",
"mac" : "AB:50:EF:12:34:56"
},
Expand All @@ -55,7 +55,7 @@
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.142",
"mac" : "AB:50:EF:12:34:56"
}
Expand Down
2 changes: 1 addition & 1 deletion test/unit/mocked_data/test_get_arp_table_with_vrf/SG300-10/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table_with_vrf/SG350X-48P-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table_with_vrf/SG500-28-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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}
]
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_arp_table_with_vrf/SG550X-24MP-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.4",
"mac" : "AB:50:EF:12:34:56"
},
Expand All @@ -55,7 +55,7 @@
},
{
"age" : 0.0,
"interface" : "vlan 1",
"interface" : "VLAN1",
"ip" : "192.168.0.142",
"mac" : "AB:50:EF:12:34:56"
}
Expand Down
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_interfaces_ip/CBS350-24P-4G/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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 } } }
}
2 changes: 1 addition & 1 deletion test/unit/mocked_data/test_get_interfaces_ip/SG300-10/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "vlan 1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } }
{ "VLAN1" : { "ipv4" : { "192.168.1.254" : { "prefix_length" : 24 } } } }
4 changes: 2 additions & 2 deletions test/unit/mocked_data/test_get_interfaces_ip/SG350X-48P-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -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 } } }
}
2 changes: 1 addition & 1 deletion test/unit/mocked_data/test_get_interfaces_ip/SG500-28-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"vlan 202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}}
{"VLAN202": {"ipv4": {"10.0.3.5": {"prefix_length": 8}}}}
2 changes: 1 addition & 1 deletion test/unit/mocked_data/test_get_interfaces_ip/SG550X-24MP-K9/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"vlan 1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}}
{"VLAN1": {"ipv4": {"192.168.0.37": {"prefix_length": 17}}}}

0 comments on commit 61858d4

Please sign in to comment.