Skip to content

Commit

Permalink
Fix Rebase and ensure all data is accounted
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmcgill298
jmcgill298 committed Oct 15, 2018
1 parent e14f87f commit efa480e
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 61 deletions.
124 changes: 72 additions & 52 deletions templates/cisco_wlc_ssh_show_ap_config_general.template
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,74 @@
Value IDENTIFIER (\d+)
Value NAME (\S+)
Value COUNTRYCODE (\S+)
Value MACADDRESS (\S+)
Value IPADDRESS (\S+)
Value NETMASK (\S+)
Value GATEWAY (\S+)
Value APGROUP (\S+)
Value PRIMARY_SWITCH_NAME (\S+)
Value PRIMARY_SWITCH_IP (\S+)
Value SECONDARY_SWITCH_NAME (\S+)
Value SECONDARY_SWITCH_IP (\S+)
Value TERTIARY_SWITCH_NAME (\S+)
Value TERTIARY_SWITCH_IP (\S+)
Value ADMINISTRATIVE_STATE (\S+)
Value OPERATION_STATE (\S+)
Value MODE (\S+)
Value MODEL (\S+)
Value IMAGE (\S+)
Value VERSION (\S+)
Value SERIAL_NUMBER (\S+)
Value FLEXCONNECT_VLAN_MODE (\S+)
Value UPTIME (.*)
Value LWAPP_UPTIME (.*)
Value JOIN_DATETIME (.*)
Value JOIN_TAKENTIME (.*)
Value IDENTIFIER (.+?)
Value NAME (.+?)
Value COUNTRY_CODE (\S+)
Value COUNTRY (.+?)
Value MAC (.+?)
Value IP (.+?)
Value NETMASK (.+?)
Value GATEWAY (.+?)
Value AP_GROUP (.+?)
Value PRIMARY_SWITCH_NAME (.+?)
Value PRIMARY_SWITCH_IP (.+?)
Value SECONDARY_SWITCH_NAME (.+?)
Value SECONDARY_SWITCH_IP (.+?)
Value TERTIARY_SWITCH_NAME (.+?)
Value TERTIARY_SWITCH_IP (.+?)
Value ADMINISTRATIVE_STATE (.+?)
Value OPERATION_STATE (.+?)
Value MODE (.+?)
Value MODEL (.+?)
Value IMAGE (.+?)
Value VERSION (.+?)
Value SERIAL_NUMBER (.+?)
Value FLEXCONNECT_VLAN_MODE (.+?)
Value UPTIME (.+?)
Value LWAPP_UPTIME (.+?)
Value JOIN_DATE_TIME (.+?)
Value JOIN_TAKEN_TIME (.+?)

