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

Jump to bottom

Ignore subinterfaces on switchports.getall() #216

Merged
merged 3 commits into from
Jan 26, 2022
Merged

Ignore subinterfaces on switchports.getall() #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aecc8c
Ignore subinterfaces on switchports.getall()
DavidVentura Jan 25, 2022
640feef
Stop on whitespace
DavidVentura Jan 25, 2022
c674c14
Add a test
DavidVentura Jan 26, 2022
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 pyeapi/api/switchports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def getall(self):
A Python dictionary object that represents all configured
switchports in the current running configuration
"""
interfaces_re = re.compile(r'(?<=^interface\s)([Et|Po].+)$', re.M)
interfaces_re = re.compile(r'(?<=^interface\s)([Et|Po][^.\s]+)$', re.M)

response = dict()
for name in interfaces_re.findall(self.config):
Expand Down
101 changes: 101 additions & 0 deletions test/fixtures/running_config.text
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1449,6 +1449,107 @@ interface Ethernet7
no switchport tap default group
no switchport tool group
!
interface Ethernet48.2044
description some port description
no shutdown
default load-interval
logging event link-status use-global
encapsulation dot1q vlan 2044
snmp trap link-change
vrf DAT
no ip proxy-arp
no ip local-proxy-arp
no arp gratuitous accept
ip address 100.76.1.41/31
no ip verify unicast
no ip directed-broadcast
ip attached-routes
default arp aging timeout
default ipv6 nd cache expire
no bfd echo
no bfd authentication mode
default ip dhcp relay all-subnets
no ip helper-address
no ipv6 dhcp relay destination
no ipv6 dhcp relay add vendor-option ccap-core
no ipv6 dhcp relay install routes
ip dhcp relay information option circuit-id Ethernet48.2044
no dhcp server ipv4
no dhcp server ipv6
no ip attached-host route export
no ipv6 attached-host route export
no ip igmp
ip igmp version 3
ip igmp last-member-query-count 2
ip igmp last-member-query-interval 10
igmp query-max-response-time 100
ip igmp query-interval 125
ip igmp startup-query-count 2
ip igmp startup-query-interval 310
ip igmp router-alert optional connected
no ip igmp host-proxy
no ipv6 enable
default ipv6 nd dad
no ipv6 address
no ipv6 nd ra rx accept default-route
ipv6 attached-routes
no ipv6 verify unicast
no ipv6 nd ra disabled
ipv6 nd ra interval msec 200000
ipv6 nd ra lifetime 1800
no ipv6 nd ra mtu suppress
no ipv6 nd managed-config-flag
no ipv6 nd other-config-flag
ipv6 nd reachable-time 0
ipv6 nd router-preference medium
ipv6 nd ra dns-servers lifetime 300
ipv6 nd ra dns-suffixes lifetime 300
ipv6 nd ra hop-limit 64
no tcp mss ceiling
no multicast ipv4 source route export
no multicast ipv6 source route export
no multicast ipv4 static
no multicast ipv6 static
mfib ipv4 fastdrop
no mld
no mld static-group access-list
mld query-interval 125
mld query-response-interval 10
no mld startup-query-interval
mld startup-query-count 2
mld robustness 2
mld last-listener-query-interval 1
mld last-listener-query-count 2
mpls ip
default ntp serve
no pim ipv4 sparse-mode
no pim ipv4 bidirectional
no pim ipv4 border-router
pim ipv4 hello interval 30
pim ipv4 hello count 3.5
pim ipv4 dr-priority 1
pim ipv4 join-prune interval 60
pim ipv4 join-prune count 3.5
no pim ipv4 neighbor filter
default pim ipv4 bfd
no pim ipv4 join-prune transport sctp
no pim ipv4 local-interface
no pim ipv4 non-dr install-oifs
no pim ipv6 sparse-mode
no pim ipv6 border-router
pim ipv6 hello interval 30
pim ipv6 hello count 3.5
pim ipv6 dr-priority 1
pim ipv6 join-prune interval 60
pim ipv6 join-prune count 3.5
no pim ipv6 neighbor filter
default pim ipv6 bfd
no pim bsr ipv4 border
no pim bsr ipv6 border
no rip v2 multicast disable
no node-segment ipv4 index
no node-segment ipv6 index
!
interface Loopback0
no description
no shutdown
Expand Down
8 changes: 8 additions & 0 deletions test/unit/test_api_switchports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ def test_remove_trunk_group(self):
func = function('remove_trunk_group', intf, 'foo')
self.eapi_positive_config_test(func, cmds)

def test_getall(self):
expected = sorted(['Port-Channel10',
'Ethernet1', 'Ethernet2',
'Ethernet3', 'Ethernet4',
'Ethernet5', 'Ethernet6',
'Ethernet7'])
assert sorted(self.instance.getall().keys()) == expected


if __name__ == '__main__':
unittest.main()