Skip to content

Commit

Permalink
Merge pull request #349 from networktocode/xr_controllers
Browse files Browse the repository at this point in the history 
XR SHOW CONTROLLERS: Bug Fix
  • Loading branch information
@jmcgill298
jmcgill298 authored Jan 26, 2019
2 parents 7367340 + 7639f66 commit 48f0354
Show file tree
Hide file tree
Showing 4 changed files with 869 additions and 92 deletions.
34 changes: 19 additions & 15 deletions templates/cisco_xr_show_controllers.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ Value VOLTAGE_ALARM_HIGH (([-\+]?\d+\.\d+|(N\/A)))
Value VOLTAGE_ALARM_LOW (([-\+]?\d+\.\d+|(N\/A)))
Value VOLTAGE_WARN_HIGH (([-\+]?\d+\.\d+|(N\/A)))
Value VOLTAGE_WARN_LOW (([-\+]?\d+\.\d+|(N\/A)))
Value RX_VALUE (([-\+]?\d+\.\d+|(N\/A)))
Value RX_ALARM_HIGH (([-\+]?\d+\.\d+))
Value RX_ALARM_LOW (([-\+]?\d+\.\d+))
Value RX_WARN_HIGH (([-\+]?\d+\.\d+))
Value RX_WARN_LOW (([-\+]?\d+\.\d+))
Value TX_VALUE (([-\+]?\d+\.\d+|(N\/A)))
Value TX_ALARM_HIGH (([-\+]?\d+\.\d+))
Value TX_ALARM_LOW (([-\+]?\d+\.\d+))
Value TX_WARN_HIGH (([-\+]?\d+\.\d+))
Value TX_WARN_LOW (([-\+]?\d+\.\d+))
Value RX_VALUE (.+?)
Value Filldown RX_ALARM_HIGH (([-\+]?\d+\.\d+))
Value Filldown RX_ALARM_LOW (([-\+]?\d+\.\d+))
Value Filldown RX_WARN_HIGH (([-\+]?\d+\.\d+))
Value Filldown RX_WARN_LOW (([-\+]?\d+\.\d+))
Value TX_VALUE (.+?)
Value Filldown TX_ALARM_HIGH (([-\+]?\d+\.\d+))
Value Filldown TX_ALARM_LOW (([-\+]?\d+\.\d+))
Value Filldown TX_WARN_HIGH (([-\+]?\d+\.\d+))
Value Filldown TX_WARN_LOW (([-\+]?\d+\.\d+))

Start
^PHY\s+data\s+for\s+interface:\s+${INTERFACE}
Expand All @@ -28,14 +28,18 @@ Start
Controllers
^\s+Temperature:\s+${TEMPERATURE_ALARM_HIGH}\s+\w+\s+${TEMPERATURE_WARN_HIGH}\s+\w+\s+${TEMPERATURE_WARN_LOW}\s+\w+\s+${TEMPERATURE_ALARM_LOW}
^\s+Voltage:\s+${VOLTAGE_ALARM_HIGH}\s+\w+\s+${VOLTAGE_WARN_HIGH}\s+\w+\s+${VOLTAGE_WARN_LOW}\s+\w+\s+${VOLTAGE_ALARM_LOW}
^\s+Transmit Power:.+\(${TX_ALARM_HIGH} dBm\).+\(${TX_WARN_HIGH} dBm\).+\(${TX_WARN_LOW} dBm\).+\(${TX_ALARM_LOW} dBm\)
^\s+Receive Power:.+\(${RX_ALARM_HIGH} dBm\).+\(${RX_WARN_HIGH} dBm\).+\(${RX_WARN_LOW} dBm\).+\(${RX_ALARM_LOW} dBm\)
^\s+Temperature:\s+${TEMPERATURE_VALUE}
^\s+Voltage:\s+${VOLTAGE_VALUE}
^\s+Tx\s+Power:.+?\(${TX_VALUE}\)\s*$$
^\s+Rx\s+Power:.+?\(${RX_VALUE}\)\s*$$
^PHY\s+data\s+for\s+interface: -> Continue.Record
^PHY\s+data\s+for\s+interface:\s+${INTERFACE}
^\s+Lane -> Record Lanes

Lanes
^\s+Transmit Power:.+\(${TX_ALARM_HIGH} dBm\).+\(${TX_WARN_HIGH} dBm\).+\(${TX_WARN_LOW} dBm\).+\(${TX_ALARM_LOW} dBm\) -> Record
^\s+Receive Power:.+\(${RX_ALARM_HIGH} dBm\).+\(${RX_WARN_HIGH} dBm\).+\(${RX_WARN_LOW} dBm\).+\(${RX_ALARM_LOW} dBm\) -> Record
^\s+Transmit Power:.+\(${TX_ALARM_HIGH} dBm\).+\(${TX_WARN_HIGH} dBm\).+\(${TX_WARN_LOW} dBm\).+\(${TX_ALARM_LOW} dBm\)
^\s+Receive Power:.+\(${RX_ALARM_HIGH} dBm\).+\(${RX_WARN_HIGH} dBm\).+\(${RX_WARN_LOW} dBm\).+\(${RX_ALARM_LOW} dBm\)
^\s+${LANE}\s+${TEMPERATURE_VALUE}.*\(${TX_VALUE}\s+\S+\).*\(${RX_VALUE}\s+\S+\) -> Record
^\S -> Start