Start
^Cisco AP Identifier\.*\s+${IDENTIFIER}
^Cisco AP Name\.*\s+${NAME}
^Country code\.*\s+${COUNTRYCODE}
^MAC Address\.*\s+${MACADDRESS}
^IP Address\.*\s+${IPADDRESS}
^IP NetMask\.*\s+${NETMASK}
^Gateway IP Addr\.*\s+${GATEWAY}
^Cisco AP Group Name\.*\s+${APGROUP}
^Primary Cisco Switch Name\.*\s+${PRIMARY_SWITCH_NAME}
^Primary Cisco Switch IP Address\.*\s+${PRIMARY_SWITCH_IP}
^Secondary Cisco Switch Name\.*\s+${SECONDARY_SWITCH_NAME}
^Secondary Cisco Switch IP Address\.*\s+${SECONDARY_SWITCH_IP}
^Tertiary Cisco Switch Name\.*\s+${TERTIARY_SWITCH_NAME}
^Tertiary Cisco Switch IP Address\.*\s+${TERTIARY_SWITCH_IP}
^Administrative State\s+\.*\s+${ADMINISTRATIVE_STATE}
^Operation State\s+\.*\s+${OPERATION_STATE}
^AP Mode \.*\s+${MODE}
^AP Model\.*\s+${MODEL}
^AP Image\.*\s+${IMAGE}
^IOS Version\.*\s+${VERSION}
^AP Serial Number\.*\s+${SERIAL_NUMBER}
^FlexConnect Vlan mode :\.+\s+${FLEXCONNECT_VLAN_MODE}
^AP Up Time\.*\s+${UPTIME}
^AP LWAPP Up Time\.*\s+${LWAPP_UPTIME}
^Join Date and Time\.*\s+${JOIN_DATETIME}
^Join Taken Time\.*\s+${JOIN_TAKENTIME} -> Record
^Cisco\s+AP\s+Identifier\.*\s+${IDENTIFIER}\s*$$
^Cisco\s+AP\s+Name\.*\s+${NAME}\s*$$
^Country\s+code\.*\s+${COUNTRY_CODE}\s+-\s+${COUNTRY}\s*$$
^MAC\s+Address\.*\s+${MAC}\s*$$
^IP\s+Address\.*\s+${IP}\s*$$
^IP\s+NetMask\.*\s+${NETMASK}\s*$$
^Gateway\s+IP\s+Addr\.*\s+${GATEWAY}\s*$$
^Cisco\s+AP\s+Group\s+Name\.*\s+${AP_GROUP}\s*$$
^Primary\s+Cisco\s+Switch\s+Name\.*\s+${PRIMARY_SWITCH_NAME}\s*$$
^Primary\s+Cisco\s+Switch\s+IP\s+Address\.*\s+${PRIMARY_SWITCH_IP}\s*$$
^Secondary\s+Cisco\s+Switch\s+Name\.*\s+${SECONDARY_SWITCH_NAME}\s*$$
^Secondary\s+Cisco\s+Switch\s+IP\s+Address\.*\s+${SECONDARY_SWITCH_IP}\s*$$
^Tertiary\s+Cisco\s+Switch\s+Name\.*\s+${TERTIARY_SWITCH_NAME}\s*$$
^Tertiary\s+Cisco\s+Switch\s+IP\s+Address\.*\s+${TERTIARY_SWITCH_IP}\s*$$
^Administrative\s+State\s+\.*\s+${ADMINISTRATIVE_STATE}\s*$$
^Operation\s+State\s+\.*\s+${OPERATION_STATE}\s*$$
^AP\s+Mode\s+\.*\s+${MODE}\s*$$
^AP\s+Model\.*\s+${MODEL}\s*$$
^AP\s+Image\.*\s+${IMAGE}\s*$$
^IOS\s+Version\.*\s+${VERSION}\s*$$
^AP\s+Serial\s+Number\.*\s+${SERIAL_NUMBER}\s*$$
^FlexConnect\s+Vlan\s+mode\s+:\.+\s+${FLEXCONNECT_VLAN_MODE}\s*$$
^AP\s+Up\s+Time\.*\s+${UPTIME}\s*$$
^AP\s+LWAPP\s+Up\s+Time\.*\s+${LWAPP_UPTIME}\s*$$
^Join\s+Date\s+and\s+Time\.*\s+${JOIN_DATE_TIME}\s*$$
^Join\s+Taken\s+Time\.*\s+${JOIN_TAKEN_TIME}\s*$$ -> Record
^.+\.+
^-+
^\s*$$
^\S+\s+VLAN.+Mappings
^\s+Template\s+in\s+
^AP-Specific\s+FlexConnect
^FlexConnect\s+Local-Split
^WLAN\s+ID\s+PROFILE\s+NAME\s+ACL\s+TYPE\s*$$
^\s+Flexconnect\s+Central-Dhcp
^WLAN\s+ID\s+PROFILE NAME\s+Central-Dhcp\s+DNS\s+Override\s+Nat-Pat\s+Type\s*$$
^\s+\d+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^\s+\d+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^\s+\d+\s+\S+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^WlanId\s+PROFILE NAME\s+Inherit-level\s+Visibility\s+Flex\s+Avc-profile\s*$$
^\d+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^\d+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^\d+\s+\S+\s+\S+\s+\S+\s+\S+\s*$$
^FlexConnect\s+Backup\s+Auth
^. -> Error
2 changes: 1 addition & 1 deletion templates/index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ cisco_nxos_show_vpc.template, .*, cisco_nxos, sh[[ow]] vpc
cisco_nxos_show_vrf.template, .*, cisco_nxos, sh[[ow]] vrf

cisco_wlc_ssh_show_cdp_neighbors_detail.template, .*, cisco_wlc_ssh, sh[[ow]] c[[dp]] neig[[hbors]] det[[ail]]
cisco_wlc_ssh_show_ap_config_general.template, .*, cisco_wlc_ssh, sh[[ow]] ap con[[fig]] ge[[neral]] (\S+)
cisco_wlc_ssh_show_ap_config_general.template, .*, cisco_wlc_ssh, sh[[ow]] ap con[[fig]] ge[[neral]]
cisco_wlc_ssh_show_sysinfo.template, .*, cisco_wlc_ssh, sh[[ow]] sysi[[nfo]]

cisco_xr_show_controllers_HundredGigabitEthernet.template, .*, cisco_xr, sh[[ow]] contr[[ollers]] Hu[[ndredGigabitEthernet]]
Expand Down
17 changes: 9 additions & 8 deletions tests/cisco_wlc_ssh/show_ap_config_general/cisco_wlc_ssh_show_ap_config_general.parsed
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
---
parsed_sample:
- administrative_state: ADMIN_ENABLED
apgroup: GROUP_PE
countrycode: IT
ap_group: GROUP_PE
country_code: IT
country: Italy
flexconnect_vlan_mode: Enabled
gateway: 10.1.1.254
identifier: '111'
image: C2700-K9W8-M
ipaddress: 10.1.1.1
join_datetime: Wed Jan 17 10:07:12 2018
join_takentime: 0 days, 00 h 05 m 36 s
ip: 10.1.1.1
join_date_time: Wed Jan 17 10:07:12 2018
join_taken_time: 0 days, 00 h 05 m 36 s
lwapp_uptime: 165 days, 11 h 03 m 33 s
macaddress: 00:62:ec:01:02:03
mac: 00:62:ec:01:02:03
mode: FlexConnect
model: AIR-CAP2702E-E-K9
name: AP_test_01
netmask: 255.255.255.0
operation_state: REGISTERED
primary_switch_ip: 10.2.2.2
primary_switch_name: WLC
secondary_switch_ip: Not
secondary_switch_ip: Not Configured
secondary_switch_name: ''
serial_number: FCEDDCCBBAA
tertiary_switch_ip: Not
tertiary_switch_ip: Not Configured
tertiary_switch_name: ''
uptime: 248 days, 07 h 09 m 00 s
version: 15.3(3)JC9$

0 comments on commit efa480e

Please sign in to comment.