Merge pull request #265 from jmcgill298/rishabh5j_xr

Make requested changes for merge with master

templates/cisco_xr_admin_show_environment_fan.template

@@ -1,39 +1,39 @@
-Value MODULE (0\/(FT|PM)\d)
+Value MODULE (\S+)
 Value TYPE (\S+)
 Value List FAN_SPEED (\d+)
 
 Start
   ^.+UTC
   ^=+
-  ^\s+Fan speed.+
-  ^Location\s+FRU Type.+FAN_\d
+  ^\s+Fan\s+speed\s+\(rpm\)\s*$$
+  ^Location\s+FRU\s+Type.+FAN_\d
   ^\s+FAN_.+$$
   ^-+ -> FM
-  ^\s+$$
-  ^$$
+  ^\s*$$
   ^.* -> Error "LINE NOT FOUND"
 
 FM
+  ^${MODULE}\s+${TYPE}\s+${FAN_SPEED}\s*$$ -> Record
   ^${MODULE}\s+${TYPE}\s+${FAN_SPEED} -> Continue
+  ^${MODULE}\s+${TYPE}\s+\d+\s+${FAN_SPEED}\s*$$ -> Record
   ^${MODULE}\s+${TYPE}\s+\d+\s+${FAN_SPEED} -> Continue
-  ^${MODULE}\s+${TYPE}\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^${MODULE}\s+${TYPE}\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^${MODULE}\s+${TYPE}\s+\d+\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^${MODULE}\s+${TYPE}\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED}
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){2}${FAN_SPEED}\s*$$ -> Record
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){2}${FAN_SPEED} -> Continue
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){3}${FAN_SPEED}\s*$$ -> Record
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){3}${FAN_SPEED} -> Continue
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){4}${FAN_SPEED}\s*$$ -> Record
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){4}${FAN_SPEED} -> Continue
+  ^${MODULE}\s+${TYPE}\s+(?:\d+\s+){5}${FAN_SPEED}
+  ^\s+${FAN_SPEED}\s*$$ -> Record
   ^\s+${FAN_SPEED} -> Continue
+  ^\s+\d+\s+${FAN_SPEED}\s*$$ -> Record
   ^\s+\d+\s+${FAN_SPEED} -> Continue
-  ^\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^\s+\d+\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED} -> Continue
-  ^\s+\d+\s+\d+\s+\d+\s+\d+\s+\d+\s+${FAN_SPEED} -> Record
-  ^.*$$ -> PM
-  ^\s+$$
-  ^$$
+  ^(?:\s+\d+\s+){2}${FAN_SPEED}\s*$$ -> Record
+  ^(?:\s+\d+\s+){2}${FAN_SPEED} -> Continue
+  ^(?:\s+\d+\s+){3}${FAN_SPEED}\s*$$ -> Record
+  ^(?:\s+\d+\s+){3}${FAN_SPEED} -> Continue
+  ^(?:\s+\d+\s+){4}${FAN_SPEED}\s*$$ -> Record
+  ^(?:\s+\d+\s+){4}${FAN_SPEED} -> Continue
+  ^(?:\s+\d+\s+){5}${FAN_SPEED} -> Record
+  ^\s*$$
   ^.* -> Error "LINE NOT FOUND"
-
-PM
-  ^${MODULE}\s+${TYPE}\s+${FAN_SPEED} -> Continue
-  ^${MODULE}\s+${TYPE}\s+\d+\s+${FAN_SPEED} -> Record
-  ^\s+$$
-  ^$$
-  ^.* -> Error "LINE NOT FOUND"

templates/cisco_xr_admin_show_vm.template

@@ -1,4 +1,5 @@
-Value Filldown LOCATION (\d\/(FC|RP|SC)?\d)
+Value Filldown LOCATION (\S+)
+
 Value ID (\S+)
 Value Required STATUS (\S+)
 Value Required IP_ADDR (\S+)
@@ -18,4 +19,4 @@ Loc
   ^${ID}\s+${STATUS}\s+${IP_ADDR}\s+${HB_SENT}\/${HB_RECV} -> Record
   ^\s+$$
   ^$$ -> Start
-  ^.* -> Error "LINE NOT FOUND"
+  ^.* -> Error "LINE NOT FOUND"

