Add module sku

networktocode · Dec 12, 2016 · 75cd5dd · 75cd5dd
1 parent 5afe705
commit 75cd5dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/templates/cisco_ios_show_platform_diag.template b/templates/cisco_ios_show_platform_diag.template
@@ -1,5 +1,6 @@
 Value Filldown CHASSIS_TYPE (.*?)
 Value Required SLOT_NUMBER ((?:.*)[A-Z]\d+(?:.*))
+Value MODULE_SKU (.+?)
 Value STATE (.+)
 Value RUNNING_STATE (.+)
 Value INTERNAL_STATE (.+)
@@ -10,8 +11,8 @@ Value HARDWARE_SIGNAL (.*)
 Value PACKET_SIGNAL (.*)
 
 Start
-  ^Chassis type: ${CHASSIS_TYPE}(\s|$$)
-  ^.*(?:Sub-slot|Slot):\s${SLOT_NUMBER}\,
+  ^Chassis type: ${CHASSIS_TYPE}(?:\s|$$)
+  ^.*(?:Sub-slot|Slot):\s${SLOT_NUMBER}\,(?:\s${MODULE_SKU}|\s+$$)(?:\s+|$$)
   ^\s+State\s*\:\s${STATE}
   ^.*Running state\s*\:\s${RUNNING_STATE}
   ^.*Internal state\s*\:\s${INTERNAL_STATE}

diff --git a/tests/cisco_ios/show_platform_diag/cisco_ios_show_platform_diag.parsed b/tests/cisco_ios/show_platform_diag/cisco_ios_show_platform_diag.parsed
@@ -3,6 +3,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'R0'
+  module_sku: 'ASR1000-RP1'
   state:  ''
   running_state:  'ok' 
   internal_state:  'online'
@@ -14,6 +15,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'R0/0'
+  module_sku: ''
   state:  ''
   running_state:  'ok, active' 
   internal_state:  ''
@@ -25,6 +27,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'R0/1'
+  module_sku: ''
   state:  ''
   running_state:  'ok, standby' 
   internal_state:  ''
@@ -36,6 +39,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'F0'
+  module_sku: 'ASR1000-ESP10'
   state:  ''
   running_state:  'ok, active' 
   internal_state:  'online'
@@ -47,6 +51,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'P0'
+  module_sku: 'ASR1004-PWR-AC'
   state:  'ok'
   running_state:  '' 
   internal_state:  ''
@@ -58,6 +63,7 @@ parsed_sample:
 
 - chassis_type: 'ASR1004'
   slot_number:  'P1'
+  module_sku: 'ASR1004-PWR-AC'
   state:  'ok'
   running_state:  '' 
   internal_state:  ''

diff --git a/tests/cisco_ios/show_platform_diag/cisco_ios_show_platform_diag_2.parsed b/tests/cisco_ios/show_platform_diag/cisco_ios_show_platform_diag_2.parsed
@@ -2,6 +2,7 @@ parsed_sample:
 
 - chassis_type: 'CSR1000V'
   slot_number:  'R0'
+  module_sku: 'CSR1000V'
   state:  ''
   running_state:  'ok, active' 
   internal_state:  'online'
@@ -13,6 +14,7 @@ parsed_sample:
 
 - chassis_type: 'CSR1000V'
   slot_number:  'F0'
+  module_sku: 'CSR1000V'
   state:  ''
   running_state:  'ok, active' 
   internal_state:  'online'