From ffc698d0aaacbb308c41cacb3301314cbc4621ca Mon Sep 17 00:00:00 2001 From: Mikhail Yohman Date: Tue, 23 Jul 2019 16:17:29 -0600 Subject: [PATCH 1/2] updated to latest --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5e46500fc7..d3e8c1f0a4 100644 --- a/tox.ini +++ b/tox.ini @@ -10,4 +10,4 @@ whitelist_externals = git rm -commands = pytest +commands = pytest -vv From 693e95e826147e59478e26cdcd88b3d60ef173b3 Mon Sep 17 00:00:00 2001 From: Mikhail Yohman Date: Fri, 26 Jul 2019 09:59:23 -0600 Subject: [PATCH 2/2] Changed static spacing to \s+ --- ...cisco_ios_show_interfaces_switchport.template | 16 ++++++++-------- ...isco_nxos_show_interfaces_switchport.template | 14 +++++++------- tox.ini | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/cisco_ios_show_interfaces_switchport.template b/templates/cisco_ios_show_interfaces_switchport.template index ad691610ae..d7dbf4eff9 100644 --- a/templates/cisco_ios_show_interfaces_switchport.template +++ b/templates/cisco_ios_show_interfaces_switchport.template @@ -8,13 +8,13 @@ Value NATIVE_VLAN (\d+) Value TRUNKING_VLANS (.+) Start - ^Name: ${INTERFACE} - ^\s*Switchport: ${SWITCHPORT} - ^\s*Switchport Monitor: ${SWITCHPORT_MONITOR} - ^\s*Operational Mode: ${MODE} - ^\s*Negotiation of Trunking: ${SWITCHPORT_NEGOTIATION} - ^\s*Access Mode VLAN: ${ACCESS_VLAN} - ^\s*Trunking Native Mode VLAN: ${NATIVE_VLAN} - ^\s*Trunking VLANs Enabled: ${TRUNKING_VLANS} -> Record + ^Name:\s+${INTERFACE} + ^\s*Switchport:\s+${SWITCHPORT} + ^\s*Switchport\s+Monitor:\s+${SWITCHPORT_MONITOR} + ^\s*Operational\s+Mode:\s+${MODE} + ^\s*Negotiation\s+of\s+Trunking:\s+${SWITCHPORT_NEGOTIATION} + ^\s*Access\s+Mode\s+VLAN:\s+${ACCESS_VLAN} + ^\s*Trunking\s+Native\s+Mode\s+VLAN:\s+${NATIVE_VLAN} + ^\s*Trunking\s+VLANs\s+Enabled:\s+${TRUNKING_VLANS} -> Record ^.+$$ ^. -> Error diff --git a/templates/cisco_nxos_show_interfaces_switchport.template b/templates/cisco_nxos_show_interfaces_switchport.template index b50cb16ad3..2e738f1b75 100644 --- a/templates/cisco_nxos_show_interfaces_switchport.template +++ b/templates/cisco_nxos_show_interfaces_switchport.template @@ -7,12 +7,12 @@ Value NATIVE_VLAN (\d+) Value TRUNKING_VLANS (\S+) Start - ^Name: ${INTERFACE} - ^\s*Switchport: ${SWITCHPORT} - ^\s*Switchport Monitor: ${SWITCHPORT_MONITOR} - ^\s*Operational Mode: ${MODE} - ^\s*Access Mode VLAN: ${ACCESS_VLAN} - ^\s*Trunking Native Mode VLAN: ${NATIVE_VLAN} - ^\s*Trunking VLANs Allowed: ${TRUNKING_VLANS} -> Record + ^Name:\s+${INTERFACE} + ^\s*Switchport:\s+${SWITCHPORT} + ^\s*Switchport\s+Monitor:\s+${SWITCHPORT_MONITOR} + ^\s*Operational\s+Mode:\s+${MODE} + ^\s*Access\s+Mode\s+VLAN:\s+${ACCESS_VLAN} + ^\s*Trunking\s+Native\s+Mode\s+VLAN:\s+${NATIVE_VLAN} + ^\s*Trunking\s+VLANs\s+Allowed:\s+${TRUNKING_VLANS} -> Record ^.+$$ ^. -> Error diff --git a/tox.ini b/tox.ini index d3e8c1f0a4..5e46500fc7 100644 --- a/tox.ini +++ b/tox.ini @@ -10,4 +10,4 @@ whitelist_externals = git rm -commands = pytest -vv +commands = pytest