templates/cisco_xr_show_version.template

@@ -25,4 +25,4 @@ Build_Info
   ^$$ -> Start
   ^\s+$$
   ^$$
-  ^.* -> Error "Line not found"
+  ^.* -> Error "Line not found"

templates/index

@@ -225,8 +225,8 @@ cisco_xr_show_bfd_sessions.template, .*, cisco_xr, sh[[ow]] bf[[d]] sess[[ions]]
 cisco_xr_show_pim_neighbor.template, .*, cisco_xr, sh[[ow]] pi[[m]] neigh[[bor]]
 cisco_xr_show_controllers.template, .*, cisco_xr, sh[[ow]] contr[[ollers]] (\S+) phy
 cisco_xr_show_interfaces.template, .*, cisco_xr, sh[[ow]] inte[[rfaces]]
-cisco_xr_show_ip_route.template, .*, cisco_xr, sh[[ow]] ip ro[[ute]]
 cisco_xr_admin_show_vm.template, .*, cisco_xr, adm[[in]] sh[[ow]] vm
+cisco_xr_show_ip_route.template, .*, cisco_xr, sh[[ow]] ip ro[[ute]]
 cisco_xr_show_version.template, .*, cisco_xr, sh[[ow]] ver[[sion]]
 
 dell_force10_show_vlan_brief.template, .*, dell_force10, sh[[ow]] vl[[an]] br[[ief]]

tests/cisco_xr/admin_show_environment_fan/cisco_xr_admin_show_environment_fan.parsed

@@ -1,68 +1,41 @@
 ---
-
 parsed_sample:
-
-
-- module : '0/FT0'
-  type : 'NC55-5516-FAN'
-  fan_speed : ['6192', '3870', '6214', '3859', '6257', '3857', '6420', '4029', '6390', '3938', '6467', '4066']
-
-
-- module : '0/FT1'
-  type : 'NC55-5516-FAN'
-  fan_speed : ['6360', '3970', '6143', '3824', '6033', '3750', '6279', '3859', '6060', '3721', '6375', '3964']
-
-
-- module : '0/FT2'
-  type : 'NC55-5516-FAN'
-  fan_speed : ['6545', '4014', '6474', '3994', '6000', '3752', '6375', '4002', '5921', '3698', '6308', '3915']
-
-
-- module : '0/PM0'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8021', '8537']
-
-
-- module : '0/PM1'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8064', '8387']
-
-
-- module : '0/PM2'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8064', '8473']
-
-
-- module : '0/PM3'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['7978', '8537']
-
-
-- module : '0/PM4'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8064', '8473']
-
-
-- module : '0/PM5'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8086', '8451']
-
-
-- module : '0/PM6'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8086', '8537']
-
-
-- module : '0/PM7'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['7978', '8473']
-
-
-- module : '0/PM8'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8000', '8516']
-
-
-- module : '0/PM9'
-  type : 'NC55-PWR-3KW-AC'
-  fan_speed : ['8021', '8516']
+  - module : '0/FT0'
+    type : 'NC55-5516-FAN'
+    fan_speed : ['6192', '3870', '6214', '3859', '6257', '3857', '6420', '4029', '6390', '3938', '6467', '4066']
+  - module : '0/FT1'
+    type : 'NC55-5516-FAN'
+    fan_speed : ['6360', '3970', '6143', '3824', '6033', '3750', '6279', '3859', '6060', '3721', '6375', '3964']
+  - module : '0/FT2'
+    type : 'NC55-5516-FAN'
+    fan_speed : ['6545', '4014', '6474', '3994', '6000', '3752', '6375', '4002', '5921', '3698', '6308', '3915']
+  - module : '0/PM0'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8021', '8537']
+  - module : '0/PM1'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8064', '8387']
+  - module : '0/PM2'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8064', '8473']
+  - module : '0/PM3'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['7978', '8537']
+  - module : '0/PM4'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8064', '8473']
+  - module : '0/PM5'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8086', '8451']
+  - module : '0/PM6'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8086', '8537']
+  - module : '0/PM7'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['7978', '8473']
+  - module : '0/PM8'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8000', '8516']
+  - module : '0/PM9'
+    type : 'NC55-PWR-3KW-AC'
+    fan_speed : ['8021', '8516']