EOF
^\S -> Clearall Start
110 changes: 33 additions & 77 deletions tests/cisco_xr/show_controllers_all_phy/cisco_xr_show_controllers_all_phy.parsed
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ parsed_sample:
voltage_warn_high: '3.465'
voltage_warn_low: '3.100'
- interface: FortyGigE0/1/1/0
lane: ''
rx_alarm_high: ''
rx_alarm_low: ''
rx_value: ''
rx_warn_high: ''
rx_warn_low: ''
lane: '0'
rx_alarm_high: '3.39988'
rx_alarm_low: '-13.50665'
rx_value: '-2.33215'
rx_warn_high: '2.40000'
rx_warn_low: '-9.50007'
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: ''
temperature_value: 'N/A'
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: '1.99974'
tx_alarm_low: '-11.60522'
tx_value: ''
tx_value: '-2.19179'
tx_warn_high: '-1.00015'
tx_warn_low: '-7.60200'
voltage_alarm_high: ''
Expand All @@ -46,110 +46,66 @@ parsed_sample:
voltage_warn_high: ''
voltage_warn_low: ''
- interface: FortyGigE0/1/1/0
lane: ''
lane: '1'
rx_alarm_high: '3.39988'
rx_alarm_low: '-13.50665'
rx_value: ''
rx_value: '-2.87014'
rx_warn_high: '2.40000'
rx_warn_low: '-9.50007'
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: ''
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: ''
tx_alarm_low: ''
tx_value: ''
tx_warn_high: ''
tx_warn_low: ''
voltage_alarm_high: ''
voltage_alarm_low: ''
voltage_value: ''
voltage_warn_high: ''
voltage_warn_low: ''
- interface: FortyGigE0/1/1/0
lane: '0'
rx_alarm_high: ''
rx_alarm_low: ''
rx_value: '-2.33215'
rx_warn_high: ''
rx_warn_low: ''
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: N/A
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: ''
tx_alarm_low: ''
tx_value: '-2.19179'
tx_warn_high: ''
tx_warn_low: ''
voltage_alarm_high: ''
voltage_alarm_low: ''
voltage_value: ''
voltage_warn_high: ''
voltage_warn_low: ''
- interface: FortyGigE0/1/1/0
lane: '1'
rx_alarm_high: ''
rx_alarm_low: ''
rx_value: '-2.87014'
rx_warn_high: ''
rx_warn_low: ''
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: N/A
temperature_value: 'N/A'
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: ''
tx_alarm_low: ''
tx_alarm_high: '1.99974'
tx_alarm_low: '-11.60522'
tx_value: '-2.03426'
tx_warn_high: ''
tx_warn_low: ''
tx_warn_high: '-1.00015'
tx_warn_low: '-7.60200'
voltage_alarm_high: ''
voltage_alarm_low: ''
voltage_value: ''
voltage_warn_high: ''
voltage_warn_low: ''
- interface: FortyGigE0/1/1/0
lane: '2'
rx_alarm_high: ''
rx_alarm_low: ''
rx_alarm_high: '3.39988'
rx_alarm_low: '-13.50665'
rx_value: '-1.58703'
rx_warn_high: ''
rx_warn_low: ''
rx_warn_high: '2.40000'
rx_warn_low: '-9.50007'
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: N/A
temperature_value: 'N/A'
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: ''
tx_alarm_low: ''
tx_alarm_high: '1.99974'
tx_alarm_low: '-11.60522'
tx_value: '-2.03703'
tx_warn_high: ''
tx_warn_low: ''
tx_warn_high: '-1.00015'
tx_warn_low: '-7.60200'
voltage_alarm_high: ''
voltage_alarm_low: ''
voltage_value: ''
voltage_warn_high: ''
voltage_warn_low: ''
- interface: FortyGigE0/1/1/0
lane: '3'
rx_alarm_high: ''
rx_alarm_low: ''
rx_alarm_high: '3.39988'
rx_alarm_low: '-13.50665'
rx_value: '-2.27312'
rx_warn_high: ''
rx_warn_low: ''
rx_warn_high: '2.40000'
rx_warn_low: '-9.50007'
temperature_alarm_high: ''
temperature_alarm_low: ''
temperature_value: N/A
temperature_value: 'N/A'
temperature_warn_high: ''
temperature_warn_low: ''
tx_alarm_high: ''
tx_alarm_low: ''
tx_alarm_high: '1.99974'
tx_alarm_low: '-11.60522'
tx_value: '-1.87755'
tx_warn_high: ''
tx_warn_low: ''
tx_warn_high: '-1.00015'
tx_warn_low: '-7.60200'
voltage_alarm_high: ''
voltage_alarm_low: ''
voltage_value: ''
Expand Down
Loading

0 comments on commit 48f0354

Please sign in to comment.