Skip to content

Commit

Permalink
Merge branch 'develop' into junos-get_interface_autoneg
Browse files Browse the repository at this point in the history
  • Loading branch information
@ktbyers
ktbyers authored Apr 23, 2019
2 parents b335f5b + 10ec207 commit c70871f
Show file tree
Hide file tree
Showing 7 changed files with 371 additions and 0 deletions.
4 changes: 4 additions & 0 deletions napalm/ios/ios.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2542,6 +2542,10 @@ def process_mac_fields(vlan, mac, mac_type, interface):
continue
elif re.search(r"vlan.*mac.*address.*type.*", line):
continue
elif re.search(
r"Displaying entries from active supervisor:\s+\w+\s+\[\d\]:", line
):
continue
else:
raise ValueError("Unexpected output from: {}".format(repr(line)))

Expand Down
4 changes: 4 additions & 0 deletions napalm/nxos/nxos.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,10 @@ def get_interfaces_ip(self):
interfaces_ip[interface_name] = {}
if "ipv6" not in interfaces_ip[interface_name].keys():
interfaces_ip[interface_name]["ipv6"] = {}
if "addr" not in interface.keys():
# Handle nexus 9000 ipv6 interface output
addrs = [addr["addr"] for addr in interface["TABLE_addr"]["ROW_addr"]]
interface["addr"] = addrs

if type(interface.get("addr", "")) is list:
for ipv6_address in interface.get("addr", ""):
Expand Down
20 changes: 20 additions & 0 deletions test/ios/mocked_data/test_get_mac_address_table/6500_6800_vss_format/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[
{
"static": false,
"active": true,
"vlan": 1,
"mac": "DE:AD:BE:EF:12:34",
"interface": "Po13",
"moves": -1,
"last_move": -1.0
},
{
"static": false,
"active": true,
"vlan": 1234,
"mac": "12:34:BE:EF:DE:AD",
"interface": "Po201",
"moves": -1,
"last_move": -1.0
}
]
21 changes: 21 additions & 0 deletions ...os/mocked_data/test_get_mac_address_table/6500_6800_vss_format/show_mac_address_table.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Legend: * - primary entry
age - seconds since last seen
n/a - not available
S - secure entry
R - router's gateway mac address entry
D - Duplicate mac address entry
# - Fabric mac address entry. Clear mac cli doesn't clear this entry

Displaying entries from active supervisor: Earl [1]:

vlan mac address type learn age ports
-----+----+---------------+-------+-----+----------+-----------------------------
* 1 dead.beef.1234 dynamic Yes 25 Po13


Displaying entries from active supervisor: Earl [2]:

vlan mac address type learn age ports
-----+----+---------------+-------+-----+----------+-----------------------------
1234 1234.beef.dead dynamic Yes 115 Po201

54 changes: 54 additions & 0 deletions test/nxos/mocked_data/test_get_interfaces_ip/ipv6_n9k/expected_result.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"Ethernet1/1": {
"ipv4": {
"172.16.100.1": {
"prefix_length": 24
}
}
},
"Ethernet1/128": {
"ipv6": {
"2001:dead:beef::1": {
"prefix_length": 128
},
"2001:c0ff:ee::1": {
"prefix_length": 128
}
}
},
"loopback103": {
"ipv4": {
"192.168.3.100": {
"prefix_length": 24
}
}
},
"loopback102": {
"ipv4": {
"192.168.2.100": {
"prefix_length": 24
}
}
},
"loopback101": {
"ipv4": {
"192.168.1.100": {
"prefix_length": 24
}
}
},
"loopback100": {
"ipv4": {
"10.0.0.100": {
"prefix_length": 24
}
}
},
"Ethernet2/5": {
"ipv4": {
"1.1.1.1": {
"prefix_length": 24
}
}
}
}
204 changes: 204 additions & 0 deletions test/nxos/mocked_data/test_get_interfaces_ip/ipv6_n9k/show_ip_interface.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
{
"TABLE_vrf": [
{
"ROW_vrf": {
"vrf-name-out": "default"
}
},
{
"ROW_vrf": {
"vrf-name-out": "default"
}
},
{
"ROW_vrf": {
"vrf-name-out": "default"
}
},
{
"ROW_vrf": {
"vrf-name-out": "default"
}
},
{
"ROW_vrf": {
"vrf-name-out": "default"
}
},
{
"ROW_vrf": {
"vrf-name-out": "default"
}
}
],
"TABLE_intf": [
{
"ROW_intf": {
"intf-name": "loopback100",
"proto-state": "up",
"link-state": "up",
"admin-state": "up",
"iod": "82",
"prefix": "10.0.0.100",
"subnet": "10.0.0.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
},
{
"ROW_intf": {
"intf-name": "loopback101",
"proto-state": "up",
"link-state": "up",
"admin-state": "up",
"iod": "83",
"prefix": "192.168.1.100",
"subnet": "192.168.1.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
},
{
"ROW_intf": {
"intf-name": "loopback102",
"proto-state": "up",
"link-state": "up",
"admin-state": "up",
"iod": "84",
"prefix": "192.168.2.100",
"subnet": "192.168.2.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
},
{
"ROW_intf": {
"intf-name": "loopback103",
"proto-state": "up",
"link-state": "up",
"admin-state": "up",
"iod": "85",
"prefix": "192.168.3.100",
"subnet": "192.168.3.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
},
{
"ROW_intf": {
"intf-name": "Ethernet1/1",
"proto-state": "up",
"link-state": "up",
"admin-state": "up",
"iod": "5",
"prefix": "172.16.100.1",
"subnet": "172.16.100.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
},
{
"ROW_intf": {
"intf-name": "Ethernet2/5",
"proto-state": "down",
"link-state": "down",
"admin-state": "down",
"iod": "57",
"prefix": "1.1.1.1",
"subnet": "1.1.1.0",
"masklen": "24",
"num-addr": "1",
"ip-disabled": "FALSE",
"bcast-addr": "255.255.255.255",
"num-maddr": "0",
"mtu": "1500",
"pref": "0",
"tag": "0",
"proxy-arp": "disabled",
"lcl-proxy-arp": "disabled",
"mrouting": "disabled",
"icmp-redirect": "enabled",
"dir-bcast": "disabled",
"ip-unreach": "disabled",
"port-unreach": "enabled",
"urpf-mode": "none",
"ip-ls-type": "none"
}
}
]
}
64 changes: 64 additions & 0 deletions test/nxos/mocked_data/test_get_interfaces_ip/ipv6_n9k/show_ipv6_interface.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{
"TABLE_intf": {
"ROW_intf": {
"vrf-name-out": "default",
"intf-name": "Ethernet1/128",
"proto-state": "down",
"link-state": "down",
"admin-state": "up",
"prefix": "2001:dead:beef::1/128",
"linklocal-addr": "fe80::5054:ff:fe12:345d",
"linklocal-configured": "FALSE",
"mrouting-enabled": "disabled",
"mgroup-locally-joined": "TRUE",
"mtu": 1500,
"urpf-mode": "none",
"ipv6-lstype": "none",
"stats-last-reset": "never",
"upkt-fwd": 0,
"upkt-orig": 0,
"upkt-consumed": 0,
"ubyte-fwd": 0,
"ubyte-orig": 0,
"ubyte-consumed": 0,
"mpkt-fwd": 0,
"mpkt-orig": 0,
"mpkt-consumed": 0,
"mbyte-fwd": 0,
"mbyte-orig": 0,
"mbyte-consumed": 0,
"TABLE_addr": {
"ROW_addr": [
{
"addr": "2001:dead:beef::1/128"
},
{
"addr": "2001:c0ff:ee::1/128"
}
]
},
"TABLE_maddr": {
"ROW_maddr": [
{
"m-addr": "ff02::1:ff00:1"
},
{
"m-addr": "ff02::2"
},
{
"m-addr": "ff02::1"
},
{
"m-addr": "ff02::1:ff00:1"
},
{
"m-addr": "ff02::1:ff12:345d"
},
{
"m-addr": "ff02::1:ff00:1"
}
]
}
}
}
}

0 comments on commit c70871f

Please sign in to comment.