diff --git a/changelog/2024/august.rst b/changelog/2024/august.rst
index 088b0dad7d..f6bd936cf2 100644
--- a/changelog/2024/august.rst
+++ b/changelog/2024/august.rst
@@ -197,6 +197,4 @@
     * Added ShowLispEthernetARPublisher
         * Introduced ShowLispEthernetARPublisher parsers.
     * Added ShowLispEthernetMapCachePrefixAR
-        * Introduce ShowLispEthernetMapCachePrefixAR parser.
-
-
+        * Introduce ShowLispEthernetMapCachePrefixAR parser.
\ No newline at end of file
diff --git a/changelog/2024/september.rst b/changelog/2024/september.rst
new file mode 100644
index 0000000000..ac223fb15f
--- /dev/null
+++ b/changelog/2024/september.rst
@@ -0,0 +1,165 @@
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* iosxe
+    * Modified ShowBgpNeighborsReceivedRoutesSuperParser
+        * Make optional to handle regex without CICD
+    * Modified ShowInterfaces
+        * Added <in_drops>, <out_drops>, <peer_ip> and <vc_id> into schema as Optional.
+        * Renamed regex pattern <p_cd>, <p_cd_2> to <p54>, <p55> respectively and updated the code accordingly.
+        * Added regex pattern <p1_2>, <p6_1>, <p56>, <p57> and <p58> to accommodate various outputs.
+    * Modified ShowIpRouteWord
+        * Updated regex pattern <p2> to accommodate various outputs.
+    * Modified ShowSdwanOmpSummary
+        * Added the new fields in schema to match the output
+    * Modified ShowPlatformSoftwareFedSwitchActiveVtAll
+        * Added CLI without Switch keyword too in the CLI list.
+    * Modified ShowInterfacesTransceiver
+        * parser for 'show interfaces transceiver'
+    * Modified fix for auto off addition
+        * Replaced ecomode with auto-off due to new cli
+    * Modified ShowIPVerifySource
+        * Fixed regular expressions p1 to match filter_type which is 'ip'
+    * Added ShowRepTopologyDetail
+        * show rep topology detail
+    * Modified ShowMeraki
+        * Updated the P2 regex based on the latest output at line number 70.
+    * Modified ShowSpanningTreeSummaryTotals
+        * Made "portfast_bpdu_guard" and "portfast_bpdu_filter" optional and
+    * Modified ShowVersion
+        * c9500 Added schema key 'bootldr' to match the schema of the iosxe parser.
+    * Modified ShowRedundancyStates
+        * Made rf_debug_mask variable as optional and unit test added
+    * Modified fix for ShowEthernetTags
+        * Updated the interface variable, now uses the correct OS-specific format.when converting the interface name.
+    * Modified ShowPolicyMapControlPlaneClassMap parser.
+        * added extra regx. for burst_pkt pattern.
+    * Modified ShowLispIpMapCachePrefixSuperParser
+        * Changed <locators> key from schema to Optional.
+    * Modified ShowPlatformSoftwareFedActiveAclInfoDbDetail
+        * Added commands 'show platform software fed {mode} acl info db detail' and 'show platform software fed {switch} {mode} acl info db detail {acl_name}' under iosxe
+    * Modified ShowPlatformSoftwareFedActiveAclInfoDbDetail
+        * Added commands 'show platform software fed {mode} acl info db detail' and 'show platform software fed {switch} {mode} acl info db detail {acl_name}' under c9350
+        * fixed reg ex p1 for 'show platform software fed {mode} acl info db detail' under c9350
+    * Modified ShowMonitor
+        * Removed un-necessary cli command from ShowMonitor parser.
+    * Modified fix for ShowLispRegistrationHistory
+        * Reverted the changes due to the CLI index issue
+    * Modified fix for ShowPlatformHardwareFedQosSchedulerSdkInterface
+        * Modified 'rate' as string from 'int' under 'svcse_scheduler' and added unit test to support the same.
+    * Modified ShowAPSummary
+        * Updated regex pattern <ap_ip_address> to accommodate IPv6 address.
+    * Modified ShowAPDot115ghzChannel
+        * Updated regex pattern <lead_auto_chan_assn_capture> to accommodate Local or Leader words based on release.
+        * Made last_run_seconds as Optional key.
+    * Modified fix for ShowPowerDetail
+        * Replaced ecomode with auto off to accomodate CLI change
+    * Added support for Stack total input power variable
+        * Added 'stack_total_input_power' in the schema
+    * Modified ShowPlatformSoftwareFedSwitchActiveAclStatisticsEvents
+        * Made switch and mode optional variables.
+    * Modified ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummary
+        * Made switch and mode optional variables.
+    * Modified ShowCtsRoleBasedSgtMapAll
+        * Added optional argument total_cached
+    * Modified fix for ShowLispInstanceIdService
+        * database value is present in Publication_entries_exported and Publication (Type - Config Propagation)
+        * database value was overriden by the second occurence hence added a flag to avoid the overriding issue
+    * Modified ShowProcessesMemorySorted
+        * Made "reserve_p_pool" as optional field.
+
+* iosxr
+    * Modified fix for ShowRplRoutePolicy
+        * Modified the 'as-path in' block in p19.match to correctly capture the 'as-path in' data
+    * Modified MonitorInterface
+        * Added missing empty_output_arguments.json files
+    * Modified ShowBundle
+        * Modified <wait_while_timer_ms> in schema to store either integer or string value.
+        * Modified regex pattern <p9> to capture either integer or string value.
+    * Modified ShowL2vpnXconnect
+        * Updated regex pattern <p3> and <p6> to accommodate various outputs.
+
+* viptela
+    * Modified ShowOmpSummary
+        * Added the new fields in schema to match the output
+
+* nxos
+    * Modified ShowVrfAllInterface
+        * Updated regex pattern <p1> to accommodate various outputs which may contain underscore (_) as well.
+
+
+--------------------------------------------------------------------------------
+                                      New                                       
+--------------------------------------------------------------------------------
+
+* iosxe
+    * Added ShowPlatformSoftwareFedIpMfibVrfGroupDetail
+        * Added schema and parser for 'show platform software fed switch active ip mfib vrf vrf_name group detail'
+    * Added ShowL2vpnEvpnEsiMlagSummary
+        * Introduced ShowL2vpnEvpnEsiMlagSummary parsers.
+    * Added ShowL2vpnEvpnEsiMlagMacIP
+        * Introduced ShowL2vpnEvpnEsiMlagMacIP parsers.
+    * Added ShowL2vpnEvpnEsiMlagVlanBrief
+        * Introduced ShowL2vpnEvpnEsiMlagVlanBrief parsers.
+    * Added ShowPlatSoftFedSwAccessSecuritySecMacLrnTable parser.
+        * Added parser for cli show plat soft fed sw {switch} access-security sec-mac-lrn-table summary.
+        * Added parser for cli show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}.
+        * Added parser for cli show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}.
+    * Added ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn
+        * Added schema and parser for 'Show Platform Software Fed Switch Number Ifm Mappings Lpn' under c9300
+    * Added ShowHardwareLed
+        * Added schema and parser for 'show hardware led' under c9610
+    * Added ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude
+        * Added 'show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}' command and schema for the command.
+    * Added ShowPlatformSoftwareFedActiveAclInfoDbDetail
+        * Added schema and parser for 'show platform software fed {mode} acl info db detail' under c9610
+    * Added ShowPlatformSoftwareFedSwitchActiveAclinfoSdkDetail parser.
+        * Added parser for cli 'show platform software fed switch {switch_var} acl info sdk detail'.
+        * Added parser for cli 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail'.
+        * Added parser for cli 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'.
+    * Added show interfaces | include {include}, show ip interface | include {include}, show ipv6 interface | include {include}
+    * Added ShowSwitchStackPortSummary
+        * Added schema and parser for 'show switch stack-ports summary' under c9350
+    * Added ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff
+        * show platform hardware fed switch {type} fwd-asic insight npl_summary_diff({f1}, {f2}).
+    * Added ShowDeviceTrackingCapturePolicy parser.
+        * Added parser for cli show device-tracking capture-policy.
+        * Added parser for cli show device-tracking capture-policy interface {interface_name}'.
+        * Added parser for cli show device-tracking capture-policy vlan {vlan_id}.
+    * Added ShowPlatformSoftwareFedIpMfibVrfCount
+        * Added 'show platform software fed {switch_var} {state} ip mfib vrf {vrf_name} count' command and schema for the command.
+    * Added ShowPlatformSoftwareFedIpIgmpSnoopingSummary
+        * Added 'show platform software fed {switch_var} {state} ip igmp snooping summary' command and schema for the command.
+    * Added ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount
+        * Added 'show ipv6 mld snooping address vlan {vlan} {group} summary' command and schema for the command.
+    * Added ShowPrpChannelDetails
+        * Added schema and parser for show prp channel detail
+    * Added ShowPlatformSoftwareInterfaceF0Name
+        * Added 'show platform software interface f0 name {intf}' command and schema for the command.
+    * Added ShowPlatformSoftwareObjectManagerF0ObjectDownlinks
+        * Added 'show platform software object manager f0 object down links' command and schema for the command.
+    * Added ShowPlatformSoftwareInfrastructureInject parser
+        * Added parser for cli show platform software infrastructure Inject
+    * Added ShowIpNbarProtocolPackActive
+        * Added show show ip nbar protocol-pack active
+
+* nxos
+    * Modified ShowNveVni
+        * show nve vni {vni}
+    * Added show interface {interface} | include {include}, show interface | include {include} to show interface
+
+* added showplatformhardwarefedswitchqosschedulerinterfaceinclude
+    * Added schema and parser for 'show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}'
+
+* added showplatformhardwarefedswitchqosinterfaceingressndpdetailedinclude
+    * Added schema and parser for 'show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}'
+
+
+--------------------------------------------------------------------------------
+                                      Add                                       
+--------------------------------------------------------------------------------
+
+* iosxe
+    * Added ShowPlatformFedActiveTcamUtilization
+        * Added parser for show platform software fed switch active tcam utilization parser for c9610
\ No newline at end of file
diff --git a/sdk_generator/outputs/github_parser.json b/sdk_generator/outputs/github_parser.json
index 773a607586..c25edf61ff 100644
--- a/sdk_generator/outputs/github_parser.json
+++ b/sdk_generator/outputs/github_parser.json
@@ -12008,7 +12008,7 @@
           "os": "iosxe"
         },
         "uid": "dir",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1496"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1497"
       },
       "iosxr": {
         "class": "Dir",
@@ -12109,7 +12109,7 @@
           "os": "iosxe"
         },
         "uid": "dir_directory",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1496"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1497"
       },
       "iosxr": {
         "class": "Dir",
@@ -12513,7 +12513,7 @@
           "os": "iosxe"
         },
         "uid": "hw-module_beacon_fan-tray_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L749"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L750"
       }
     }
   },
@@ -12529,7 +12529,7 @@
           "os": "iosxe"
         },
         "uid": "hw-module_beacon_slot_slot_num_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L782"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L783"
       }
     }
   },
@@ -12687,7 +12687,7 @@
           "os": "iosxe"
         },
         "uid": "monitor_capture_capture_name_stop",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L581"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L572"
       }
     }
   },
@@ -13449,7 +13449,7 @@
           "os": "iosxe"
         },
         "uid": "sh_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7636"
       }
     }
   },
@@ -13460,12 +13460,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache reverse-address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "sh_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7664"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7663"
       }
     }
   },
@@ -14143,7 +14143,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_ble_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2934"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2983"
       }
     }
   },
@@ -14159,7 +14159,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_cdp_neighbor",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1112"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1161"
       }
     }
   },
@@ -14175,7 +14175,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_config_general",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1342"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1391"
       }
     }
   },
@@ -14186,12 +14186,12 @@
         "doc": "Parser for show ap dot11 5ghz channel",
         "module_name": "iosxe.show_ap",
         "package": "genie.libs.parser",
-        "schema": "{\n    'channel_assignment': {\n        'chan_assn_mode': str,\n        'chan_upd_int': str,\n        'anchor_time_hour': int,\n        'channel_update_contribution': {\n            'channel_noise': 'Enable',\n            'channel_interference': str,\n            'channel_load': str,\n            'device_aware': str,\n        },\n        'clean_air': str,\n        Optional('zero_wait'): str,\n        'wlc_leader_name': str,\n        Optional('wlc_leader_ip'): str,\n        Optional('wlc_leader_ipv4'): str,\n        Optional('wlc_leader_ipv6'): str,\n        'last_run_seconds': int,\n        'dca_level': str,\n        Optional('dca_aggressive'): str,\n        'dca_db': int,\n        'chan_width_mhz': Or (<class 'int'>, <class 'str'>),\n        'max_chan_width_mhz': Or (<class 'int'>, <class 'float'>),\n        'dca_min_energy_dbm': Or (<class 'float'>, <class 'int'>),\n        'channel_energy_levels': {\n            'min_dbm': Or (<class 'float'>, <class 'int'>),\n            'average_dbm': Or (<class 'float'>, <class 'int'>),\n            'max_dbm': Or (<class 'float'>, <class 'int'>),\n        },\n        'channel_dwell_times': {\n            'minimum': str,\n            'average': str,\n            'max': str,\n        },\n        'allowed_channel_list': str,\n        'unused_channel_list': str,\n    },\n}",
+        "schema": "{\n    'channel_assignment': {\n        'chan_assn_mode': str,\n        'chan_upd_int': str,\n        'anchor_time_hour': int,\n        'channel_update_contribution': {\n            'channel_noise': 'Enable',\n            'channel_interference': str,\n            'channel_load': str,\n            'device_aware': str,\n        },\n        'clean_air': str,\n        Optional('zero_wait'): str,\n        'wlc_leader_name': str,\n        Optional('wlc_leader_ip'): str,\n        Optional('wlc_leader_ipv4'): str,\n        Optional('wlc_leader_ipv6'): str,\n        Optional('last_run_seconds'): int,\n        'dca_level': str,\n        Optional('dca_aggressive'): str,\n        'dca_db': int,\n        'chan_width_mhz': Or (<class 'int'>, <class 'str'>),\n        'max_chan_width_mhz': Or (<class 'int'>, <class 'float'>),\n        'dca_min_energy_dbm': Or (<class 'float'>, <class 'int'>),\n        'channel_energy_levels': {\n            'min_dbm': Or (<class 'float'>, <class 'int'>),\n            'average_dbm': Or (<class 'float'>, <class 'int'>),\n            'max_dbm': Or (<class 'float'>, <class 'int'>),\n        },\n        'channel_dwell_times': {\n            'minimum': str,\n            'average': str,\n            'max': str,\n        },\n        'allowed_channel_list': str,\n        'unused_channel_list': str,\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_ap_dot11_5ghz_channel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L367"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L383"
       }
     }
   },
@@ -14207,7 +14207,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_dot11_5ghz_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L784"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L833"
       }
     }
   },
@@ -14223,7 +14223,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_dot11_dual-band_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L273"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L289"
       }
     }
   },
@@ -14239,7 +14239,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_image",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L3003"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L3052"
       }
     }
   },
@@ -14255,7 +14255,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_led-brightness-level_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1018"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1067"
       }
     }
   },
@@ -14271,7 +14271,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_name_ap_name_config_general",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1342"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L1391"
       }
     }
   },
@@ -14287,7 +14287,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_rf-profile_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L163"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L179"
       }
     }
   },
@@ -14303,7 +14303,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2880"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2929"
       }
     }
   },
@@ -14335,7 +14335,7 @@
           "os": "iosxe"
         },
         "uid": "show_ap_tag_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2797"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ap.py#L2846"
       }
     }
   },
@@ -15179,7 +15179,7 @@
           "os": "iosxe"
         },
         "uid": "show_banner_motd",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3473"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3469"
       }
     }
   },
@@ -18612,7 +18612,7 @@
           "os": "iosxe"
         },
         "uid": "show_boot",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2849"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2850"
       },
       "nxos": {
         "class": "ShowBoot",
@@ -18716,7 +18716,7 @@
           "os": "iosxe"
         },
         "uid": "show_bootvar",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L87"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L88"
       }
     }
   },
@@ -18744,7 +18744,7 @@
           "os": "iosxe"
         },
         "uid": "show_bridge-domain",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L244"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L249"
       }
     }
   },
@@ -18772,7 +18772,7 @@
           "os": "iosxe"
         },
         "uid": "show_bridge-domain_bd_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L244"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L249"
       }
     }
   },
@@ -18800,7 +18800,7 @@
           "os": "iosxe"
         },
         "uid": "show_bridge-domain___count_word",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L244"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L249"
       }
     }
   },
@@ -18811,7 +18811,7 @@
         "doc": "Parser for show bundle",
         "module_name": "iosxr.show_lag",
         "package": "genie.libs.parser",
-        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': int,\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': Or (<class 'int'>, <class 'str'>),\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxr"
         },
@@ -18827,12 +18827,12 @@
         "doc": "Parser for \n    show bundle reasons\n    show bundle {interface} reasons\n    ",
         "module_name": "iosxr.show_lag",
         "package": "genie.libs.parser",
-        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': int,\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': Or (<class 'int'>, <class 'str'>),\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxr"
         },
         "uid": "show_bundle_reasons",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L581"
       }
     }
   },
@@ -18843,7 +18843,7 @@
         "doc": "Parser for show bundle",
         "module_name": "iosxr.show_lag",
         "package": "genie.libs.parser",
-        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': int,\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': Or (<class 'int'>, <class 'str'>),\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxr"
         },
@@ -18859,12 +18859,12 @@
         "doc": "Parser for \n    show bundle reasons\n    show bundle {interface} reasons\n    ",
         "module_name": "iosxr.show_lag",
         "package": "genie.libs.parser",
-        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': int,\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'name': str,\n            'bundle_id': int,\n            'oper_status': str,\n            'local_links': {\n                'active': int,\n                'standby': int,\n                'configured': int,\n            },\n            'local_bandwidth_kbps': {\n                'effective': int,\n                'available': int,\n            },\n            'mac_address': str,\n            'mac_address_source': str,\n            Optional('inter_chassis_link'): str,\n            'min_active_link': int,\n            'min_active_bw_kbps': int,\n            'max_active_link': int,\n            'wait_while_timer_ms': Or (<class 'int'>, <class 'str'>),\n            Optional('load_balance'): {\n                Optional('load_balance'): str,\n                Optional('link_order_signaling'): str,\n                Optional('hash_type'): str,\n                Optional('locality_threshold'): str,\n            },\n            'lacp': {\n                'lacp': str,\n                Optional('flap_suppression_timer'): str,\n                Optional('cisco_extensions'): str,\n                Optional('non_revertive'): str,\n            },\n            'mlacp': {\n                'mlacp': str,\n                Optional('iccp_group'): str,\n                Optional('role'): str,\n                Optional('foreign_links_active'): int,\n                Optional('foreign_links_configured'): int,\n                Optional('switchover_type'): str,\n                Optional('recovery_delay'): str,\n                Optional('maximize_threshold'): str,\n            },\n            'ipv4_bfd': {\n                'ipv4_bfd': str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('ipv6_bfd'): {\n                Optional('ipv6_bfd'): str,\n                Optional('state'): str,\n                Optional('fast_detect'): str,\n                Optional('start_timer'): str,\n                Optional('neighbor_unconfigured_timer'): str,\n                Optional('preferred_min_interval_ms'): int,\n                Optional('preferred_multiple'): int,\n                Optional('destination_address'): str,\n            },\n            Optional('port'): {\n                Any('*'): {\n                    'interface': str,\n                    'device': str,\n                    'state': str,\n                    'port_id': str,\n                    'bw_kbps': int,\n                    Optional('link_state'): str,\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxr"
         },
         "uid": "show_bundle_interface_reasons",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L581"
       }
     }
   },
@@ -19104,7 +19104,7 @@
           "os": "iosxe"
         },
         "uid": "show_call_admission_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6668"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6669"
       }
     }
   },
@@ -19120,7 +19120,7 @@
           "os": "iosxe"
         },
         "uid": "show_call_admission_statistics_detailed",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6836"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6837"
       }
     }
   },
@@ -22811,7 +22811,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_interface_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3878"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3880"
       }
     }
   },
@@ -22859,7 +22859,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_details_active",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3669"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3671"
       }
     }
   },
@@ -22875,7 +22875,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_details_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3669"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3671"
       }
     }
   },
@@ -22891,7 +22891,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_details_name_server_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3669"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3671"
       }
     }
   },
@@ -22907,7 +22907,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_statistics_active",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3468"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3470"
       }
     }
   },
@@ -22923,7 +22923,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_statistics_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3468"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3470"
       }
     }
   },
@@ -22939,7 +22939,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_policy-server_statistics_name_server_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3468"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3470"
       }
     }
   },
@@ -23446,12 +23446,12 @@
         "doc": "\n        Parser for :\n            show cts role-based sgt-map all\n            show cts role-based sgt-map all vrf <vrf> all\n    ",
         "module_name": "iosxe.show_cts",
         "package": "genie.libs.parser",
-        "schema": "{\n    Optional('ipv4_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n    Optional('ipv6_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n}",
+        "schema": "{\n    Optional('ipv4_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_cached'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n    Optional('ipv6_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_cached'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_cts_role-based_sgt-map_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2638"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2641"
       }
     }
   },
@@ -23462,12 +23462,12 @@
         "doc": "\n        Parser for :\n            show cts role-based sgt-map all\n            show cts role-based sgt-map all vrf <vrf> all\n    ",
         "module_name": "iosxe.show_cts",
         "package": "genie.libs.parser",
-        "schema": "{\n    Optional('ipv4_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n    Optional('ipv6_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n}",
+        "schema": "{\n    Optional('ipv4_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_cached'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n    Optional('ipv6_sgt_bindings'): {\n        Any('*'): {\n            'ip_address': str,\n            'sgt': int,\n            'source': str,\n        },\n        Optional('total_active'): int,\n        Optional('total_cli'): int,\n        Optional('total_sxp'): int,\n        Optional('total_internal'): int,\n        Optional('total_local'): int,\n        Optional('total_cached'): int,\n        Optional('total_l3if'): int,\n        Optional('total_vlan'): int,\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_cts_role-based_sgt-map_vrf_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2638"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2641"
       }
     }
   },
@@ -23515,7 +23515,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_server-list",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3185"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3187"
       }
     }
   },
@@ -23531,7 +23531,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_sxp_connections",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2752"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2754"
       }
     }
   },
@@ -23563,7 +23563,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_sxp_connections_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2752"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L2754"
       }
     }
   },
@@ -23595,7 +23595,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_sxp_sgt-map_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3040"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3042"
       }
     }
   },
@@ -23611,7 +23611,7 @@
           "os": "iosxe"
         },
         "uid": "show_cts_sxp_sgt-map_vrf_vrf_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3040"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3042"
       }
     }
   },
@@ -23707,7 +23707,7 @@
           "os": "iosxe"
         },
         "uid": "show_device_classifier_attached_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L172"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L170"
       }
     }
   },
@@ -23723,7 +23723,7 @@
           "os": "iosxe"
         },
         "uid": "show_device_classifier_attached_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L207"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L205"
       }
     }
   },
@@ -23739,7 +23739,7 @@
           "os": "iosxe"
         },
         "uid": "show_device_classifier_attached_interface_intf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L236"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L234"
       }
     }
   },
@@ -23755,7 +23755,7 @@
           "os": "iosxe"
         },
         "uid": "show_device_classifier_attached_mac-address_mac_address",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L285"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L283"
       }
     }
   },
@@ -23771,7 +23771,7 @@
           "os": "iosxe"
         },
         "uid": "show_device_classifier_profile_type_custom",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L333"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L331"
       }
     }
   },
@@ -23787,7 +23787,7 @@
           "os": "iosxe"
         },
         "uid": "show_device-sensor_cache_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L68"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L66"
       }
     }
   },
@@ -23803,7 +23803,7 @@
           "os": "iosxe"
         },
         "uid": "show_device-sensor_cache_mac_mac_address",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L68"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L66"
       }
     }
   },
@@ -23819,7 +23819,7 @@
           "os": "iosxe"
         },
         "uid": "show_device-sensor_cache_cache_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L68"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L66"
       }
     }
   },
@@ -23835,7 +23835,55 @@
           "os": "iosxe"
         },
         "uid": "show_device-sensor_details",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L393"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device.py#L391"
+      }
+    }
+  },
+  "show device-tracking capture-policy": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowDeviceTrackingCapturePolicy",
+        "doc": " show device-tracking capture-policy ",
+        "module_name": "iosxe.show_device_tracking",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Optional('hw_policy_db'): {\n        Any('*'): {\n            'targets': int,\n            'targets_list': {\n                Any('*'): {\n                    'type': int,\n                    'handle': str,\n                },\n            },\n        },\n    },\n    'target_db': {\n        Any('*'): {\n            'hw_policy_signature': str,\n            'policies': int,\n            'rules': int,\n            'sig': str,\n            'sw_policy': {\n                'policy': str,\n                'feature': str,\n            },\n            'mask_id': {\n                Any('*'): {\n                    'rule': str,\n                    'protocol': str,\n                    'mask': str,\n                    'action': str,\n                    'match1': int,\n                    'match2': int,\n                    'feat': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_device-tracking_capture-policy",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device_tracking.py#L2491"
+      }
+    }
+  },
+  "show device-tracking capture-policy interface {interface_name}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowDeviceTrackingCapturePolicy",
+        "doc": " show device-tracking capture-policy ",
+        "module_name": "iosxe.show_device_tracking",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Optional('hw_policy_db'): {\n        Any('*'): {\n            'targets': int,\n            'targets_list': {\n                Any('*'): {\n                    'type': int,\n                    'handle': str,\n                },\n            },\n        },\n    },\n    'target_db': {\n        Any('*'): {\n            'hw_policy_signature': str,\n            'policies': int,\n            'rules': int,\n            'sig': str,\n            'sw_policy': {\n                'policy': str,\n                'feature': str,\n            },\n            'mask_id': {\n                Any('*'): {\n                    'rule': str,\n                    'protocol': str,\n                    'mask': str,\n                    'action': str,\n                    'match1': int,\n                    'match2': int,\n                    'feat': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_device-tracking_capture-policy_interface_interface_name",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device_tracking.py#L2491"
+      }
+    }
+  },
+  "show device-tracking capture-policy vlan {vlan_id}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowDeviceTrackingCapturePolicy",
+        "doc": " show device-tracking capture-policy ",
+        "module_name": "iosxe.show_device_tracking",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Optional('hw_policy_db'): {\n        Any('*'): {\n            'targets': int,\n            'targets_list': {\n                Any('*'): {\n                    'type': int,\n                    'handle': str,\n                },\n            },\n        },\n    },\n    'target_db': {\n        Any('*'): {\n            'hw_policy_signature': str,\n            'policies': int,\n            'rules': int,\n            'sig': str,\n            'sw_policy': {\n                'policy': str,\n                'feature': str,\n            },\n            'mask_id': {\n                Any('*'): {\n                    'rule': str,\n                    'protocol': str,\n                    'mask': str,\n                    'action': str,\n                    'match1': int,\n                    'match2': int,\n                    'feat': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_device-tracking_capture-policy_vlan_vlan_id",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_device_tracking.py#L2491"
       }
     }
   },
@@ -24440,7 +24488,7 @@
           "os": "iosxe"
         },
         "uid": "show_diagnostic_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7665"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7666"
       }
     }
   },
@@ -25096,7 +25144,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3802"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3803"
       }
     }
   },
@@ -25112,7 +25160,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_fan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3817"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3818"
       }
     }
   },
@@ -25128,7 +25176,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_power",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3834"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3835"
       }
     }
   },
@@ -25144,7 +25192,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_power_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3851"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3852"
       }
     }
   },
@@ -25160,7 +25208,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_rps",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3866"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3867"
       }
     }
   },
@@ -25176,7 +25224,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_stack",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3883"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3884"
       }
     }
   },
@@ -25192,7 +25240,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_temperature",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3900"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3901"
       }
     }
   },
@@ -25208,7 +25256,7 @@
           "os": "iosxe"
         },
         "uid": "show_env_temperature_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3917"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3918"
       }
     }
   },
@@ -25278,7 +25326,7 @@
           "os": "iosxe"
         },
         "uid": "show_environment",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4433"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4434"
       },
       "nxos": {
         "class": "ShowEnvironment",
@@ -25382,7 +25430,7 @@
           "os": "iosxe"
         },
         "uid": "show_environment_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3786"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3787"
       }
     }
   },
@@ -25575,7 +25623,7 @@
           "os": "iosxe"
         },
         "uid": "show_environment_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5991"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5992"
       }
     }
   },
@@ -25656,7 +25704,7 @@
           "os": "iosxe"
         },
         "uid": "show_environment___include_include",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4433"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4434"
       }
     }
   },
@@ -26036,7 +26084,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L737"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L742"
       }
     }
   },
@@ -26064,7 +26112,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L447"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L452"
       }
     }
   },
@@ -26092,7 +26140,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_id_service_instance_id_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L447"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L452"
       }
     }
   },
@@ -26120,7 +26168,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_id_service_instance_id_interface_interface_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L781"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L786"
       }
     }
   },
@@ -26148,7 +26196,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L447"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L452"
       }
     }
   },
@@ -26176,7 +26224,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_interface_interface_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L781"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L786"
       }
     }
   },
@@ -26204,7 +26252,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L781"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L786"
       }
     }
   },
@@ -26232,7 +26280,7 @@
           "os": "iosxe"
         },
         "uid": "show_ethernet_service_instance_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L891"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L896"
       }
     }
   },
@@ -26886,7 +26934,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_globals",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2205"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2214"
       }
     }
   },
@@ -26902,7 +26950,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_l2-mroute_vni_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2631"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2640"
       }
     }
   },
@@ -26918,7 +26966,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_l2-mroute_vni_vni",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2631"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2640"
       }
     }
   },
@@ -26934,7 +26982,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_mroute",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2493"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2502"
       }
     }
   },
@@ -26950,7 +26998,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_mroute_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2493"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2502"
       }
     }
   },
@@ -26966,7 +27014,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_sa-ad-route",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2360"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2369"
       }
     }
   },
@@ -26982,7 +27030,7 @@
           "os": "nxos"
         },
         "uid": "show_fabric_multicast_ipv4_sa-ad-route_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2360"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2369"
       }
     }
   },
@@ -27110,7 +27158,7 @@
           "os": "iosxe"
         },
         "uid": "show_file_descriptors_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9101"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9102"
       }
     }
   },
@@ -27126,7 +27174,7 @@
           "os": "iosxe"
         },
         "uid": "show_file_information_file",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9054"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9055"
       }
     }
   },
@@ -27142,7 +27190,7 @@
           "os": "iosxe"
         },
         "uid": "show_file_systems",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7418"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7419"
       }
     }
   },
@@ -27847,7 +27895,7 @@
           "os": "iosxe"
         },
         "uid": "show_graceful-reload",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8989"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8990"
       }
     }
   },
@@ -27978,6 +28026,18 @@
                 },
                 "uid": "show_hardware_led",
                 "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9600/show_hardware.py#L80"
+              },
+              "c9610": {
+                "class": "ShowHardwareLed",
+                "doc": " Parser for show hardware led",
+                "module_name": "iosxe.cat9k.c9610.show_hardware",
+                "package": "genie.libs.parser",
+                "schema": "{\n    Optional('switch'): {\n        Any('*'): {\n            'line_card': {\n                Any('*'): {\n                    'number_of_ports_in_status': int,\n                    'port_led_status': {\n                        '<class 'str'>': str,\n                    },\n                    'beacon': str,\n                    'status': str,\n                },\n            },\n            'supervisor': {\n                Any('*'): {\n                    Optional('port_led_status'): {\n                        '<class 'str'>': str,\n                    },\n                    'slot': int,\n                    'beacon': str,\n                    'status': str,\n                    'system': str,\n                    'active': str,\n                },\n            },\n            'fantray_status': str,\n            'fantray_beacon': str,\n            'model': str,\n            'system': str,\n        },\n    },\n    Optional('line_card'): {\n        Any('*'): {\n            'number_of_ports_in_status': int,\n            'port_led_status': {\n                '<class 'str'>': str,\n            },\n            'beacon': str,\n            'status': str,\n        },\n    },\n    Optional('supervisor'): {\n        Any('*'): {\n            Optional('port_led_status'): {\n                '<class 'str'>': str,\n            },\n            'slot': int,\n            'beacon': str,\n            Optional('status'): str,\n            Optional('system'): str,\n            Optional('active'): str,\n        },\n    },\n    Optional('fantray_status'): str,\n    Optional('fantray_beacon'): str,\n    Optional('model'): str,\n    Optional('system'): str,\n}",
+                "tokens": {
+                  "model": "c9610"
+                },
+                "uid": "show_hardware_led",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9610/show_hardware.py#L80"
               }
             },
             "tokens": {
@@ -27987,7 +28047,7 @@
         },
         "module_name": "iosxe.show_hw",
         "package": "genie.libs.parser",
-        "schema": "{\n    Optional('current_mode'): str,\n    Optional('led_ecomode'): str,\n    Optional('switch'): {\n        Any('*'): {\n            'system': str,\n            Optional('beacon'): str,\n            Optional('master'): str,\n            Optional('port_led_status'): {\n                '<class 'str'>': str,\n            },\n            Optional('port_duplex'): {\n                Any('*'): str,\n            },\n            Optional('port_speed'): {\n                Any('*'): str,\n            },\n            Optional('stack_port'): {\n                Any('*'): str,\n            },\n            Optional('poe_port'): {\n                Any('*'): str,\n            },\n            'rj45_console': str,\n            Optional('fantray_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('power_supply_beacon_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('system_psu'): str,\n            Optional('system_fan'): str,\n            Optional('stack_power'): str,\n            Optional('xps'): str,\n            Optional('usb_console'): str,\n        },\n    },\n    Optional('system'): str,\n    Optional('status'): {\n        '<class 'str'>': str,\n    },\n    Optional('number_of_ports_in_status'): str,\n    Optional('express_setup'): str,\n    Optional('dc_a'): str,\n    Optional('dc_b'): str,\n    Optional('alarm-out'): str,\n    Optional('alarm-in1'): str,\n    Optional('alarm-in2'): str,\n    Optional('alarm-in3'): str,\n    Optional('alarm-in4'): str,\n}",
+        "schema": "{\n    Optional('current_mode'): str,\n    Optional('led_auto_off'): str,\n    Optional('switch'): {\n        Any('*'): {\n            'system': str,\n            Optional('beacon'): str,\n            Optional('master'): str,\n            Optional('port_led_status'): {\n                '<class 'str'>': str,\n            },\n            Optional('port_duplex'): {\n                Any('*'): str,\n            },\n            Optional('port_speed'): {\n                Any('*'): str,\n            },\n            Optional('stack_port'): {\n                Any('*'): str,\n            },\n            Optional('poe_port'): {\n                Any('*'): str,\n            },\n            'rj45_console': str,\n            Optional('fantray_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('power_supply_beacon_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('system_psu'): str,\n            Optional('system_fan'): str,\n            Optional('stack_power'): str,\n            Optional('xps'): str,\n            Optional('usb_console'): str,\n        },\n    },\n    Optional('system'): str,\n    Optional('status'): {\n        '<class 'str'>': str,\n    },\n    Optional('number_of_ports_in_status'): str,\n    Optional('express_setup'): str,\n    Optional('dc_a'): str,\n    Optional('dc_b'): str,\n    Optional('alarm-out'): str,\n    Optional('alarm-in1'): str,\n    Optional('alarm-in2'): str,\n    Optional('alarm-in3'): str,\n    Optional('alarm-in4'): str,\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -28008,7 +28068,7 @@
           "os": "iosxe"
         },
         "uid": "show_hardware_led_port_port",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L503"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L504"
       }
     }
   },
@@ -28024,7 +28084,7 @@
           "os": "iosxe"
         },
         "uid": "show_hardware_led_port_port_mode",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L706"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L707"
       }
     }
   },
@@ -28035,7 +28095,7 @@
         "doc": " Parser for show hardware led",
         "module_name": "iosxe.show_hw",
         "package": "genie.libs.parser",
-        "schema": "{\n    Optional('current_mode'): str,\n    Optional('led_ecomode'): str,\n    Optional('switch'): {\n        Any('*'): {\n            'system': str,\n            Optional('beacon'): str,\n            Optional('master'): str,\n            Optional('port_led_status'): {\n                '<class 'str'>': str,\n            },\n            Optional('port_duplex'): {\n                Any('*'): str,\n            },\n            Optional('port_speed'): {\n                Any('*'): str,\n            },\n            Optional('stack_port'): {\n                Any('*'): str,\n            },\n            Optional('poe_port'): {\n                Any('*'): str,\n            },\n            'rj45_console': str,\n            Optional('fantray_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('power_supply_beacon_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('system_psu'): str,\n            Optional('system_fan'): str,\n            Optional('stack_power'): str,\n            Optional('xps'): str,\n            Optional('usb_console'): str,\n        },\n    },\n    Optional('system'): str,\n    Optional('status'): {\n        '<class 'str'>': str,\n    },\n    Optional('number_of_ports_in_status'): str,\n    Optional('express_setup'): str,\n    Optional('dc_a'): str,\n    Optional('dc_b'): str,\n    Optional('alarm-out'): str,\n    Optional('alarm-in1'): str,\n    Optional('alarm-in2'): str,\n    Optional('alarm-in3'): str,\n    Optional('alarm-in4'): str,\n}",
+        "schema": "{\n    Optional('current_mode'): str,\n    Optional('led_auto_off'): str,\n    Optional('switch'): {\n        Any('*'): {\n            'system': str,\n            Optional('beacon'): str,\n            Optional('master'): str,\n            Optional('port_led_status'): {\n                '<class 'str'>': str,\n            },\n            Optional('port_duplex'): {\n                Any('*'): str,\n            },\n            Optional('port_speed'): {\n                Any('*'): str,\n            },\n            Optional('stack_port'): {\n                Any('*'): str,\n            },\n            Optional('poe_port'): {\n                Any('*'): str,\n            },\n            'rj45_console': str,\n            Optional('fantray_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('power_supply_beacon_status'): {\n                '<class 'int'>': str,\n            },\n            Optional('system_psu'): str,\n            Optional('system_fan'): str,\n            Optional('stack_power'): str,\n            Optional('xps'): str,\n            Optional('usb_console'): str,\n        },\n    },\n    Optional('system'): str,\n    Optional('status'): {\n        '<class 'str'>': str,\n    },\n    Optional('number_of_ports_in_status'): str,\n    Optional('express_setup'): str,\n    Optional('dc_a'): str,\n    Optional('dc_b'): str,\n    Optional('alarm-out'): str,\n    Optional('alarm-in1'): str,\n    Optional('alarm-in2'): str,\n    Optional('alarm-in3'): str,\n    Optional('alarm-in4'): str,\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -28340,7 +28400,7 @@
           "os": "iosxe"
         },
         "uid": "show_hw-module_slot_slot_port-group_mode",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L555"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L556"
       }
     }
   },
@@ -28356,7 +28416,7 @@
           "os": "iosxe"
         },
         "uid": "show_hw-module_usbflash1_security_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L610"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L611"
       }
     }
   },
@@ -28372,7 +28432,7 @@
           "os": "iosxe"
         },
         "uid": "show_hw-module_usbflash1_switch_switch_num_security_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L610"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L611"
       }
     }
   },
@@ -28388,7 +28448,7 @@
           "os": "iosxe"
         },
         "uid": "show_hw-module_filesystem_security-lock_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L654"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_hw.py#L655"
       }
     }
   },
@@ -29116,7 +29176,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2861"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2865"
       }
     }
   },
@@ -29132,7 +29192,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_capabilities",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3871"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3875"
       }
     }
   },
@@ -29148,7 +29208,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_counters",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5138"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5142"
       }
     }
   },
@@ -29164,7 +29224,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_description",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3629"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3633"
       }
     }
   },
@@ -29208,7 +29268,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_fec",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4996"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5000"
       }
     }
   },
@@ -29224,7 +29284,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_hardware-mappings",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5061"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5065"
       }
     }
   },
@@ -29256,7 +29316,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3701"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3705"
       }
     }
   },
@@ -29300,7 +29360,7 @@
           "os": "iosxe"
         },
         "uid": "show_interface_summary_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4207"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4275"
       }
     }
   },
@@ -29316,7 +29376,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_switchport",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2009"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2013"
       }
     }
   },
@@ -29332,7 +29392,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_transceiver",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4220"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4224"
       }
     }
   },
@@ -29348,7 +29408,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_transceiver_details",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4557"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4561"
       }
     }
   },
@@ -29364,7 +29424,7 @@
           "os": "iosxe"
         },
         "uid": "show_interface_interface_id_etherchannel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5278"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5346"
       }
     }
   },
@@ -29408,7 +29468,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2861"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2865"
       }
     }
   },
@@ -29424,7 +29484,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_capabilities",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3871"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3875"
       }
     }
   },
@@ -29440,7 +29500,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_counters",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5138"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L5142"
       }
     }
   },
@@ -29472,7 +29532,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_description",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3629"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3633"
       }
     }
   },
@@ -29504,7 +29564,7 @@
           "os": "iosxe"
         },
         "uid": "show_interface_interface_human-readable",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5633"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5701"
       }
     }
   },
@@ -29520,7 +29580,7 @@
           "os": "iosxe"
         },
         "uid": "show_interface_interface_human-readable___i_drops",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5580"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5648"
       }
     }
   },
@@ -29536,7 +29596,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3701"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3705"
       }
     }
   },
@@ -29552,7 +29612,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_switchport",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2009"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2013"
       }
     }
   },
@@ -29568,7 +29628,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_transceiver",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4220"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4224"
       }
     }
   },
@@ -29584,7 +29644,7 @@
           "os": "nxos"
         },
         "uid": "show_interface_interface_transceiver_details",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4557"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L4561"
       }
     }
   },
@@ -29600,7 +29660,23 @@
           "os": "iosxe"
         },
         "uid": "show_interface_interface_vlan_mapping",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5538"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5606"
+      }
+    }
+  },
+  "show interface {interface} | include {include}": {
+    "folders": {
+      "nxos": {
+        "class": "ShowInterface",
+        "doc": "Parser for show interface, show interface <interface>",
+        "module_name": "nxos.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        Optional('description'): str,\n        Optional('types'): str,\n        Optional('parent_interface'): str,\n        'oper_status': str,\n        Optional('admin_state'): str,\n        Optional('dedicated_interface'): bool,\n        Optional('line_protocol'): str,\n        Optional('autostate'): bool,\n        Optional('link_state'): str,\n        Optional('phys_address'): str,\n        Optional('port_speed'): str,\n        Optional('port_speed_unit'): str,\n        Optional('mtu'): int,\n        'enabled': bool,\n        Optional('mac_address'): str,\n        Optional('auto_negotiate'): bool,\n        Optional('fec_mode'): str,\n        Optional('duplex_mode'): str,\n        Optional('port_mode'): str,\n        Optional('auto_mdix'): str,\n        Optional('switchport_monitor'): str,\n        Optional('efficient_ethernet'): str,\n        Optional('last_link_flapped'): str,\n        Optional('last_clear_counters'): str,\n        Optional('interface_reset'): int,\n        Optional('ethertype'): str,\n        Optional('beacon'): str,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('delay'): int,\n        Optional('media_type'): str,\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_unicast_pkts'): int,\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_discards'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_oversize_frames'): int,\n            Optional('in_pkts'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_jumbo_packets'): int,\n            Optional('in_storm_suppression_packets'): int,\n            Optional('in_storm_suppression_bytes'): int,\n            Optional('in_runts'): int,\n            Optional('in_oversize_frame'): int,\n            Optional('in_overrun'): int,\n            Optional('in_underrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_bad_etype_drop'): int,\n            Optional('in_unknown_protos'): int,\n            Optional('in_if_down_drop'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_discard'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_short_frame'): int,\n            Optional('in_no_buffer'): int,\n            Optional('out_pkts'): int,\n            Optional('out_unicast_pkts'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_discard'): int,\n            Optional('out_octets'): int,\n            Optional('out_jumbo_packets'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_deferred'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('last_clear'): str,\n            Optional('tx'): bool,\n            Optional('rx'): bool,\n            Optional('out_mac_pause_frames'): int,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n                Optional('route_tag'): str,\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "nxos"
+        },
+        "uid": "show_interface_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L185"
       }
     }
   },
@@ -29648,7 +29724,23 @@
           "os": "nxos"
         },
         "uid": "show_interface___i_nve",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L345"
+      }
+    }
+  },
+  "show interface | include {include}": {
+    "folders": {
+      "nxos": {
+        "class": "ShowInterface",
+        "doc": "Parser for show interface, show interface <interface>",
+        "module_name": "nxos.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        Optional('description'): str,\n        Optional('types'): str,\n        Optional('parent_interface'): str,\n        'oper_status': str,\n        Optional('admin_state'): str,\n        Optional('dedicated_interface'): bool,\n        Optional('line_protocol'): str,\n        Optional('autostate'): bool,\n        Optional('link_state'): str,\n        Optional('phys_address'): str,\n        Optional('port_speed'): str,\n        Optional('port_speed_unit'): str,\n        Optional('mtu'): int,\n        'enabled': bool,\n        Optional('mac_address'): str,\n        Optional('auto_negotiate'): bool,\n        Optional('fec_mode'): str,\n        Optional('duplex_mode'): str,\n        Optional('port_mode'): str,\n        Optional('auto_mdix'): str,\n        Optional('switchport_monitor'): str,\n        Optional('efficient_ethernet'): str,\n        Optional('last_link_flapped'): str,\n        Optional('last_clear_counters'): str,\n        Optional('interface_reset'): int,\n        Optional('ethertype'): str,\n        Optional('beacon'): str,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('delay'): int,\n        Optional('media_type'): str,\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_unicast_pkts'): int,\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_discards'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_oversize_frames'): int,\n            Optional('in_pkts'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_jumbo_packets'): int,\n            Optional('in_storm_suppression_packets'): int,\n            Optional('in_storm_suppression_bytes'): int,\n            Optional('in_runts'): int,\n            Optional('in_oversize_frame'): int,\n            Optional('in_overrun'): int,\n            Optional('in_underrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_bad_etype_drop'): int,\n            Optional('in_unknown_protos'): int,\n            Optional('in_if_down_drop'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_discard'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_short_frame'): int,\n            Optional('in_no_buffer'): int,\n            Optional('out_pkts'): int,\n            Optional('out_unicast_pkts'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_discard'): int,\n            Optional('out_octets'): int,\n            Optional('out_jumbo_packets'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_deferred'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('last_clear'): str,\n            Optional('tx'): bool,\n            Optional('rx'): bool,\n            Optional('out_mac_pause_frames'): int,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n                Optional('route_tag'): str,\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "nxos"
+        },
+        "uid": "show_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L185"
       }
     }
   },
@@ -29671,7 +29763,7 @@
         "doc": "parser for show interfaces",
         "module_name": "ios.show_interface",
         "package": "genie.libs.parser",
-        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n    },\n}",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
         "tokens": {
           "os": "ios"
         },
@@ -29683,12 +29775,12 @@
         "doc": "parser for show interfaces\n                  show interfaces <interface>",
         "module_name": "iosxe.show_interface",
         "package": "genie.libs.parser",
-        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n    },\n}",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_interfaces",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L232"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L236"
       },
       "iosxr": {
         "class": "ShowInterfaces",
@@ -29740,7 +29832,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_accounting",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3459"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3526"
       },
       "iosxr": {
         "class": "ShowInterfacesAccounting",
@@ -29800,7 +29892,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_capabilities",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5409"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5477"
       }
     }
   },
@@ -29844,7 +29936,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_description",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3717"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3784"
       },
       "iosxr": {
         "class": "ShowInterfacesDescription",
@@ -30000,7 +30092,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_link",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3570"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3637"
       }
     }
   },
@@ -30016,7 +30108,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_mtu",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4404"
       }
     }
   },
@@ -30032,7 +30124,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_mtu_module_mod",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4404"
       }
     }
   },
@@ -30064,7 +30156,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_private-vlan_mapping",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5213"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5281"
       }
     }
   },
@@ -30140,7 +30232,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3650"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3717"
       }
     }
   },
@@ -30168,7 +30260,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3856"
       }
     }
   },
@@ -30184,7 +30276,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_status_err-disabled",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3872"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3939"
       }
     }
   },
@@ -30200,7 +30292,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_status_module_mod",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4410"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4478"
       }
     }
   },
@@ -30216,7 +30308,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4270"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4338"
       }
     }
   },
@@ -30244,7 +30336,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_switchport",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1652"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1715"
       }
     }
   },
@@ -30320,7 +30412,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_transceiver",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4073"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4140"
       }
     }
   },
@@ -30348,7 +30440,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_transceiver_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3964"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4031"
       }
     }
   },
@@ -30380,7 +30472,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_transceiver_supported-list",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4567"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4635"
       }
     }
   },
@@ -30408,7 +30500,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_trunk",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3303"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3370"
       }
     }
   },
@@ -30440,7 +30532,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_id_flowcontrol",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5483"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5551"
       }
     }
   },
@@ -30463,7 +30555,7 @@
         "doc": "parser for show interfaces",
         "module_name": "ios.show_interface",
         "package": "genie.libs.parser",
-        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n    },\n}",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
         "tokens": {
           "os": "ios"
         },
@@ -30475,12 +30567,12 @@
         "doc": "parser for show interfaces\n                  show interfaces <interface>",
         "module_name": "iosxe.show_interface",
         "package": "genie.libs.parser",
-        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): int,\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n    },\n}",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L232"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L236"
       },
       "iosxr": {
         "class": "ShowInterfaces",
@@ -30532,7 +30624,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_accounting",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3459"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3526"
       },
       "iosxr": {
         "class": "ShowInterfacesAccounting",
@@ -30560,7 +30652,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_capabilities",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5409"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L5477"
       }
     }
   },
@@ -30576,7 +30668,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_counter_etherchannel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3427"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3494"
       }
     }
   },
@@ -30604,7 +30696,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_counters",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3384"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3451"
       }
     }
   },
@@ -30648,7 +30740,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_description",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3717"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3784"
       },
       "iosxr": {
         "class": "ShowInterfacesDescription",
@@ -30708,7 +30800,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_link",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3570"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3637"
       }
     }
   },
@@ -30724,7 +30816,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_mtu",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4404"
       }
     }
   },
@@ -30752,7 +30844,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3650"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3717"
       }
     }
   },
@@ -30780,7 +30872,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3856"
       }
     }
   },
@@ -30796,7 +30888,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4270"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4338"
       }
     }
   },
@@ -30824,7 +30916,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_switchport",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1652"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1715"
       }
     }
   },
@@ -30868,7 +30960,7 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_transceiver",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4073"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4140"
       }
     }
   },
@@ -30896,7 +30988,35 @@
           "os": "iosxe"
         },
         "uid": "show_interfaces_interface_transceiver_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L3964"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4031"
+      }
+    }
+  },
+  "show interfaces | include {include}": {
+    "folders": {
+      "ios": {
+        "class": "ShowInterfaces",
+        "doc": "parser for show interfaces",
+        "module_name": "ios.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
+        "tokens": {
+          "os": "ios"
+        },
+        "uid": "show_interfaces___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/ios/show_interface.py#L51"
+      },
+      "iosxe": {
+        "class": "ShowInterfaces",
+        "doc": "parser for show interfaces\n                  show interfaces <interface>",
+        "module_name": "iosxe.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        Optional('oper_status'): str,\n        Optional('line_protocol'): str,\n        Optional('enabled'): bool,\n        Optional('is_deleted'): bool,\n        Optional('connected'): bool,\n        Optional('err_disabled'): bool,\n        Optional('suspended'): bool,\n        Optional('description'): str,\n        Optional('type'): str,\n        Optional('link_state'): str,\n        Optional('port_speed'): str,\n        Optional('duplex_mode'): str,\n        Optional('link_type'): str,\n        Optional('media_type'): str,\n        Optional('mtu'): int,\n        Optional('maximum_active_vcs'): str,\n        Optional('vcs_per_vp'): str,\n        Optional('vc_idle_disconnect_time'): str,\n        Optional('vc_auto_creation'): str,\n        Optional('current_vccs'): str,\n        Optional('aal5_crc_errors'): int,\n        Optional('aal5_oversized_sdus'): int,\n        Optional('aal5_sar_timeouts'): int,\n        Optional('vaccess_status'): str,\n        Optional('vaccess_loopback'): str,\n        Optional('base_pppoatm'): str,\n        Optional('dtr_pulsed'): str,\n        Optional('sub_mtu'): int,\n        Optional('medium'): str,\n        Optional('reliability'): str,\n        Optional('txload'): str,\n        Optional('rxload'): str,\n        Optional('mac_address'): str,\n        Optional('phys_address'): str,\n        Optional('delay'): int,\n        Optional('carrier_delay'): int,\n        Optional('carrier_delay_up'): int,\n        Optional('carrier_delay_down'): int,\n        Optional('keepalive'): int,\n        Optional('auto_negotiate'): bool,\n        Optional('arp_type'): str,\n        Optional('arp_timeout'): str,\n        Optional('last_input'): str,\n        Optional('last_output'): str,\n        Optional('output_hang'): str,\n        Optional('autostate'): bool,\n        Optional('tunnel_source_ip'): str,\n        Optional('tunnel_source_interface'): str,\n        Optional('tunnel_destination_ip'): str,\n        Optional('tunnel_protocol'): str,\n        Optional('tunnel_ttl'): int,\n        Optional('tunnel_transport_mtu'): int,\n        Optional('tunnel_transmit_bandwidth'): int,\n        Optional('tunnel_receive_bandwidth'): int,\n        Optional('tunnel_protection'): str,\n        Optional('tunnel_profile'): str,\n        Optional('carrier_transitions'): int,\n        Optional('queues'): {\n            Optional('input_queue_size'): int,\n            Optional('input_queue_max'): int,\n            Optional('input_queue_drops'): int,\n            Optional('input_queue_flushes'): int,\n            Optional('total_output_drop'): int,\n            Optional('queue_strategy'): str,\n            Optional('output_queue_size'): int,\n            Optional('output_queue_max'): int,\n            Optional('threshold'): int,\n            Optional('drops'): int,\n        },\n        Optional('flow_control'): {\n            Optional('receive'): bool,\n            Optional('send'): bool,\n        },\n        Optional('port_channel'): {\n            Optional('port_channel_member'): bool,\n            Optional('port_channel_int'): str,\n            Optional('port_channel_member_intfs'): list,\n            Optional('active_members'): int,\n            Optional('num_of_pf_jumbo_supported_members'): int,\n        },\n        Optional('bandwidth'): Or (<class 'int'>, <class 'str'>),\n        Optional('counters'): {\n            Optional('rate'): {\n                Optional('load_interval'): int,\n                Optional('in_rate'): int,\n                Optional('in_rate_pkts'): int,\n                Optional('out_rate'): int,\n                Optional('out_rate_pkts'): int,\n                Optional('in_rate_bps'): int,\n                Optional('in_rate_pps'): int,\n                Optional('out_rate_bps'): int,\n                Optional('out_rate_pps'): int,\n            },\n            Optional('in_multicast_pkts'): int,\n            Optional('in_broadcast_pkts'): int,\n            Optional('in_crc_errors'): int,\n            Optional('in_giants'): int,\n            Optional('in_pkts'): int,\n            Optional('in_frame'): int,\n            Optional('in_runts'): int,\n            Optional('in_overrun'): int,\n            Optional('in_ignored'): int,\n            Optional('in_watchdog'): int,\n            Optional('in_with_dribble'): int,\n            Optional('in_octets'): int,\n            Optional('in_errors'): int,\n            Optional('in_abort'): int,\n            Optional('in_no_buffer'): int,\n            Optional('in_throttles'): int,\n            Optional('in_mac_pause_frames'): int,\n            Optional('in_drops'): int,\n            Optional('out_pkts'): int,\n            Optional('out_octets'): int,\n            Optional('out_multicast_pkts'): int,\n            Optional('out_broadcast_pkts'): int,\n            Optional('out_errors'): int,\n            Optional('out_collision'): int,\n            Optional('out_interface_resets'): int,\n            Optional('out_unknown_protocl_drops'): int,\n            Optional('out_babbles'): int,\n            Optional('out_deferred'): int,\n            Optional('out_underruns'): int,\n            Optional('out_late_collision'): int,\n            Optional('out_lost_carrier'): int,\n            Optional('out_no_carrier'): int,\n            Optional('out_babble'): int,\n            Optional('out_mac_pause_frames'): int,\n            Optional('out_buffer_failure'): int,\n            Optional('out_buffers_swapped'): int,\n            Optional('out_drops'): int,\n            Optional('last_clear'): str,\n        },\n        Optional('encapsulations'): {\n            Optional('encapsulation'): str,\n            Optional('first_dot1q'): str,\n            Optional('second_dot1q'): str,\n            Optional('native_vlan'): int,\n        },\n        Optional('ipv4'): {\n            Any('*'): {\n                Optional('ip'): str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('peer_ip'): str,\n        Optional('vc_id'): int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_interfaces___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L236"
       }
     }
   },
@@ -31008,7 +31128,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_inventory",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L798"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L802"
               }
             },
             "tokens": {
@@ -31023,7 +31143,7 @@
           "os": "iosxe"
         },
         "uid": "show_inventory",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2075"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2076"
       },
       "iosxr": {
         "class": "ShowInventory",
@@ -32876,7 +32996,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1800"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1796"
       }
     }
   },
@@ -32908,7 +33028,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2567"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2563"
       }
     }
   },
@@ -32940,7 +33060,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1800"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1796"
       }
     }
   },
@@ -32956,7 +33076,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_vrf_vrf_ip_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2567"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2563"
       }
     }
   },
@@ -32972,7 +33092,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_vrf_vrf_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1800"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1796"
       }
     }
   },
@@ -32988,7 +33108,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_ip_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2567"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2563"
       }
     }
   },
@@ -33004,7 +33124,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1800"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L1796"
       }
     }
   },
@@ -33020,7 +33140,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_cef_prefix_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2075"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2071"
       }
     }
   },
@@ -33100,7 +33220,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_dhcp_excluded-addresses_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6640"
       }
     }
   },
@@ -33116,7 +33236,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_dhcp_excluded-addresses_pool_pool",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6640"
       }
     }
   },
@@ -33132,7 +33252,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_dhcp_excluded-addresses_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6640"
       }
     }
   },
@@ -33612,7 +33732,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_http_server_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6968"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6971"
       }
     }
   },
@@ -33628,7 +33748,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_http_server_secure_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7478"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7481"
       }
     }
   },
@@ -33980,7 +34100,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_igmp_snooping_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6712"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L6715"
       },
       "nxos": {
         "class": "ShowIpIgmpSnooping",
@@ -34180,7 +34300,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2199"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2262"
       },
       "ironware": {
         "class": "ShowIPInterface",
@@ -34220,7 +34340,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1360"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1423"
       },
       "iosxr": {
         "class": "ShowIpInterfaceBriefPipeVlan",
@@ -34244,7 +34364,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2687"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2691"
       }
     }
   },
@@ -34260,7 +34380,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_brief_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3548"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3552"
       }
     }
   },
@@ -34276,7 +34396,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_brief_vrf_all___include_ip",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3548"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3552"
       }
     }
   },
@@ -34304,7 +34424,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface_brief_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1360"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1423"
       }
     }
   },
@@ -34332,7 +34452,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface_brief___include_Vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1442"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1505"
       },
       "nxos": {
         "class": "ShowIpInterfaceBriefPipeVlan",
@@ -34344,7 +34464,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_brief___include_Vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2771"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2775"
       }
     }
   },
@@ -34372,7 +34492,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface_brief___include_ip",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1547"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L1610"
       },
       "iosxr": {
         "class": "ShowIpInterfaceBriefPipeVlan",
@@ -34400,7 +34520,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1215"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1219"
       }
     }
   },
@@ -34416,7 +34536,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1215"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1219"
       }
     }
   },
@@ -34444,7 +34564,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2199"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2262"
       }
     }
   },
@@ -34460,7 +34580,7 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_interface_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1215"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1219"
       }
     }
   },
@@ -34476,7 +34596,35 @@
           "os": "nxos"
         },
         "uid": "show_ip_interface_interface_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1215"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1219"
+      }
+    }
+  },
+  "show ip interface | include {include}": {
+    "folders": {
+      "ios": {
+        "class": "ShowIpInterface",
+        "doc": "Parser for show ip interface",
+        "module_name": "ios.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        'enabled': bool,\n        'oper_status': str,\n        Optional('ipv4'): {\n            Any('*'): {\n                'ip': str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n                Optional('broadcast_address'): str,\n            },\n        },\n        Optional('mtu'): int,\n        Optional('address_determined_by'): str,\n        Optional('helper_address'): Or (<class 'str'>, <class 'list'>),\n        Optional('directed_broadcast_forwarding'): bool,\n        Optional('outbound_common_access_list'): str,\n        Optional('outbound_access_list'): str,\n        Optional('inbound_common_access_list'): str,\n        Optional('inbound_access_list'): str,\n        Optional('proxy_arp'): bool,\n        Optional('local_proxy_arp'): bool,\n        Optional('security_level'): str,\n        Optional('split_horizon'): bool,\n        Optional('icmp'): {\n            Optional('redirects'): str,\n            Optional('unreachables'): str,\n            Optional('mask_replies'): str,\n        },\n        Optional('wccp'): {\n            Optional('redirect_outbound'): bool,\n            Optional('redirect_inbound'): bool,\n            Optional('redirect_exclude'): bool,\n        },\n        Optional('ip_fast_switching'): bool,\n        Optional('ip_flow_switching'): bool,\n        Optional('ip_cef_switching'): bool,\n        Optional('ip_cef_switching_turbo_vector'): bool,\n        Optional('ip_null_turbo_vector'): bool,\n        Optional('vrf'): str,\n        Optional('unicast_routing_topologies'): {\n            'topology': {\n                Any('*'): {\n                    'status': str,\n                },\n            },\n        },\n        Optional('ip_multicast_fast_switching'): bool,\n        Optional('ip_multicast_distributed_fast_switching'): bool,\n        Optional('ip_route_cache_flags'): list,\n        Optional('router_discovery'): bool,\n        Optional('ip_output_packet_accounting'): bool,\n        Optional('ip_access_violation_accounting'): bool,\n        Optional('tcp_ip_header_compression'): bool,\n        Optional('rtp_ip_header_compression'): bool,\n        Optional('probe_proxy_name_replies'): bool,\n        Optional('policy_routing'): bool,\n        Optional('network_address_translation'): bool,\n        Optional('bgp_policy_mapping'): bool,\n        Optional('input_features'): list,\n        Optional('multicast_groups'): list,\n    },\n}",
+        "tokens": {
+          "os": "ios"
+        },
+        "uid": "show_ip_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/ios/show_interface.py#L82"
+      },
+      "iosxe": {
+        "class": "ShowIpInterface",
+        "doc": "Parser for show ip interface\n                  show ip interface <interface>",
+        "module_name": "iosxe.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        'enabled': bool,\n        'oper_status': str,\n        Optional('ipv4'): {\n            Any('*'): {\n                'ip': str,\n                Optional('prefix_length'): str,\n                Optional('secondary'): bool,\n                Optional('broadcast_address'): str,\n            },\n        },\n        Optional('mtu'): int,\n        Optional('address_determined_by'): str,\n        Optional('helper_address'): Or (<class 'str'>, <class 'list'>),\n        Optional('directed_broadcast_forwarding'): bool,\n        Optional('outbound_common_access_list'): str,\n        Optional('outbound_access_list'): str,\n        Optional('inbound_common_access_list'): str,\n        Optional('inbound_access_list'): str,\n        Optional('proxy_arp'): bool,\n        Optional('local_proxy_arp'): bool,\n        Optional('security_level'): str,\n        Optional('split_horizon'): bool,\n        Optional('icmp'): {\n            Optional('redirects'): str,\n            Optional('unreachables'): str,\n            Optional('mask_replies'): str,\n        },\n        Optional('wccp'): {\n            Optional('redirect_outbound'): bool,\n            Optional('redirect_inbound'): bool,\n            Optional('redirect_exclude'): bool,\n        },\n        Optional('ip_fast_switching'): bool,\n        Optional('ip_flow_switching'): bool,\n        Optional('ip_cef_switching'): bool,\n        Optional('ip_cef_switching_turbo_vector'): bool,\n        Optional('ip_null_turbo_vector'): bool,\n        Optional('vrf'): str,\n        Optional('unicast_routing_topologies'): {\n            'topology': {\n                Any('*'): {\n                    'status': str,\n                },\n            },\n        },\n        Optional('ip_multicast_fast_switching'): bool,\n        Optional('ip_multicast_distributed_fast_switching'): bool,\n        Optional('ip_route_cache_flags'): list,\n        Optional('router_discovery'): bool,\n        Optional('ip_output_packet_accounting'): bool,\n        Optional('ip_access_violation_accounting'): bool,\n        Optional('tcp_ip_header_compression'): bool,\n        Optional('rtp_ip_header_compression'): bool,\n        Optional('probe_proxy_name_replies'): bool,\n        Optional('policy_routing'): bool,\n        Optional('network_address_translation'): bool,\n        Optional('bgp_policy_mapping'): bool,\n        Optional('input_features'): list,\n        Optional('multicast_groups'): list,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_ip_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2262"
       }
     }
   },
@@ -35672,7 +35820,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_name-servers",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7553"
       }
     }
   },
@@ -35688,7 +35836,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_name-servers_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7553"
       }
     }
   },
@@ -35804,7 +35952,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_nat_translations_total",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7498"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7501"
       }
     }
   },
@@ -35876,7 +36024,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_nat_translations_vrf_vrf_total",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7498"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7501"
       }
     }
   },
@@ -35940,6 +36088,22 @@
       }
     }
   },
+  "show ip nbar protocol-pack active": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowIpNbarProtocolPackActive",
+        "doc": "\n        Parser for show ip nbar protocol-pack active\n    ",
+        "module_name": "iosxe.show_nbar",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'name': str,\n    'version': str,\n    'publisher': str,\n    'nbar_engine_version': int,\n    'state': str,\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_ip_nbar_protocol-pack_active",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_nbar.py#L137"
+      }
+    }
+  },
   "show ip nbar version": {
     "folders": {
       "iosxe": {
@@ -38528,7 +38692,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_route_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2158"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2154"
       },
       "ironware": {
         "class": "ShowIPRouteSummary",
@@ -38584,7 +38748,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_route_supernets-only",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3376"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3372"
       }
     }
   },
@@ -38668,7 +38832,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_route_vrf_vrf_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2158"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2154"
       }
     }
   },
@@ -38684,7 +38848,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_route_vrf_vrf_supernets-only",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3376"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3372"
       }
     }
   },
@@ -39236,7 +39400,7 @@
           "os": "iosxe"
         },
         "uid": "show_ip_sockets",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7613"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_ip.py#L7616"
       }
     }
   },
@@ -39666,7 +39830,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2042"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2038"
       }
     }
   },
@@ -39698,7 +39862,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3111"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3107"
       }
     }
   },
@@ -39730,7 +39894,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2042"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2038"
       }
     }
   },
@@ -39762,7 +39926,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_vrf_vrf_ip_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3111"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3107"
       }
     }
   },
@@ -39778,7 +39942,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_vrf_vrf_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2042"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2038"
       }
     }
   },
@@ -39794,7 +39958,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_ip_internal",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3111"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3107"
       }
     }
   },
@@ -39810,7 +39974,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_cef_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2042"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L2038"
       }
     }
   },
@@ -40314,7 +40478,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2886"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2951"
       },
       "iosxr": {
         "class": "ShowIpv6Interface",
@@ -40342,7 +40506,7 @@
           "os": "nxos"
         },
         "uid": "show_ipv6_interface_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2283"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2287"
       }
     }
   },
@@ -40358,7 +40522,7 @@
           "os": "nxos"
         },
         "uid": "show_ipv6_interface_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2283"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2287"
       }
     }
   },
@@ -40386,7 +40550,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2886"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2951"
       },
       "iosxr": {
         "class": "ShowIpv6Interface",
@@ -40414,7 +40578,7 @@
           "os": "nxos"
         },
         "uid": "show_ipv6_interface_interface_vrf_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2283"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2287"
       }
     }
   },
@@ -40430,7 +40594,35 @@
           "os": "nxos"
         },
         "uid": "show_ipv6_interface_interface_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2283"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L2287"
+      }
+    }
+  },
+  "show ipv6 interface | include {include}": {
+    "folders": {
+      "ios": {
+        "class": "ShowIpv6Interface",
+        "doc": "Parser for show ipv6 interface",
+        "module_name": "ios.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        'oper_status': str,\n        'enabled': bool,\n        Optional('autoconf'): bool,\n        'ipv6': {\n            Any('*'): {\n                'ip': str,\n                Optional('prefix_length'): str,\n                Optional('status'): str,\n                Optional('origin'): str,\n                Optional('anycast'): bool,\n                Optional('eui_64'): bool,\n                Optional('virtual'): bool,\n                Optional('autoconf'): {\n                    'valid_lifetime': int,\n                    'preferred_lifetime': int,\n                },\n            },\n            'enabled': bool,\n            Optional('icmp'): {\n                Optional('error_messages_limited'): int,\n                Optional('redirects'): bool,\n                Optional('unreachables'): str,\n            },\n            Optional('nd'): {\n                Optional('suppress'): bool,\n                Optional('dad_enabled'): bool,\n                Optional('dad_attempts'): int,\n                Optional('reachable_time'): int,\n                Optional('using_time'): int,\n                Optional('ns_retransmit_interval'): int,\n                Optional('advertised_reachable_time'): int,\n                Optional('advertised_retransmit_interval'): int,\n                Optional('router_advertisements_interval'): int,\n                Optional('router_advertisements_live'): int,\n                Optional('advertised_default_router_preference'): str,\n                Optional('advertised_retransmit_interval_unspecified'): bool,\n                Optional('advertised_reachable_time_unspecified'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('mtu'): int,\n        Optional('vrf'): str,\n        Optional('addresses_config_method'): str,\n        Optional('joined_group_addresses'): list,\n    },\n}",
+        "tokens": {
+          "os": "ios"
+        },
+        "uid": "show_ipv6_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/ios/show_interface.py#L89"
+      },
+      "iosxe": {
+        "class": "ShowIpv6Interface",
+        "doc": "Parser for show ipv6 interface",
+        "module_name": "iosxe.show_interface",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        'oper_status': str,\n        'enabled': bool,\n        Optional('autoconf'): bool,\n        'ipv6': {\n            Any('*'): {\n                'ip': str,\n                Optional('prefix_length'): str,\n                Optional('status'): str,\n                Optional('origin'): str,\n                Optional('anycast'): bool,\n                Optional('eui_64'): bool,\n                Optional('virtual'): bool,\n                Optional('autoconf'): {\n                    'valid_lifetime': int,\n                    'preferred_lifetime': int,\n                },\n            },\n            'enabled': bool,\n            Optional('icmp'): {\n                Optional('error_messages_limited'): int,\n                Optional('redirects'): bool,\n                Optional('unreachables'): str,\n            },\n            Optional('nd'): {\n                Optional('suppress'): bool,\n                Optional('dad_enabled'): bool,\n                Optional('dad_attempts'): int,\n                Optional('reachable_time'): int,\n                Optional('using_time'): int,\n                Optional('ns_retransmit_interval'): int,\n                Optional('advertised_reachable_time'): int,\n                Optional('advertised_retransmit_interval'): int,\n                Optional('router_advertisements_interval'): int,\n                Optional('router_advertisements_live'): int,\n                Optional('advertised_default_router_preference'): str,\n                Optional('advertised_retransmit_interval_unspecified'): bool,\n                Optional('advertised_reachable_time_unspecified'): bool,\n            },\n            Optional('unnumbered'): {\n                'interface_ref': str,\n            },\n        },\n        Optional('mtu'): int,\n        Optional('vrf'): str,\n        Optional('addresses_config_method'): str,\n        Optional('joined_group_addresses'): list,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_ipv6_interface___include_include",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L2951"
       }
     }
   },
@@ -40898,6 +41090,22 @@
       }
     }
   },
+  "show ipv6 mld snooping address vlan {vlan} {group} summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount",
+        "doc": "Parser for show Platform Software fed ipv6 mld snooping groups count",
+        "module_name": "iosxe.show_platform_software_fed_ip",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mld_snooping_summary': {\n        Optional('group_address'): str,\n        Optional('interface'): str,\n        Optional('host_type'): str,\n        Optional('member_ports'): str,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_ipv6_mld_snooping_address_vlan_vlan_group_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1959"
+      }
+    }
+  },
   "show ipv6 mld snooping mrouter": {
     "folders": {
       "iosxe": {
@@ -42954,7 +43162,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_route_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3210"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3206"
       }
     }
   },
@@ -43082,7 +43290,7 @@
           "os": "iosxe"
         },
         "uid": "show_ipv6_route_vrf_vrf_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3210"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3206"
       }
     }
   },
@@ -47483,7 +47691,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_ethernet-segment_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1122"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1131"
       }
     }
   },
@@ -47515,7 +47723,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_imet_all_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L55"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L56"
       }
     }
   },
@@ -47751,7 +47959,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_mac_all_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1335"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1344"
       }
     }
   },
@@ -47831,7 +48039,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_mac_evi_evi_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1335"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1344"
       }
     }
   },
@@ -47863,7 +48071,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_mac_evi_evi_mac_mac_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1335"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1344"
       }
     }
   },
@@ -49379,7 +49587,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_mac-ip_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2712"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2721"
       }
     }
   },
@@ -49395,7 +49603,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_evpn_mac-ip_evi_evi",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2726"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2735"
       }
     }
   },
@@ -49763,7 +49971,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_fl_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1756"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1765"
       }
     }
   },
@@ -49779,7 +49987,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_mac-ip_all_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1513"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1522"
       }
     }
   },
@@ -49795,7 +50003,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1645"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1654"
       }
     }
   },
@@ -49827,7 +50035,7 @@
           "os": "nxos"
         },
         "uid": "show_l2route_topology_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1204"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1213"
       }
     }
   },
@@ -49891,7 +50099,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_atom_preferred-path",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4030"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4035"
       }
     }
   },
@@ -49907,7 +50115,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_atom_vc",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5940"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5945"
       }
     }
   },
@@ -50001,7 +50209,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_capabilities",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5251"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5256"
       }
     }
   },
@@ -50017,7 +50225,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3877"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3882"
       }
     }
   },
@@ -50033,7 +50241,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_bridge-domain_bd_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3765"
       }
     }
   },
@@ -50049,7 +50257,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_bridge-domain_bd_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3940"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3945"
       }
     }
   },
@@ -50065,7 +50273,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3765"
       }
     }
   },
@@ -50081,7 +50289,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_evi_evi_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3765"
       }
     }
   },
@@ -50097,7 +50305,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_evi_evi_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3940"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3945"
       }
     }
   },
@@ -50113,7 +50321,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3940"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3945"
       }
     }
   },
@@ -50129,7 +50337,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_vlan_vlan_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3765"
       }
     }
   },
@@ -50145,7 +50353,71 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_default-gateway_vlan_vlan_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3940"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3945"
+      }
+    }
+  },
+  "show l2vpn evpn esi-mlag mac ip": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowL2vpnEvpnEsiMlagMacIp",
+        "doc": "Parser for show l2vpn evpn esi-mlag mac ip\n                   show l2vpn evpn esi-mlag mac ip vlan <vlan_id>\n     ",
+        "module_name": "iosxe.show_l2vpn",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'esi_mlag_entries': ListOf  (dict) {'vlan': <class 'int'>, 'mac': <class 'str'>, 'ip': <class 'str'>, 'local_intf': <class 'str'>, 'neighbor_ip': <class 'str'>},\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_l2vpn_evpn_esi-mlag_mac_ip",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L6151"
+      }
+    }
+  },
+  "show l2vpn evpn esi-mlag mac ip vlan {vlan_id}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowL2vpnEvpnEsiMlagMacIp",
+        "doc": "Parser for show l2vpn evpn esi-mlag mac ip\n                   show l2vpn evpn esi-mlag mac ip vlan <vlan_id>\n     ",
+        "module_name": "iosxe.show_l2vpn",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'esi_mlag_entries': ListOf  (dict) {'vlan': <class 'int'>, 'mac': <class 'str'>, 'ip': <class 'str'>, 'local_intf': <class 'str'>, 'neighbor_ip': <class 'str'>},\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_l2vpn_evpn_esi-mlag_mac_ip_vlan_vlan_id",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L6151"
+      }
+    }
+  },
+  "show l2vpn evpn esi-mlag summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowL2vpnEvpnEsiMlagSummary",
+        "doc": "Parser for show l2vpn evpn esi-mlag summary\n     ",
+        "module_name": "iosxe.show_l2vpn",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'esi_mlag': {\n        Any('*'): {\n            Optional('bgp_router_id'): str,\n            Optional('asn'): int,\n            Optional('up_down_time'): str,\n            Optional('state'): str,\n            Optional('src_interface'): str,\n            'pc_count': int,\n            'vlan_count': int,\n            'mac_count': int,\n            Optional('interfaces'): {\n                Any('*'): {\n                    'esi_id': str,\n                    'state': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_l2vpn_evpn_esi-mlag_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L6006"
+      }
+    }
+  },
+  "show l2vpn evpn esi-mlag vlan brief": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowL2vpnEvpnEsiMlagVlanBrief",
+        "doc": "Parser for show l2vpn evpn esi-mlag vlan brief\n     ",
+        "module_name": "iosxe.show_l2vpn",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'esi_mlag_vlan': ListOf  (dict) {'vlan': <class 'int'>, 'vni': <class 'int'>, 'local_mac_cnt': <class 'int'>, 'remote_mac_cnt': <class 'int'>, 'state': <class 'str'>},\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_l2vpn_evpn_esi-mlag_vlan_brief",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L6217"
       }
     }
   },
@@ -50161,7 +50433,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_ethernet-segment",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1765"
       }
     }
   },
@@ -50177,7 +50449,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_ethernet-segment_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1551"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1556"
       }
     }
   },
@@ -50193,7 +50465,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_ethernet-segment_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1551"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1556"
       }
     }
   },
@@ -50209,7 +50481,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_evi_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4617"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4622"
       }
     }
   },
@@ -50225,7 +50497,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_evi_evi_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4617"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4622"
       }
     }
   },
@@ -50241,7 +50513,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50257,7 +50529,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_address_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50273,7 +50545,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_address_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50289,7 +50561,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50305,7 +50577,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_address_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50321,7 +50593,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_address_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50337,7 +50609,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50353,7 +50625,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -50369,7 +50641,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_mac_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50385,7 +50657,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_mac_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50401,7 +50673,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_bridge-domain_bd_id_mac_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -50417,7 +50689,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50433,7 +50705,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50449,7 +50721,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_address_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50465,7 +50737,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_address_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50481,7 +50753,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50497,7 +50769,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -50513,7 +50785,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_mac_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -50529,7 +50801,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_mac_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -50545,7 +50817,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_evi_evi_id_mac_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -50561,7 +50833,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50577,7 +50849,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50593,7 +50865,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50609,7 +50881,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50625,7 +50897,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50641,7 +50913,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50657,7 +50929,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50673,7 +50945,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50689,7 +50961,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_mac_addr_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50705,7 +50977,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_mac_addr_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50721,7 +50993,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50737,7 +51009,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_mac_addr_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -50753,7 +51025,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -50769,7 +51041,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_ip_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50785,7 +51057,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_ip_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50801,7 +51073,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_bridge-domain_bd_id_mac_ip_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -50817,7 +51089,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50833,7 +51105,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50849,7 +51121,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50865,7 +51137,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50881,7 +51153,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50897,7 +51169,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50913,7 +51185,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_mac_addr_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -50929,7 +51201,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_mac_addr_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50945,7 +51217,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -50961,7 +51233,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_mac_addr_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -50977,7 +51249,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -50993,7 +51265,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_ip_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51009,7 +51281,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_ip_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -51025,7 +51297,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_evi_evi_id_mac_ip_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -51041,7 +51313,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51057,7 +51329,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_mac_addr_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51073,7 +51345,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_mac_addr_address_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -51089,7 +51361,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_mac_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -51105,7 +51377,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_mac_addr_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -51121,7 +51393,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -51137,7 +51409,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_vlan_vlan_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51153,7 +51425,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_vlan_vlan_id_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51169,7 +51441,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_vlan_vlan_id_mac_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51185,7 +51457,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_vlan_vlan_id_mac_mac_addr_address_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51201,7 +51473,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_vlan_vlan_id_mac_ip_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51217,7 +51489,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_ip_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2605"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2610"
       }
     }
   },
@@ -51233,7 +51505,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_ip_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2856"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2861"
       }
     }
   },
@@ -51249,7 +51521,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_ip_mac_ip_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3192"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3197"
       }
     }
   },
@@ -51265,7 +51537,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -51281,7 +51553,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_vlan_vlan_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51297,7 +51569,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_vlan_vlan_id_address_mac_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51313,7 +51585,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_vlan_vlan_id_duplicate",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51329,7 +51601,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_vlan_vlan_id_local",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51345,7 +51617,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_vlan_vlan_id_remote",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51361,7 +51633,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_mac_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1852"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1857"
       }
     }
   },
@@ -51377,7 +51649,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_mac_type_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2063"
       }
     }
   },
@@ -51393,7 +51665,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_mac_mac_type_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2336"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L2341"
       }
     }
   },
@@ -51409,7 +51681,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_multicast_local",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5129"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5134"
       }
     }
   },
@@ -51425,7 +51697,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_multicast_remote",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5183"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5188"
       }
     }
   },
@@ -51441,7 +51713,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_address_peer_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51457,7 +51729,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51473,7 +51745,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_global_address_peer_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51489,7 +51761,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_global_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51505,7 +51777,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_interface_nve_interface_address_peer_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51521,7 +51793,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_interface_nve_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51537,7 +51809,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_vni_vni_id_address_peer_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51553,7 +51825,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_peers_vxlan_vni_vni_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3555"
       }
     }
   },
@@ -51569,7 +51841,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4150"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L4155"
       }
     }
   },
@@ -51585,7 +51857,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_vpws_vc_id_vc_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5737"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5742"
       }
     }
   },
@@ -51601,7 +51873,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_evpn_vpws_vc_preferred-path",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5893"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5898"
       }
     }
   },
@@ -51725,7 +51997,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51753,7 +52025,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51781,7 +52053,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_name_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51809,7 +52081,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_xconnect_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51837,7 +52109,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_xconnect_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51865,7 +52137,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_service_xconnect_name_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1224"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1229"
       }
     }
   },
@@ -51893,7 +52165,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_vfi",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1002"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1007"
       }
     }
   },
@@ -51909,7 +52181,7 @@
           "os": "iosxe"
         },
         "uid": "show_l2vpn_vfi_name_name_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1354"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1359"
       }
     }
   },
@@ -51989,7 +52261,7 @@
           "os": "iosxr"
         },
         "uid": "show_l2vpn_xconnect_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_xconnect.py#L1493"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_xconnect.py#L1495"
       }
     }
   },
@@ -52005,7 +52277,7 @@
           "os": "iosxr"
         },
         "uid": "show_lacp",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L645"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L650"
       }
     }
   },
@@ -52333,7 +52605,7 @@
           "os": "iosxr"
         },
         "uid": "show_lacp_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L645"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxr/show_lag.py#L650"
       }
     }
   },
@@ -52787,7 +53059,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4144"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4143"
       }
     }
   },
@@ -52945,7 +53217,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_all_instance-id_instance_id_service",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4575"
       }
     }
   },
@@ -53277,7 +53549,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_vlan_vlan_ethernet_server_subscription",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7722"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7721"
       }
     }
   },
@@ -53293,7 +53565,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_vlan_vlan_ethernet_server_subscription_address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7755"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7754"
       }
     }
   },
@@ -53313,7 +53585,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_vlan_vlan_ethernet_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1348"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1350"
           }
         },
         "module_name": "iosxe.show_lisp",
@@ -53341,7 +53613,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_vlan_vlan_ethernet_subscriber_address-resolution",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1380"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1382"
           }
         },
         "tokens": {
@@ -53421,7 +53693,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv4 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv4 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv4",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -53437,7 +53709,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv6 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv6 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv6",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -53894,7 +54166,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_vrf_vrf_ipv4_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1274"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1276"
           }
         },
         "module_name": "iosxe.show_lisp_ipv4",
@@ -54244,7 +54516,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_vrf_vrf_ipv6_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1311"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1313"
           }
         },
         "module_name": "iosxe.show_lisp_ipv6",
@@ -54286,7 +54558,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_vrf_vrf_address_family_server_subscription_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -54302,7 +54574,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_vrf_vrf_address_family_server_subscription_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -54414,7 +54686,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_eid_table_ethernet_server_subscription_address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -54430,7 +54702,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_eid_table_ethernet_server_subscription_address-resolution_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -54818,7 +55090,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_eid_table_ipv4_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1274"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1276"
           }
         },
         "module_name": "iosxe.show_lisp_ipv4",
@@ -55184,7 +55456,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_eid-table_eid_table_ipv6_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1311"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1313"
           }
         },
         "module_name": "iosxe.show_lisp_ipv6",
@@ -55242,7 +55514,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_eid_table_address_family_server_subscription_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -55258,7 +55530,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_eid-table_eid_table_address_family_server_subscription_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -55398,7 +55670,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_decapsulation_filter",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7913"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7912"
       }
     }
   },
@@ -55473,12 +55745,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_map-cache_address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7693"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7692"
       }
     }
   },
@@ -55494,7 +55766,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7636"
       }
     }
   },
@@ -55505,12 +55777,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache reverse-address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7664"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7663"
       }
     }
   },
@@ -55702,7 +55974,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_reverse-address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7327"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7326"
       }
     }
   },
@@ -55718,7 +55990,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_reverse-address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7446"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7445"
       }
     }
   },
@@ -55734,7 +56006,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_reverse-address-resolution_mac",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7446"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7445"
       }
     }
   },
@@ -55750,7 +56022,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_subscription",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7722"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7721"
       }
     }
   },
@@ -55766,7 +56038,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_subscription_address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7755"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7754"
       }
     }
   },
@@ -55782,7 +56054,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_subscription_address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -55798,7 +56070,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_ethernet_server_subscription_address-resolution_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -55834,7 +56106,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_instance-id_instance_id_ethernet_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1348"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1350"
           }
         },
         "module_name": "iosxe.show_lisp",
@@ -55862,7 +56134,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_instance-id_instance_id_ethernet_subscriber_address-resolution",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1380"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1382"
           }
         },
         "tokens": {
@@ -56054,7 +56326,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv4 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv4 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv4",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -56335,22 +56607,6 @@
       }
     }
   },
-  "show lisp instance-id {instance_id} ipv4 server registration-history": {
-    "folders": {
-      "iosxe": {
-        "class": "ShowLispRegistrationHistory",
-        "doc": "\n    Parser for 'show lisp {lisp_id} instance-id {instance_id} {address-family} server registration-history'\n    ",
-        "module_name": "iosxe.show_lisp",
-        "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'eid_address': {\n                '<class 'str'>': ListOf  (dict) {'time': <class 'str'>, 'instance_id': <class 'int'>, 'protocol': <class 'str'>, 'roam': <class 'str'>, 'wlc': <class 'str'>, 'source': <class 'str'>, 'reg_type': <class 'str'>, 'eid': <class 'str'>, 'mask': <class 'int'>},\n            },\n        },\n    },\n}",
-        "tokens": {
-          "os": "iosxe"
-        },
-        "uid": "show_lisp_instance-id_instance_id_ipv4_server_registration-history",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4035"
-      }
-    }
-  },
   "show lisp instance-id {instance_id} ipv4 server silent-host-detection": {
     "folders": {
       "iosxe": {
@@ -56431,7 +56687,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_instance-id_instance_id_ipv4_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1274"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1276"
           }
         },
         "module_name": "iosxe.show_lisp_ipv4",
@@ -56580,7 +56836,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv6 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv6 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv6",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -56861,22 +57117,6 @@
       }
     }
   },
-  "show lisp instance-id {instance_id} ipv6 server registration-history": {
-    "folders": {
-      "iosxe": {
-        "class": "ShowLispRegistrationHistory",
-        "doc": "\n    Parser for 'show lisp {lisp_id} instance-id {instance_id} {address-family} server registration-history'\n    ",
-        "module_name": "iosxe.show_lisp",
-        "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'eid_address': {\n                '<class 'str'>': ListOf  (dict) {'time': <class 'str'>, 'instance_id': <class 'int'>, 'protocol': <class 'str'>, 'roam': <class 'str'>, 'wlc': <class 'str'>, 'source': <class 'str'>, 'reg_type': <class 'str'>, 'eid': <class 'str'>, 'mask': <class 'int'>},\n            },\n        },\n    },\n}",
-        "tokens": {
-          "os": "iosxe"
-        },
-        "uid": "show_lisp_instance-id_instance_id_ipv6_server_registration-history",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4035"
-      }
-    }
-  },
   "show lisp instance-id {instance_id} ipv6 server silent-host-detection": {
     "folders": {
       "iosxe": {
@@ -56957,7 +57197,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_instance-id_instance_id_ipv6_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1311"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1313"
           }
         },
         "module_name": "iosxe.show_lisp_ipv6",
@@ -57035,6 +57275,22 @@
       }
     }
   },
+  "show lisp instance-id {instance_id} {address_family} server registration-history": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowLispRegistrationHistory",
+        "doc": "\n    Parser for 'show lisp {lisp_id} instance-id {instance_id} {address-family} server registration-history'\n    ",
+        "module_name": "iosxe.show_lisp",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'eid_address': {\n                '<class 'str'>': ListOf  (dict) {'time': <class 'str'>, 'instance_id': <class 'int'>, 'protocol': <class 'str'>, 'roam': <class 'str'>, 'wlc': <class 'str'>, 'source': <class 'str'>, 'reg_type': <class 'str'>, 'eid': <class 'str'>, 'mask': <class 'int'>},\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_lisp_instance-id_instance_id_address_family_server_registration-history",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4035"
+      }
+    }
+  },
   "show lisp instance-id {instance_id} {address_family} server subscription detail": {
     "folders": {
       "iosxe": {
@@ -57047,7 +57303,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_address_family_server_subscription_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -57063,7 +57319,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_address_family_server_subscription_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -57153,7 +57409,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_service",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4575"
       }
     }
   },
@@ -57213,7 +57469,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_instance-id_instance_id_service_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5983"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5982"
       }
     }
   },
@@ -57396,12 +57652,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_map-cache_address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7693"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7692"
       }
     }
   },
@@ -57513,7 +57769,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_server_subscription",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7722"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7721"
       }
     }
   },
@@ -57529,7 +57785,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_server_subscription_address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7755"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7754"
       }
     }
   },
@@ -57545,7 +57801,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_server_subscription_address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -57561,7 +57817,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_server_subscription_address-resolution_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -57597,7 +57853,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1348"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1350"
           }
         },
         "module_name": "iosxe.show_lisp",
@@ -57625,7 +57881,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ethernet_subscriber_address-resolution",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1380"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1382"
           }
         },
         "tokens": {
@@ -57769,7 +58025,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv4 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv4 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv4",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -58018,7 +58274,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ipv4_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1274"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1276"
           }
         },
         "module_name": "iosxe.show_lisp_ipv4",
@@ -58119,7 +58375,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv6 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv6 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv6",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -58368,7 +58624,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_ipv6_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1311"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1313"
           }
         },
         "module_name": "iosxe.show_lisp_ipv6",
@@ -58426,7 +58682,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_address_family_server_subscription_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -58442,7 +58698,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_address_family_server_subscription_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -58532,7 +58788,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_service",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4575"
       }
     }
   },
@@ -58576,7 +58832,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_locator-table_locator_table_instance-id_instance_id_service_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5983"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5982"
       }
     }
   },
@@ -59112,7 +59368,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_remote-locator-set_name_remote_locator_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7217"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7216"
       }
     }
   },
@@ -59128,7 +59384,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_remote-locator-set_remote_locator_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7217"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7216"
       }
     }
   },
@@ -59432,7 +59688,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_site_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5507"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5506"
       }
     }
   },
@@ -59448,7 +59704,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_site_summary_eid-table_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5507"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5506"
       }
     }
   },
@@ -59464,7 +59720,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_site_summary_eid-table_eid_table",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5507"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5506"
       }
     }
   },
@@ -59480,7 +59736,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_site_summary_instance-id_instance_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5507"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5506"
       }
     }
   },
@@ -59560,7 +59816,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_vrf_vrf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L8006"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L8005"
       }
     }
   },
@@ -59684,7 +59940,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4144"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4143"
       }
     }
   },
@@ -59883,12 +60139,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_map-cache_address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7693"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7692"
       }
     }
   },
@@ -59904,7 +60160,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7637"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7636"
       }
     }
   },
@@ -59915,12 +60171,12 @@
         "doc": "\n    Parser for\n    * sh lisp instance-id {instance_id} ethernet map-cache reverse-address-resolution {eid_prefix}\n    * sh lisp {lisp_id} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    * show lisp locator-table {locator_table} instance-id {instance_id} ethernet map-cache reverse-address-resolution\n    ",
         "module_name": "iosxe.show_lisp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_map-cache_reverse-address-resolution_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7664"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7663"
       }
     }
   },
@@ -60128,7 +60384,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_reverse-address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7327"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7326"
       }
     }
   },
@@ -60144,7 +60400,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_reverse-address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7446"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7445"
       }
     }
   },
@@ -60160,7 +60416,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_reverse-address-resolution_mac",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7446"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7445"
       }
     }
   },
@@ -60176,7 +60432,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_subscription",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7722"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7721"
       }
     }
   },
@@ -60192,7 +60448,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_subscription_address-resolution",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7755"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7754"
       }
     }
   },
@@ -60208,7 +60464,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_subscription_address-resolution_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -60224,7 +60480,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_server_subscription_address-resolution_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7848"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7847"
       }
     }
   },
@@ -60260,7 +60516,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1348"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1350"
           }
         },
         "module_name": "iosxe.show_lisp",
@@ -60288,7 +60544,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_lisp_id_instance-id_instance_id_ethernet_subscriber_address-resolution",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1380"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1382"
           }
         },
         "tokens": {
@@ -60448,7 +60704,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv4 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv4 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv4 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv4",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -60793,7 +61049,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_lisp_id_instance-id_instance_id_ipv4_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1274"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1276"
           }
         },
         "module_name": "iosxe.show_lisp_ipv4",
@@ -60910,7 +61166,7 @@
         "doc": " Parser for\n        * show lisp instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp {lisp_id} instance-id {instance_id} ipv6 map-cache {prefix}\n        * show lisp eid-table vrf {eid_table} ipv6 map-cache {prefix}\n        * show lisp locator-table {locator_table} instance-id {instance_id} ipv6 map-cache {prefix}\n    ",
         "module_name": "iosxe.show_lisp_ipv6",
         "package": "genie.libs.parser",
-        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    'locators': {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'lisp_id': {\n        '<class 'int'>': {\n            'instance_id': {\n                '<class 'int'>': {\n                    'eid_table': str,\n                    'entries': int,\n                    'eid_prefix': str,\n                    'eid': str,\n                    'mask': int,\n                    'uptime': str,\n                    'expires': str,\n                    'via': str,\n                    Optional('site'): str,\n                    Optional('received_mapping'): str,\n                    Optional('sgt'): int,\n                    'sources': str,\n                    'state': str,\n                    'last_modified': str,\n                    'map_source': str,\n                    Optional('activity'): str,\n                    Optional('packets_out'): int,\n                    Optional('packets_out_bytes'): int,\n                    Optional('action'): str,\n                    Optional('counters_not_accurate'): bool,\n                    Optional('locators'): {\n                        Any('*'): {\n                            'uptime': str,\n                            'state': str,\n                            'priority': int,\n                            'weight': int,\n                            'encap_iid': str,\n                            Optional('domain_id'): str,\n                            Optional('multihome_id'): str,\n                            Optional('metric'): str,\n                            Optional('state_change_time'): str,\n                            Optional('state_change_count'): int,\n                            Optional('route_reachability_change_time'): str,\n                            Optional('route_reachability_change_count'): int,\n                            Optional('priority_change'): str,\n                            Optional('weight_change'): str,\n                            Optional('reject_reason'): str,\n                            Optional('rloc_probe_sent'): str,\n                            Optional('rloc_probe_in'): str,\n                            Optional('itr_rloc'): str,\n                            Optional('affinity_id_x'): int,\n                            Optional('affinity_id_y'): int,\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -61255,7 +61511,7 @@
               "revision": "1"
             },
             "uid": "show_lisp_lisp_id_instance-id_instance_id_ipv6_subscriber",
-            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1311"
+            "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/rv1/show_lisp.py#L1313"
           }
         },
         "module_name": "iosxe.show_lisp_ipv6",
@@ -61345,7 +61601,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_address_family_server_subscription_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -61361,7 +61617,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_address_family_server_subscription_eid_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7789"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7788"
       }
     }
   },
@@ -61499,7 +61755,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance-id_instance_id_service",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4576"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L4575"
       }
     }
   },
@@ -61591,7 +61847,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_remote-locator-set_name_remote_locator_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7217"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7216"
       }
     }
   },
@@ -61607,7 +61863,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_remote-locator-set_remote_locator_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7217"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L7216"
       }
     }
   },
@@ -61819,7 +62075,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_site_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5507"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5506"
       }
     }
   },
@@ -61899,7 +62155,7 @@
           "os": "iosxe"
         },
         "uid": "show_lisp_lisp_id_instance_id_service_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5983"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_lisp.py#L5982"
       }
     }
   },
@@ -63731,7 +63987,7 @@
           "os": "iosxe"
         },
         "uid": "show_macro_auto_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4141"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4209"
       }
     }
   },
@@ -64439,7 +64695,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowMeraki",
-        "doc": "Parser for:\n        * 'show meraki'\n        * 'show meraki switch {switch}'\n    ",
+        "doc": "\n    Parser for:\n        * 'show meraki'\n        * 'show meraki switch {switch}'\n    ",
         "module_name": "iosxe.show_meraki",
         "package": "genie.libs.parser",
         "schema": "{\n    'meraki': {\n        'switch': {\n            Any('*'): {\n                'switch_num': int,\n                'pid': str,\n                'serial_number': str,\n                'meraki_sn': str,\n                'mac_addr': str,\n                'conversion_status': str,\n                'current_mode': str,\n            },\n        },\n    },\n}",
@@ -64463,7 +64719,7 @@
           "os": "iosxe"
         },
         "uid": "show_meraki_connect",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_meraki.py#L163"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_meraki.py#L164"
       }
     }
   },
@@ -64471,7 +64727,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowMeraki",
-        "doc": "Parser for:\n        * 'show meraki'\n        * 'show meraki switch {switch}'\n    ",
+        "doc": "\n    Parser for:\n        * 'show meraki'\n        * 'show meraki switch {switch}'\n    ",
         "module_name": "iosxe.show_meraki",
         "package": "genie.libs.parser",
         "schema": "{\n    'meraki': {\n        'switch': {\n            Any('*'): {\n                'switch_num': int,\n                'pid': str,\n                'serial_number': str,\n                'meraki_sn': str,\n                'mac_addr': str,\n                'conversion_status': str,\n                'current_mode': str,\n            },\n        },\n    },\n}",
@@ -64913,7 +65169,7 @@
           "os": "iosxe"
         },
         "uid": "show_module",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3991"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3992"
       },
       "nxos": {
         "class": "ShowModule",
@@ -64933,7 +65189,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowMonitor",
-        "doc": " Parser for\n      \"show monitor\"\n      \"show monitor session {session}\"\n      \"show monitor session all\"\n    ",
+        "doc": " Parser for\n      \"show monitor\"\n      \"show monitor session {session}\"\n    ",
         "module_name": "iosxe.show_monitor",
         "package": "genie.libs.parser",
         "schema": "{\n    'session': {\n        Any('*'): {\n            'type': str,\n            Optional('status'): str,\n            Optional('source_ports'): {\n                Any('*'): str,\n            },\n            Optional('source_subinterfaces'): {\n                Any('*'): str,\n            },\n            Optional('source_vlans'): {\n                Any('*'): str,\n            },\n            Optional('source_efps'): {\n                Any('*'): str,\n            },\n            Optional('filter_access_group'): int,\n            Optional('destination_ports'): str,\n            Optional('destination_ip_address'): str,\n            Optional('destination_erspan_id'): str,\n            Optional('origin_ip_address'): str,\n            Optional('source_erspan_id'): str,\n            Optional('source_ip_address'): str,\n            Optional('source_rspan_vlan'): int,\n            Optional('dest_rspan_vlan'): int,\n            Optional('mtu'): int,\n        },\n    },\n}",
@@ -64941,7 +65197,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L67"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L61"
       }
     }
   },
@@ -64957,7 +65213,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L317"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L308"
       }
     }
   },
@@ -64973,7 +65229,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_file_path",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L679"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L670"
       }
     }
   },
@@ -65003,7 +65259,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_file_path_packet-number_number_detailed",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L802"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L793"
       }
     }
   },
@@ -65019,7 +65275,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_capture_name_buffer",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L679"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L670"
       }
     }
   },
@@ -65035,7 +65291,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_capture_name_buffer_detailed",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L802"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L793"
       }
     }
   },
@@ -65051,7 +65307,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_capture_name_buffer_display-filter_\"filter_criteria\"_detailed",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L802"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L793"
       }
     }
   },
@@ -65067,7 +65323,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_capture_capture_name_capture-statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L970"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L961"
       }
     }
   },
@@ -65083,23 +65339,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_event-trace_dmvpn_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L1135"
-      }
-    }
-  },
-  "show monitor session all": {
-    "folders": {
-      "iosxe": {
-        "class": "ShowMonitor",
-        "doc": " Parser for\n      \"show monitor\"\n      \"show monitor session {session}\"\n      \"show monitor session all\"\n    ",
-        "module_name": "iosxe.show_monitor",
-        "package": "genie.libs.parser",
-        "schema": "{\n    'session': {\n        Any('*'): {\n            'type': str,\n            Optional('status'): str,\n            Optional('source_ports'): {\n                Any('*'): str,\n            },\n            Optional('source_subinterfaces'): {\n                Any('*'): str,\n            },\n            Optional('source_vlans'): {\n                Any('*'): str,\n            },\n            Optional('source_efps'): {\n                Any('*'): str,\n            },\n            Optional('filter_access_group'): int,\n            Optional('destination_ports'): str,\n            Optional('destination_ip_address'): str,\n            Optional('destination_erspan_id'): str,\n            Optional('origin_ip_address'): str,\n            Optional('source_erspan_id'): str,\n            Optional('source_ip_address'): str,\n            Optional('source_rspan_vlan'): int,\n            Optional('dest_rspan_vlan'): int,\n            Optional('mtu'): int,\n        },\n    },\n}",
-        "tokens": {
-          "os": "iosxe"
-        },
-        "uid": "show_monitor_session_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L67"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L1126"
       }
     }
   },
@@ -65107,7 +65347,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowMonitor",
-        "doc": " Parser for\n      \"show monitor\"\n      \"show monitor session {session}\"\n      \"show monitor session all\"\n    ",
+        "doc": " Parser for\n      \"show monitor\"\n      \"show monitor session {session}\"\n    ",
         "module_name": "iosxe.show_monitor",
         "package": "genie.libs.parser",
         "schema": "{\n    'session': {\n        Any('*'): {\n            'type': str,\n            Optional('status'): str,\n            Optional('source_ports'): {\n                Any('*'): str,\n            },\n            Optional('source_subinterfaces'): {\n                Any('*'): str,\n            },\n            Optional('source_vlans'): {\n                Any('*'): str,\n            },\n            Optional('source_efps'): {\n                Any('*'): str,\n            },\n            Optional('filter_access_group'): int,\n            Optional('destination_ports'): str,\n            Optional('destination_ip_address'): str,\n            Optional('destination_erspan_id'): str,\n            Optional('origin_ip_address'): str,\n            Optional('source_erspan_id'): str,\n            Optional('source_ip_address'): str,\n            Optional('source_rspan_vlan'): int,\n            Optional('dest_rspan_vlan'): int,\n            Optional('mtu'): int,\n        },\n    },\n}",
@@ -65115,7 +65355,7 @@
           "os": "iosxe"
         },
         "uid": "show_monitor_session_session",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L67"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_monitor.py#L61"
       }
     }
   },
@@ -68725,7 +68965,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_ethernet-segment",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L891"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L900"
       }
     }
   },
@@ -68764,7 +69004,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_ethernet-segment_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2769"
       }
     }
   },
@@ -68780,7 +69020,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_ethernet-segment_summary_esi_esi_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2760"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2769"
       }
     }
   },
@@ -68796,7 +69036,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3437"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3441"
       }
     }
   },
@@ -68812,7 +69052,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L414"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L423"
       }
     }
   },
@@ -68844,7 +69084,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_multisite_dci-links",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L748"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L757"
       }
     }
   },
@@ -68860,7 +69100,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_multisite_fabric-links",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L808"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L817"
       }
     }
   },
@@ -68888,7 +69128,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_peers",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L134"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L135"
       }
     }
   },
@@ -68956,7 +69196,7 @@
       },
       "nxos": {
         "class": "ShowNveVni",
-        "doc": "parser for:\n        show nve vni",
+        "doc": "parser for:\n        show nve vni\n        show nve vni <vni>",
         "module_name": "nxos.show_vxlan",
         "package": "genie.libs.parser",
         "schema": "{\n    Any('*'): {\n        'vni': {\n            Any('*'): {\n                'vni': int,\n                'mcast': str,\n                'vni_state': str,\n                'mode': str,\n                'type': str,\n                'flags': str,\n            },\n        },\n    },\n}",
@@ -68964,7 +69204,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_vni",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L273"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L277"
       }
     }
   },
@@ -68980,7 +69220,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_vni_ingress-replication",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2105"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L2114"
       }
     }
   },
@@ -68996,7 +69236,7 @@
           "os": "nxos"
         },
         "uid": "show_nve_vni_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L207"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L208"
       }
     }
   },
@@ -69013,6 +69253,18 @@
         },
         "uid": "show_nve_vni_vni",
         "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_nve.py#L405"
+      },
+      "nxos": {
+        "class": "ShowNveVni",
+        "doc": "parser for:\n        show nve vni\n        show nve vni <vni>",
+        "module_name": "nxos.show_vxlan",
+        "package": "genie.libs.parser",
+        "schema": "{\n    Any('*'): {\n        'vni': {\n            Any('*'): {\n                'vni': int,\n                'mcast': str,\n                'vni_state': str,\n                'mode': str,\n                'type': str,\n                'flags': str,\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "nxos"
+        },
+        "uid": "show_nve_vni_vni",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L277"
       }
     }
   },
@@ -69060,7 +69312,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_peers",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L160"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L186"
       }
     }
   },
@@ -69076,7 +69328,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_routes",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L422"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L448"
       }
     }
   },
@@ -69092,7 +69344,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_routes_family_af_vpn_vpn",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L422"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L448"
       }
     }
   },
@@ -69108,7 +69360,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_routes_vpn_vpn",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L422"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L448"
       }
     }
   },
@@ -69124,7 +69376,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_routes_prefix",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L422"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L448"
       }
     }
   },
@@ -69140,7 +69392,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_routes_prefix_vpn_vpn",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L422"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L448"
       }
     }
   },
@@ -69151,12 +69403,12 @@
         "doc": " Parser for \"show omp summary\" ",
         "module_name": "viptela.show_omp",
         "package": "genie.libs.parser",
-        "schema": "{\n    'admin_state': str,\n    'alert_received': int,\n    'alert_sent': int,\n    'handshake_received': int,\n    'handshake_sent': int,\n    'hello_received': int,\n    'hello_sent': int,\n    'inform_received': int,\n    'inform_sent': int,\n    'mcast_routes_received': int,\n    'mcast_routes_sent': int,\n    'omp_uptime': str,\n    'oper_state': str,\n    'personality': str,\n    'policy_received': int,\n    'policy_sent': int,\n    'routes_installed': int,\n    'routes_received': int,\n    'routes_sent': int,\n    'services_installed': int,\n    'services_received': int,\n    'services_sent': int,\n    'tlocs_installed': int,\n    'tlocs_received': int,\n    'tlocs_sent': int,\n    'total_packets_sent': int,\n    'update_received': int,\n    'update_sent': int,\n    'vsmart_peers': int,\n}",
+        "schema": "{\n    'admin_state': str,\n    'alert_received': int,\n    'alert_sent': int,\n    'handshake_received': int,\n    'handshake_sent': int,\n    'hello_received': int,\n    'hello_sent': int,\n    'inform_received': int,\n    'inform_sent': int,\n    'mcast_routes_received': int,\n    'mcast_routes_sent': int,\n    'omp_uptime': str,\n    'oper_state': str,\n    'personality': str,\n    'policy_received': int,\n    'policy_sent': int,\n    'routes_installed': int,\n    'routes_received': int,\n    'routes_sent': int,\n    Optional('routes_ipv6_installed'): int,\n    Optional('routes_ipv6_sent'): int,\n    Optional('routes_ipv6_received'): int,\n    'services_installed': int,\n    'services_received': int,\n    'services_sent': int,\n    Optional('services_installed_ipv6'): int,\n    Optional('services_sent_ipv6'): int,\n    Optional('services_received_ipv6'): int,\n    'tlocs_installed': int,\n    'tlocs_received': int,\n    'tlocs_sent': int,\n    Optional('l2_services_installed'): int,\n    Optional('l2_services_received'): int,\n    Optional('l2_services_sent'): int,\n    Optional('l2_routes_installed'): int,\n    Optional('l2_routes_received'): int,\n    Optional('l2_routes_sent'): int,\n    Optional('l2_statuses_installed'): int,\n    Optional('l2_statuses_received'): int,\n    Optional('l2_statuses_sent'): int,\n    Optional('transport_gateway'): str,\n    Optional('link_routes_received'): int,\n    Optional('link_routes_sent'): int,\n    Optional('cap_update_received'): int,\n    Optional('cap_update_sent'): int,\n    Optional('ribout_generation_paused'): str,\n    Optional('peers_down_in_gr'): int,\n    Optional('vedge_peers'): int,\n    Optional('ro_te_routes_sent'): int,\n    Optional('ro-te-routes-ipv6-sent'): int,\n    Optional('topology'): str,\n    'total_packets_sent': int,\n    'update_received': int,\n    'update_sent': int,\n    'vsmart_peers': int,\n}",
         "tokens": {
           "os": "viptela"
         },
         "uid": "show_omp_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L43"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L69"
       }
     }
   },
@@ -69172,7 +69424,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_tloc-paths",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L102"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L128"
       }
     }
   },
@@ -69188,7 +69440,7 @@
           "os": "viptela"
         },
         "uid": "show_omp_tlocs",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L258"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/viptela/show_omp.py#L284"
       }
     }
   },
@@ -72306,7 +72558,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_plaform_software_fed_switch_switch_num_acl_usage",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2844"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2849"
               }
             },
             "tokens": {
@@ -72321,7 +72573,7 @@
           "os": "iosxe"
         },
         "uid": "show_plaform_software_fed_switch_switch_num_acl_usage",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9376"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9377"
       }
     }
   },
@@ -72343,7 +72595,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_plaform_software_fed_switch_switch_num_acl_usage___include_acl_name",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2844"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2849"
               }
             },
             "tokens": {
@@ -72358,7 +72610,55 @@
           "os": "iosxe"
         },
         "uid": "show_plaform_software_fed_switch_switch_num_acl_usage___include_acl_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9376"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9377"
+      }
+    }
+  },
+  "show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatSoftFedSwAccessSecuritySecMacLrnTable",
+        "doc": "\n    Parser for \n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mac_entries': {\n        Any('*'): {\n            'interface': str,\n            'vlan': int,\n            'mac': str,\n            'logical_id': int,\n            'position': int,\n            'asic_number': int,\n            'auth_act': str,\n            'restore_auth_act': str,\n            'flag': str,\n            'drop': str,\n            'policy': str,\n            'policy_oid': int,\n            'packets': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_plat_soft_fed_sw_switch_access-security_sec-mac-lrn-table_interface_if-id_if_id",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10633"
+      }
+    }
+  },
+  "show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatSoftFedSwAccessSecuritySecMacLrnTable",
+        "doc": "\n    Parser for \n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mac_entries': {\n        Any('*'): {\n            'interface': str,\n            'vlan': int,\n            'mac': str,\n            'logical_id': int,\n            'position': int,\n            'asic_number': int,\n            'auth_act': str,\n            'restore_auth_act': str,\n            'flag': str,\n            'drop': str,\n            'policy': str,\n            'policy_oid': int,\n            'packets': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_plat_soft_fed_sw_switch_access-security_sec-mac-lrn-table_mac_client_mac",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10633"
+      }
+    }
+  },
+  "show plat soft fed sw {switch} access-security sec-mac-lrn-table summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatSoftFedSwAccessSecuritySecMacLrnTable",
+        "doc": "\n    Parser for \n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}'\n    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mac_entries': {\n        Any('*'): {\n            'interface': str,\n            'vlan': int,\n            'mac': str,\n            'logical_id': int,\n            'position': int,\n            'asic_number': int,\n            'auth_act': str,\n            'restore_auth_act': str,\n            'flag': str,\n            'drop': str,\n            'policy': str,\n            'policy_oid': int,\n            'packets': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_plat_soft_fed_sw_switch_access-security_sec-mac-lrn-table_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10633"
       }
     }
   },
@@ -72392,7 +72692,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L887"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L891"
               }
             },
             "tokens": {
@@ -72407,7 +72707,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2484"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L2485"
       },
       "iosxr": {
         "class": "ShowPlatform",
@@ -72435,7 +72735,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_authentication_sbinfo_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7563"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7564"
       }
     }
   },
@@ -72504,7 +72804,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_chassis_fantray_detail",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1254"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1258"
               }
             },
             "tokens": {
@@ -72548,7 +72848,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_chassis_fantray_detail_switch_mode",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1488"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1492"
               }
             },
             "tokens": {
@@ -72595,7 +72895,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_chassis_power-supply_detail_all",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1333"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1337"
               },
               "c9600": {
                 "class": "ShowPlatformHardwareChassisPowerSupplyDetailAll",
@@ -72651,7 +72951,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_chassis_power-supply_detail_switch_mode_all",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1565"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1569"
               },
               "c9600": {
                 "class": "ShowPlatformHardwareChassisPowerSupplyDetailSwitchAll",
@@ -72710,7 +73010,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_drops_exceptions",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L73"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L78"
       }
     }
   },
@@ -72726,7 +73026,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_register_read_register-name_reg_name_asic_asic_core_core",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4147"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4152"
       }
     }
   },
@@ -72742,7 +73042,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_resource_rewrite_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8030"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8031"
       }
     }
   },
@@ -72764,7 +73064,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1727"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1731"
               },
               "c9600": {
                 "class": "ShowPlatformFedTcamPbrNat",
@@ -72805,7 +73105,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6161"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6162"
       }
     }
   },
@@ -72827,7 +73127,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L663"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L667"
               },
               "c9500": {
                 "class": "ShowPlatformTcamUtilization",
@@ -72839,7 +73139,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2169"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2173"
               },
               "c9600": {
                 "class": "ShowPlatformFedActiveTcamUtilization",
@@ -72866,6 +73166,18 @@
                 },
                 "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_utilization",
                 "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9600/show_platform.py#L331"
+              },
+              "c9610": {
+                "class": "ShowPlatformFedActiveTcamUtilization",
+                "doc": " Parser for show platform hardware fed active fwd-asic resource tcam utilization",
+                "module_name": "iosxe.cat9k.c9610.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'Slice0': {\n        'egress_wide_direction': str,\n        'used0': int,\n        'free0': int,\n        'ingress_wide_direction': str,\n        'inw_used0': int,\n        'inw_free0': int,\n    },\n    'Slice1': {\n        'egress_wide_direction': str,\n        'used1': int,\n        'free1': int,\n        'ingress_wide_direction': str,\n        'inw_used1': int,\n        'inw_free1': int,\n    },\n    'Slice2': {\n        'egress_wide_direction': str,\n        'used2': int,\n        'free2': int,\n        'ingress_wide_direction': str,\n        'inw_used2': int,\n        'inw_free2': int,\n    },\n    'Slice3': {\n        'egress_wide_direction': str,\n        'used3': int,\n        'free3': int,\n        'ingress_wide_direction': str,\n        'inw_used3': int,\n        'inw_free3': int,\n    },\n    'Slice4': {\n        'egress_wide_direction': str,\n        'used4': int,\n        'free4': int,\n        'ingress_wide_direction': str,\n        'inw_used4': int,\n        'inw_free4': int,\n    },\n    'Slice5': {\n        'egress_wide_direction': str,\n        'used5': int,\n        'free5': int,\n        'ingress_wide_direction': str,\n        'inw_used5': int,\n        'inw_free5': int,\n    },\n}",
+                "tokens": {
+                  "model": "c9610"
+                },
+                "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_utilization",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py#L15"
               }
             },
             "tokens": {
@@ -72880,7 +73192,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_resource_tcam_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5501"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5502"
       }
     }
   },
@@ -72917,7 +73229,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_fwd-asic_resource_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1555"
       }
     }
   },
@@ -72933,7 +73245,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_qos_queue_config_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1221"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1226"
       }
     }
   },
@@ -72949,7 +73261,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_qos_queue_label2qmap_qmap-egress-data_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1017"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1022"
       }
     }
   },
@@ -72983,7 +73295,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_active_qos_queue_stats_interface_interface",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L521"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L525"
               },
               "c9500": {
                 "class": "ShowPlatformHardwareFedSwitchQosQueueStatsInterface",
@@ -72995,7 +73307,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_active_qos_queue_stats_interface_interface",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2028"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2032"
               }
             },
             "tokens": {
@@ -73010,7 +73322,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_qos_queue_stats_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L811"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L816"
       }
     }
   },
@@ -73042,7 +73354,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_active_qos_queue_stats_interface_interface_clear",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L610"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L614"
               },
               "c9500": {
                 "class": "ShowPlatformHardwareFedSwitchQosQueueStatsInterfaceClear",
@@ -73054,7 +73366,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_active_qos_queue_stats_interface_interface_clear",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2116"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2120"
               }
             },
             "tokens": {
@@ -73080,7 +73392,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_qos_queue_stats_oq_multicast_attach",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4094"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4099"
       }
     }
   },
@@ -73096,7 +73408,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_qos_schedule_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L295"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L300"
       }
     }
   },
@@ -73112,7 +73424,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_active_vlan_num_ingress",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L143"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L148"
       }
     }
   },
@@ -73128,7 +73440,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_fwd_resource_utilization___include_label",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1116"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1121"
       }
     }
   },
@@ -73174,7 +73486,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_fwd-asic_resource_tcam_table_acl___begin_INPUT_NAT",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6445"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6446"
       }
     }
   },
@@ -73190,7 +73502,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_matm_macTable",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8153"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8154"
       }
     }
   },
@@ -73212,7 +73524,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L663"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L667"
               },
               "c9500": {
                 "class": "ShowPlatformTcamUtilization",
@@ -73224,7 +73536,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2169"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2173"
               },
               "c9600": {
                 "class": "ShowPlatformFedActiveTcamUtilization",
@@ -73251,6 +73563,18 @@
                 },
                 "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
                 "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9600/show_platform.py#L331"
+              },
+              "c9610": {
+                "class": "ShowPlatformFedActiveTcamUtilization",
+                "doc": " Parser for show platform hardware fed active fwd-asic resource tcam utilization",
+                "module_name": "iosxe.cat9k.c9610.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'Slice0': {\n        'egress_wide_direction': str,\n        'used0': int,\n        'free0': int,\n        'ingress_wide_direction': str,\n        'inw_used0': int,\n        'inw_free0': int,\n    },\n    'Slice1': {\n        'egress_wide_direction': str,\n        'used1': int,\n        'free1': int,\n        'ingress_wide_direction': str,\n        'inw_used1': int,\n        'inw_free1': int,\n    },\n    'Slice2': {\n        'egress_wide_direction': str,\n        'used2': int,\n        'free2': int,\n        'ingress_wide_direction': str,\n        'inw_used2': int,\n        'inw_free2': int,\n    },\n    'Slice3': {\n        'egress_wide_direction': str,\n        'used3': int,\n        'free3': int,\n        'ingress_wide_direction': str,\n        'inw_used3': int,\n        'inw_free3': int,\n    },\n    'Slice4': {\n        'egress_wide_direction': str,\n        'used4': int,\n        'free4': int,\n        'ingress_wide_direction': str,\n        'inw_used4': int,\n        'inw_free4': int,\n    },\n    'Slice5': {\n        'egress_wide_direction': str,\n        'used5': int,\n        'free5': int,\n        'ingress_wide_direction': str,\n        'inw_used5': int,\n        'inw_free5': int,\n    },\n}",
+                "tokens": {
+                  "model": "c9610"
+                },
+                "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py#L15"
               }
             },
             "tokens": {
@@ -73265,7 +73589,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5501"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5502"
       }
     }
   },
@@ -73281,7 +73605,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_npu_slot_1_port_port_num_link_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3624"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3629"
       }
     }
   },
@@ -73297,7 +73621,39 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_npu_slot_1_port_port_num_port-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3506"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3511"
+      }
+    }
+  },
+  "show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude",
+        "doc": "Parser for show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}",
+        "module_name": "iosxe.show_platform_hardware_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'q_limit_blocks': int,\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_hardware_fed_switch_sw_number_qos_queue_config_interface_interface_queue_queue_id___include_match",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4569"
+      }
+    }
+  },
+  "show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude",
+        "doc": "Parser for show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}",
+        "module_name": "iosxe.show_platform_hardware_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'voq_offset': ListOf  (type) <class 'int'>,\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_hardware_fed_switch_sw_number_qos_scheduler_interface_interface___include_match",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4609"
       }
     }
   },
@@ -73313,7 +73669,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_no_fwd-asic_register_read_register-name_reg_name_asic_asic_core_core",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4147"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4152"
       }
     }
   },
@@ -73329,7 +73685,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_config_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1221"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1226"
       }
     }
   },
@@ -73345,7 +73701,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_label2qmap_qmap-egress-data_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1017"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1022"
       }
     }
   },
@@ -73379,7 +73735,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_interface_interface",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L521"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L525"
               },
               "c9500": {
                 "class": "ShowPlatformHardwareFedSwitchQosQueueStatsInterface",
@@ -73391,7 +73747,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_interface_interface",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2028"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2032"
               }
             },
             "tokens": {
@@ -73406,7 +73762,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L811"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L816"
       }
     }
   },
@@ -73438,7 +73794,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_interface_interface_clear",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L610"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L614"
               },
               "c9500": {
                 "class": "ShowPlatformHardwareFedSwitchQosQueueStatsInterfaceClear",
@@ -73450,7 +73806,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_interface_interface_clear",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2116"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2120"
               }
             },
             "tokens": {
@@ -73476,7 +73832,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_num_qos_queue_stats_oq_multicast_attach",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4094"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4099"
       }
     }
   },
@@ -73498,7 +73854,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_switch_type_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1727"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1731"
               },
               "c9600": {
                 "class": "ShowPlatformFedTcamPbrNat",
@@ -73539,7 +73895,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_type_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6161"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6162"
       }
     }
   },
@@ -73555,7 +73911,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_qos_schedule_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L295"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L300"
       }
     }
   },
@@ -73571,7 +73927,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_fwd-asic_drops_asic_asic",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4446"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4504"
       }
     }
   },
@@ -73587,7 +73943,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_fwd-asic_resource_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1550"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1555"
+      }
+    }
+  },
+  "show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff",
+        "doc": " Parser for show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}     ",
+        "module_name": "iosxe.show_platform_hardware_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'table_name': {\n        Any('*'): {\n            'length_subtables_f1': int,\n            'length_subtables_f2': int,\n            'nb_subtables_f1': int,\n            'nb_subtables_f2': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_hardware_fed_switch_type_fwd-asic_insight_npl_summary_difffiles_compare",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4440"
       }
     }
   },
@@ -73603,7 +73975,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_npu_slot_1_port_port_num_loopback_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4347"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4352"
       }
     }
   },
@@ -73619,7 +73991,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_npu_slot_1_port_port_num_prbs_cmd_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4216"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4221"
       }
     }
   },
@@ -73635,7 +74007,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_npu_slot_1_port_port_num_prbs_polynomial_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4281"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4286"
       }
     }
   },
@@ -73651,7 +74023,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_qos_queue_stats_oq_multicast_interface_interface_oq_id_oq_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2687"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2692"
       }
     }
   },
@@ -73667,7 +74039,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_qos_queue_stats_oq_multicast_interface_interface_oq_id_oq_id_clear-on-read",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2774"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2779"
       }
     }
   },
@@ -73684,7 +74056,7 @@
                 "doc": "Parser for show platform hardware fed {switch} {mode} qos scheduler sdk interface {interface}",
                 "module_name": "iosxe.cat9k.c9350.show_platform",
                 "package": "genie.libs.parser",
-                "schema": "{\n    'interface': {\n        Any('*'): {\n            'interface_id': str,\n            'priority_propagation': str,\n            'sub_interface_q_mode': str,\n            'logical_port': str,\n            'tc_profile': {\n                'sdk_oid': int,\n                'tc': {\n                    Any('*'): {\n                        'voq_offset': int,\n                    },\n                },\n            },\n            'interface_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'ct_r': {\n                            Any('*'): {\n                                'cir': int,\n                                'eir_pir': int,\n                                'is_eir': str,\n                                'wfq_weights': str,\n                                'hw_id': int,\n                            },\n                        },\n                    },\n                },\n            },\n            'system_port_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'c_pb': {\n                            Any('*'): {\n                                'cir': int,\n                                'burst': int,\n                                'tx_cir': int,\n                                'tx_burst': int,\n                                'eir_wfq': int,\n                                'act_wfq': int,\n                                'pg_type': str,\n                                'child_oid': {\n                                    Any('*'): {\n                                        'child_type': str,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'oqhse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                'weights': list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'cstse_scheduler': {\n                Optional('oid'): {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                Optional('weights'): list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'svcse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': int,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                'link_point': int,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child': {\n                            'hse_oid': {\n                                Any('*'): {\n                                    'voq_id': int,\n                                    'in_device': int,\n                                    'in_slice': int,\n                                    'hse_type': str,\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+                "schema": "{\n    'interface': {\n        Any('*'): {\n            'interface_id': str,\n            'priority_propagation': str,\n            'sub_interface_q_mode': str,\n            'logical_port': str,\n            'tc_profile': {\n                'sdk_oid': int,\n                'tc': {\n                    Any('*'): {\n                        'voq_offset': int,\n                    },\n                },\n            },\n            'interface_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'ct_r': {\n                            Any('*'): {\n                                'cir': int,\n                                'eir_pir': int,\n                                'is_eir': str,\n                                'wfq_weights': str,\n                                'hw_id': int,\n                            },\n                        },\n                    },\n                },\n            },\n            'system_port_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'c_pb': {\n                            Any('*'): {\n                                'cir': int,\n                                'burst': int,\n                                'tx_cir': int,\n                                'tx_burst': int,\n                                'eir_wfq': int,\n                                'act_wfq': int,\n                                'pg_type': str,\n                                'child_oid': {\n                                    Any('*'): {\n                                        'child_type': str,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'oqhse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                'weights': list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'cstse_scheduler': {\n                Optional('oid'): {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                Optional('weights'): list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'svcse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': Or (<class 'int'>, <class 'str'>),\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                'link_point': int,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child': {\n                            'hse_oid': {\n                                Any('*'): {\n                                    'voq_id': int,\n                                    'in_device': int,\n                                    'in_slice': int,\n                                    'hse_type': str,\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
                 "tokens": {
                   "model": "c9350"
                 },
@@ -73704,7 +74076,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_mode_qos_scheduler_sdk_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1838"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1843"
       }
     }
   },
@@ -73720,7 +74092,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_state_fnf_record-count_asic_asic_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9326"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9357"
       }
     }
   },
@@ -73736,7 +74108,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_state_qos_queue_stats_internal_cpu_policer",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3931"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3936"
       }
     }
   },
@@ -73752,7 +74124,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_var_fwd-asic_drops_asic_asic_id_slice_slice_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3427"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3432"
       }
     }
   },
@@ -73768,7 +74140,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_var_fwd-asic_traps_npu-traps_asic_asic_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3279"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3284"
       }
     }
   },
@@ -73784,7 +74156,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_var_fwd-asic_traps_tm-traps_asic_asic_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3350"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3355"
       }
     }
   },
@@ -73821,7 +74193,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_var_qos_dscp-cos_counters_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1622"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1627"
       }
     }
   },
@@ -73837,7 +74209,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_var_qos_queue_config_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2854"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2859"
       }
     }
   },
@@ -73853,7 +74225,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_fwd-asic_drops_exceptions",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L73"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L78"
       }
     }
   },
@@ -73869,7 +74241,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_fwd-asic_resource_rewrite_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8030"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8031"
       }
     }
   },
@@ -73891,7 +74263,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_active_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1727"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1731"
               },
               "c9600": {
                 "class": "ShowPlatformFedTcamPbrNat",
@@ -73918,7 +74290,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_active_fwd-asic_resource_tcam_table_pbr_record_0_format_0___begin_nat_region",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6161"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6162"
       }
     }
   },
@@ -74000,7 +74372,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L663"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L667"
               },
               "c9500": {
                 "class": "ShowPlatformTcamUtilization",
@@ -74012,7 +74384,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2169"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2173"
               },
               "c9600": {
                 "class": "ShowPlatformSwitchActiveTcamUtilization",
@@ -74053,7 +74425,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_fwd-asic_resource_tcam_utilization",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5501"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5502"
       }
     }
   },
@@ -74069,7 +74441,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_npu_slot_1_port_port_num_loopback_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4347"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4352"
       }
     }
   },
@@ -74085,7 +74457,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_npu_slot_1_port_port_num_prbs_cmd_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4216"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4221"
       }
     }
   },
@@ -74101,7 +74473,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_npu_slot_1_port_port_num_prbs_polynomial_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4281"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4286"
       }
     }
   },
@@ -74117,7 +74489,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_qos_queue_stats_oq_multicast_interface_interface_oq_id_oq_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2687"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2692"
       }
     }
   },
@@ -74133,7 +74505,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_qos_queue_stats_oq_multicast_interface_interface_oq_id_oq_id_clear-on-read",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2774"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2779"
       }
     }
   },
@@ -74150,7 +74522,7 @@
                 "doc": "Parser for show platform hardware fed {switch} {mode} qos scheduler sdk interface {interface}",
                 "module_name": "iosxe.cat9k.c9350.show_platform",
                 "package": "genie.libs.parser",
-                "schema": "{\n    'interface': {\n        Any('*'): {\n            'interface_id': str,\n            'priority_propagation': str,\n            'sub_interface_q_mode': str,\n            'logical_port': str,\n            'tc_profile': {\n                'sdk_oid': int,\n                'tc': {\n                    Any('*'): {\n                        'voq_offset': int,\n                    },\n                },\n            },\n            'interface_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'ct_r': {\n                            Any('*'): {\n                                'cir': int,\n                                'eir_pir': int,\n                                'is_eir': str,\n                                'wfq_weights': str,\n                                'hw_id': int,\n                            },\n                        },\n                    },\n                },\n            },\n            'system_port_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'c_pb': {\n                            Any('*'): {\n                                'cir': int,\n                                'burst': int,\n                                'tx_cir': int,\n                                'tx_burst': int,\n                                'eir_wfq': int,\n                                'act_wfq': int,\n                                'pg_type': str,\n                                'child_oid': {\n                                    Any('*'): {\n                                        'child_type': str,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'oqhse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                'weights': list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'cstse_scheduler': {\n                Optional('oid'): {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                Optional('weights'): list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'svcse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': int,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                'link_point': int,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child': {\n                            'hse_oid': {\n                                Any('*'): {\n                                    'voq_id': int,\n                                    'in_device': int,\n                                    'in_slice': int,\n                                    'hse_type': str,\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
+                "schema": "{\n    'interface': {\n        Any('*'): {\n            'interface_id': str,\n            'priority_propagation': str,\n            'sub_interface_q_mode': str,\n            'logical_port': str,\n            'tc_profile': {\n                'sdk_oid': int,\n                'tc': {\n                    Any('*'): {\n                        'voq_offset': int,\n                    },\n                },\n            },\n            'interface_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'ct_r': {\n                            Any('*'): {\n                                'cir': int,\n                                'eir_pir': int,\n                                'is_eir': str,\n                                'wfq_weights': str,\n                                'hw_id': int,\n                            },\n                        },\n                    },\n                },\n            },\n            'system_port_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'c_pb': {\n                            Any('*'): {\n                                'cir': int,\n                                'burst': int,\n                                'tx_cir': int,\n                                'tx_burst': int,\n                                'eir_wfq': int,\n                                'act_wfq': int,\n                                'pg_type': str,\n                                'child_oid': {\n                                    Any('*'): {\n                                        'child_type': str,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'oqhse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                'weights': list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'cstse_scheduler': {\n                Optional('oid'): {\n                    Any('*'): {\n                        'mode': str,\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': str,\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                Optional('link_point'): str,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child_group': {\n                            Any('*'): {\n                                'child': {\n                                    Any('*'): {\n                                        'hse_oid': int,\n                                        Optional('link'): {\n                                            Any('*'): {\n                                                'link_point': int,\n                                            },\n                                        },\n                                        'hse_type': str,\n                                    },\n                                },\n                                'branch': str,\n                                Optional('weights'): list,\n                                'load_balance_type': {\n                                    Any('*'): {\n                                        's': int,\n                                        'c': int,\n                                    },\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n            'svcse_scheduler': {\n                'oid': {\n                    Any('*'): {\n                        'cep_ir': {\n                            Any('*'): {\n                                'rate': Or (<class 'int'>, <class 'str'>),\n                                'burst': str,\n                                'weight': int,\n                                'hw_id': int,\n                                'type': str,\n                                'link_point': int,\n                                'hse_type': str,\n                                'hse_oid': int,\n                            },\n                        },\n                        'child': {\n                            'hse_oid': {\n                                Any('*'): {\n                                    'voq_id': int,\n                                    'in_device': int,\n                                    'in_slice': int,\n                                    'hse_type': str,\n                                },\n                            },\n                        },\n                    },\n                },\n            },\n        },\n    },\n}",
                 "tokens": {
                   "model": "c9350"
                 },
@@ -74170,7 +74542,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_mode_qos_scheduler_sdk_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1838"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1843"
       }
     }
   },
@@ -74186,7 +74558,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_state_fnf_record-count_asic_asic_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9326"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9357"
       }
     }
   },
@@ -74202,7 +74574,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_state_qos_queue_stats_internal_cpu_policer",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3931"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3936"
       }
     }
   },
@@ -74255,7 +74627,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_fwd-asic_drops_asic_asic_id_slice_slice_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3427"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3432"
       }
     }
   },
@@ -74271,7 +74643,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_fwd-asic_traps_npu-traps_asic_asic_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3279"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3284"
       }
     }
   },
@@ -74287,7 +74659,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_fwd-asic_traps_tm-traps_asic_asic_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3350"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L3355"
       }
     }
   },
@@ -74324,7 +74696,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_qos_dscp-cos_counters_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1622"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L1627"
       }
     }
   },
@@ -74340,7 +74712,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_hardware_fed_switch_switch_var_qos_queue_config_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2854"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L2859"
       }
     }
   },
@@ -75372,7 +75744,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_host-access-table_intf",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7797"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7798"
       }
     }
   },
@@ -75388,7 +75760,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_integrity",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5249"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5250"
       }
     }
   },
@@ -75404,7 +75776,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_integrity_sign_nonce_nonce",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5249"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5250"
       }
     }
   },
@@ -75420,7 +75792,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_integrity_signature",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5249"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5250"
       }
     }
   },
@@ -75452,7 +75824,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_nat_translations_active",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6367"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6368"
       }
     }
   },
@@ -75468,7 +75840,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_nat_translations_active_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6262"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6263"
       }
     }
   },
@@ -75484,7 +75856,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_packet-trace_packet_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7207"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7208"
       }
     }
   },
@@ -75500,7 +75872,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_packet-trace_packet_packet_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7207"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7208"
       }
     }
   },
@@ -75516,7 +75888,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_packet-trace_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6930"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6931"
       }
     }
   },
@@ -75532,7 +75904,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_packet-trace_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7024"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7025"
       }
     }
   },
@@ -75548,7 +75920,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_pm_etherchannel_ec_channel_group_id_group-mask",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9232"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9233"
       }
     }
   },
@@ -75564,7 +75936,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_pm_interface-numbers",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8377"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8378"
       }
     }
   },
@@ -75580,7 +75952,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_pm_port-data_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7888"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7889"
       }
     }
   },
@@ -75608,7 +75980,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_power",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4727"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4728"
       }
     }
   },
@@ -75624,7 +75996,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_resources",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5723"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5724"
       }
     }
   },
@@ -75640,7 +76012,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_soft_infra_bipc___inc_buffer",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3768"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3769"
       }
     }
   },
@@ -75656,7 +76028,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_access-list_switch_active_F0_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5801"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5802"
       }
     }
   },
@@ -75672,7 +76044,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_access-list_switch_mode_FP_switch_var_og-lkup-ids",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5960"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5961"
       }
     }
   },
@@ -75688,7 +76060,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_audit_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5237"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5238"
       }
     }
   },
@@ -75704,7 +76076,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_bp_crimson_content_config",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3425"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3426"
       }
     }
   },
@@ -75741,7 +76113,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_bp_crimson_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4593"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4594"
       }
     }
   },
@@ -75805,7 +76177,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_control-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2599"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2600"
       }
     }
   },
@@ -75821,7 +76193,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_counters_drop",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2068"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2069"
       }
     }
   },
@@ -75837,7 +76209,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_counters_interface_isis",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7804"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7805"
       }
     }
   },
@@ -75853,7 +76225,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_counters_interface_lacp",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7727"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7728"
       }
     }
   },
@@ -75869,7 +76241,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_counters_punt-inject",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2135"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2136"
       }
     }
   },
@@ -75885,7 +76257,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_ipc_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2353"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2354"
       }
     }
   },
@@ -75901,7 +76273,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_ipc_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2419"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2420"
       }
     }
   },
@@ -75917,7 +76289,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_cpm_switch_mode_B0_resource",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2677"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2678"
       }
     }
   },
@@ -75933,7 +76305,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_dbal_smd_R0_database_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1810"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1811"
       }
     }
   },
@@ -75949,7 +76321,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_distributed-ipsec_tunnel-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5882"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5883"
       }
     }
   },
@@ -75965,7 +76337,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_dns-umbrella_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1926"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1927"
       }
     }
   },
@@ -75981,7 +76353,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_dpidb_index",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1759"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1760"
       }
     }
   },
@@ -76013,7 +76385,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_factory-reset_secure_log",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3675"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3676"
       }
     }
   },
@@ -76174,7 +76546,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_fnf_record-count_asic_asic_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9412"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9443"
       }
     }
   },
@@ -76190,7 +76562,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_ifm_interfaces_tunnel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8069"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8100"
       }
     }
   },
@@ -76206,7 +76578,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_ifm_interfaces_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5477"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5484"
       }
     }
   },
@@ -76244,7 +76616,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_active_ifm_mappings",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1010"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1014"
               },
               "c9600": {
                 "class": "ShowPlatformFedActiveIfmMapping",
@@ -76271,7 +76643,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_ifm_mappings",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8135"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8166"
       }
     }
   },
@@ -76287,7 +76659,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_ifm_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8286"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8317"
       }
     }
   },
@@ -76303,7 +76675,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_inject_ios-cause_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9867"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9898"
       }
     }
   },
@@ -76399,7 +76771,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_monitor_session",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5206"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5213"
       }
     }
   },
@@ -76479,7 +76851,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_nat_interfaces",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7319"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7350"
       }
     }
   },
@@ -76511,7 +76883,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_nat_rules",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7411"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7442"
       }
     }
   },
@@ -76625,7 +76997,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_active_punt_entries",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1849"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1853"
               }
             },
             "tokens": {
@@ -76655,7 +77027,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_active_punt_entries___include_label",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1849"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1853"
               }
             },
             "tokens": {
@@ -76793,7 +77165,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_stp-vlan_vlan_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6952"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6975"
+      }
+    }
+  },
+  "show platform software fed active vt all": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveVtAll",
+        "doc": "Parser for show platform software fed switch active vt all",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'interface_id': {\n        Any('*'): {\n            'cvlan_id': int,\n            'svlan_id': int,\n            'action': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_active_vt_all",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4266"
       }
     }
   },
@@ -76825,7 +77213,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_vt_hardware_if-id_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5546"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5553"
       }
     }
   },
@@ -76841,7 +77229,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_active_vt_hardware_if-id_ifid",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5927"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5934"
       }
     }
   },
@@ -76873,7 +77261,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_acl_bind_db_if-id_if_id_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10245"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10276"
       }
     }
   },
@@ -76897,7 +77285,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
-        "doc": "Parser for:\n    * 'show platform software fed switch active acl info db detail'\n    ",
+        "doc": "Parser for:\n    * 'show platform software fed {switch} {mode} acl info db detail'\n    ",
         "folders": {
           "cat9k": {
             "folders": {
@@ -76911,7 +77299,7 @@
                   "model": "c9350"
                 },
                 "uid": "show_platform_software_fed_switch_active_acl_info_db_detail",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L810"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L814"
               }
             },
             "tokens": {
@@ -76926,7 +77314,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_acl_info_db_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6449"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6464"
       }
     }
   },
@@ -76934,7 +77322,7 @@
     "folders": {
       "iosxe": {
         "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummary",
-        "doc": "Parser for show platform software fed switch active acl info db summary",
+        "doc": "Parser for show platform software fed {switch} {mode} acl info db summary",
         "module_name": "iosxe.show_platform_software_fed",
         "package": "genie.libs.parser",
         "schema": "{\n    'acl_summary': {\n        Any('*'): {\n            'acl_name': str,\n            'feature': str,\n            'no_of_aces': int,\n            'protocol': str,\n            'ingress': str,\n            'egress': str,\n        },\n    },\n}",
@@ -76942,7 +77330,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_acl_info_db_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6188"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6195"
       }
     }
   },
@@ -76958,7 +77346,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_acl_og-pcl",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7037"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7060"
       }
     }
   },
@@ -76974,7 +77362,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_acl_statistics_events",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7112"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7135"
       }
     }
   },
@@ -76990,23 +77378,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_ifm_interfaces_internal_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9986"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10017"
       }
     }
   },
   "show platform software fed switch active ifm mappings lpn": {
     "folders": {
       "iosxe": {
-        "class": "ShowPlatformSoftwareFedSwitchActiveIfmMappingsLpn",
-        "doc": "\n    Parser for :\n        * show platform software fed switch active ifm mappings lpn\n    ",
-        "module_name": "iosxe.show_platform_software_fed",
+        "class": "ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn",
+        "doc": "\n    Parser for :\n        * show platform software fed switch active ifm mappings lpn\n        * \"show platform software fed switch {switch_num} ifm mappings lpn\"\n    ",
+        "module_name": "iosxe.show_platform_software_fed_switch_num",
         "package": "genie.libs.parser",
         "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'lpn': int,\n            'asic': int,\n            'port': int,\n            'if_id': str,\n            'active': str,\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_ifm_mappings_lpn",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L947"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_switch_num.py#L40"
       }
     }
   },
@@ -77054,7 +77442,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_learning_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6804"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6827"
       }
     }
   },
@@ -77102,7 +77490,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_monitor_session",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5453"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5460"
       }
     }
   },
@@ -77134,7 +77522,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_security-fed_arp_if_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10370"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10401"
       }
     }
   },
@@ -77150,23 +77538,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_security-fed_arp_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10484"
-      }
-    }
-  },
-  "show platform software fed switch active vt all": {
-    "folders": {
-      "iosxe": {
-        "class": "ShowPlatformSoftwareFedSwitchActiveVtAll",
-        "doc": "Parser for show platform software fed switch active vt all",
-        "module_name": "iosxe.show_platform_software_fed",
-        "package": "genie.libs.parser",
-        "schema": "{\n    'interface_id': {\n        Any('*'): {\n            'cvlan_id': int,\n            'svlan_id': int,\n            'action': int,\n        },\n    },\n}",
-        "tokens": {
-          "os": "iosxe"
-        },
-        "uid": "show_platform_software_fed_switch_active_vt_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4266"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10515"
       }
     }
   },
@@ -77235,7 +77607,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_fnf_record-count_asic_asic_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9412"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9443"
       }
     }
   },
@@ -77251,7 +77623,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_ifm_if-id_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4464"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4471"
       }
     }
   },
@@ -77273,7 +77645,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_state_ifm_mappings",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1010"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1014"
               }
             },
             "tokens": {
@@ -77288,7 +77660,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_ifm_mappings",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8135"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8166"
+      }
+    }
+  },
+  "show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude",
+        "doc": "Parser for show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}",
+        "module_name": "iosxe.show_platform_hardware_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'interface': str,\n    'location': str,\n    'direction': str,\n    'cgid': str,\n    'no_of_classes': int,\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_sw_number_qos_interface_interface_ingress_npd_detailed___include_match",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py#L4653"
       }
     }
   },
@@ -77382,6 +77770,22 @@
       }
     }
   },
+  "show platform software fed switch {switch_num} ifm mappings lpn": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn",
+        "doc": "\n    Parser for :\n        * show platform software fed switch active ifm mappings lpn\n        * \"show platform software fed switch {switch_num} ifm mappings lpn\"\n    ",
+        "module_name": "iosxe.show_platform_software_fed_switch_num",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'interfaces': {\n        Any('*'): {\n            'lpn': int,\n            'asic': int,\n            'port': int,\n            'if_id': str,\n            'active': str,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_switch_num_ifm_mappings_lpn",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_switch_num.py#L40"
+      }
+    }
+  },
   "show platform software fed switch {switch_num} monitor {session}": {
     "folders": {
       "iosxe": {
@@ -77394,7 +77798,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_num_monitor_session",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5453"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5460"
       }
     }
   },
@@ -77410,7 +77814,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_num_stp-vlan_vlan_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6952"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6975"
       }
     }
   },
@@ -77426,7 +77830,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_type_ifm_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8286"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8317"
       }
     }
   },
@@ -77478,6 +77882,54 @@
       }
     }
   },
+  "show platform software fed switch {switch_var} acl info sdk detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail",
+        "doc": "Parser for \n\t\t* 'show platform software fed switch {switch_var} acl info sdk detail'\n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail' \n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'class_group_name': {\n        Any('*'): {\n            'direction': str,\n            'feature': str,\n            'protocol': str,\n            'cg_id': int,\n            'pol_hdl': str,\n            'oid': str,\n            'no_of_ace': int,\n            Any('*'): {\n                Optional('ipv4_src_value'): str,\n                Optional('ipv4_src_mask'): str,\n                Optional('ipv4_dst_value'): str,\n                Optional('ipv4_dst_mask'): str,\n                Optional('ipv6_src_mac_value'): str,\n                Optional('ipv6_src_mac_mask'): str,\n                Optional('ipv6_dst_mac_value'): str,\n                Optional('ipv6_dst_mac_mask'): str,\n                Any('*'): {\n                    Optional('proto'): str,\n                    Optional('ext_h'): str,\n                    Optional('tos'): str,\n                    Optional('tcp_flg'): str,\n                    Optional('ttl'): str,\n                    Optional('ipv4_flags'): str,\n                    Optional('src_port'): str,\n                    Optional('dst_port'): str,\n                },\n                'result_actions': {\n                    'punt': str,\n                    'drop': str,\n                    'mirror': str,\n                    'counter': str,\n                    'counter_value': int,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_switch_var_acl_info_sdk_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10743"
+      }
+    }
+  },
+  "show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail",
+        "doc": "Parser for \n\t\t* 'show platform software fed switch {switch_var} acl info sdk detail'\n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail' \n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'class_group_name': {\n        Any('*'): {\n            'direction': str,\n            'feature': str,\n            'protocol': str,\n            'cg_id': int,\n            'pol_hdl': str,\n            'oid': str,\n            'no_of_ace': int,\n            Any('*'): {\n                Optional('ipv4_src_value'): str,\n                Optional('ipv4_src_mask'): str,\n                Optional('ipv4_dst_value'): str,\n                Optional('ipv4_dst_mask'): str,\n                Optional('ipv6_src_mac_value'): str,\n                Optional('ipv6_src_mac_mask'): str,\n                Optional('ipv6_dst_mac_value'): str,\n                Optional('ipv6_dst_mac_mask'): str,\n                Any('*'): {\n                    Optional('proto'): str,\n                    Optional('ext_h'): str,\n                    Optional('tos'): str,\n                    Optional('tcp_flg'): str,\n                    Optional('ttl'): str,\n                    Optional('ipv4_flags'): str,\n                    Optional('src_port'): str,\n                    Optional('dst_port'): str,\n                },\n                'result_actions': {\n                    'punt': str,\n                    'drop': str,\n                    'mirror': str,\n                    'counter': str,\n                    'counter_value': int,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_switch_var_acl_info_sdk_feature_feature_name_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10743"
+      }
+    }
+  },
+  "show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail",
+        "doc": "Parser for \n\t\t* 'show platform software fed switch {switch_var} acl info sdk detail'\n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail' \n\t\t* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'\n    ",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'class_group_name': {\n        Any('*'): {\n            'direction': str,\n            'feature': str,\n            'protocol': str,\n            'cg_id': int,\n            'pol_hdl': str,\n            'oid': str,\n            'no_of_ace': int,\n            Any('*'): {\n                Optional('ipv4_src_value'): str,\n                Optional('ipv4_src_mask'): str,\n                Optional('ipv4_dst_value'): str,\n                Optional('ipv4_dst_mask'): str,\n                Optional('ipv6_src_mac_value'): str,\n                Optional('ipv6_src_mac_mask'): str,\n                Optional('ipv6_dst_mac_value'): str,\n                Optional('ipv6_dst_mac_mask'): str,\n                Any('*'): {\n                    Optional('proto'): str,\n                    Optional('ext_h'): str,\n                    Optional('tos'): str,\n                    Optional('tcp_flg'): str,\n                    Optional('ttl'): str,\n                    Optional('ipv4_flags'): str,\n                    Optional('src_port'): str,\n                    Optional('dst_port'): str,\n                },\n                'result_actions': {\n                    'punt': str,\n                    'drop': str,\n                    'mirror': str,\n                    'counter': str,\n                    'counter_value': int,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_switch_var_acl_info_sdk_feature_feature_name_dir_in_out_cgid_cg_id_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L10743"
+      }
+    }
+  },
   "show platform software fed switch {switch_var} ptp interface {interface}": {
     "folders": {
       "iosxe": {
@@ -77506,7 +77958,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_vt_hardware_if-id_ifid",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5927"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5934"
       }
     }
   },
@@ -77538,7 +77990,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_fnf_flow-record_asic_asic_start-index_index_num-flows_flow",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6080"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6087"
       }
     }
   },
@@ -77574,6 +78026,22 @@
       }
     }
   },
+  "show platform software fed switch {switch} vt all": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveVtAll",
+        "doc": "Parser for show platform software fed switch active vt all",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'interface_id': {\n        Any('*'): {\n            'cvlan_id': int,\n            'svlan_id': int,\n            'action': int,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_switch_vt_all",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4266"
+      }
+    }
+  },
   "show platform software fed switch {switch} {mode} if-id {if_id}": {
     "folders": {
       "iosxe": {
@@ -77602,7 +78070,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_type_ip_ecr_exact-route_sourceip_destinationip",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9480"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9511"
       }
     }
   },
@@ -77618,7 +78086,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_type_ip_ecr_exact-route_sourceip_destinationip_sourceport_destinationport_protocol",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9480"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9511"
       }
     }
   },
@@ -77650,7 +78118,88 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_instance_acl_sgacl_cell_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3815"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3817"
+      }
+    }
+  },
+  "show platform software fed {mode} acl info db detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+        "doc": "Parser for:\n    * 'show platform software fed {switch} {mode} acl info db detail'\n    ",
+        "folders": {
+          "cat9k": {
+            "folders": {
+              "c9350": {
+                "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+                "doc": "Parser for:\n        * 'show platform software fed switch active acl info db detail'\n    ",
+                "module_name": "iosxe.cat9k.c9350.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'sdk_handles': list,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'proto': {\n                        'value': str,\n                        'mask': str,\n                        'tcp_flg': str,\n                        'tcp_op': str,\n                        'src_port': str,\n                        'dst_port': str,\n                    },\n                    'tos': {\n                        'value': str,\n                        'mask': str,\n                        'ttl': str,\n                        'cos': str,\n                        'v4_opt': str,\n                        'src_obj': str,\n                        'dst_obj': str,\n                    },\n                    'action': str,\n                    'logging': str,\n                    Optional('counter_handles'): list,\n                },\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9350"
+                },
+                "uid": "show_platform_software_fed_mode_acl_info_db_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L814"
+              },
+              "c9610": {
+                "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+                "doc": "Parser for:\n        * 'show platform software fed switch active acl info db detail'\n    ",
+                "module_name": "iosxe.cat9k.c9610.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'sdk_handles': list,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'proto': {\n                        'value': str,\n                        'mask': str,\n                        'tcp_flg': str,\n                        'tcp_op': str,\n                        'src_port': str,\n                        'dst_port': str,\n                    },\n                    'tos': {\n                        'value': str,\n                        'mask': str,\n                        'ttl': str,\n                        'cos': str,\n                        'v4_opt': str,\n                        'src_obj': str,\n                        'dst_obj': str,\n                    },\n                    'action': str,\n                    'logging': str,\n                    Optional('counter_handles'): list,\n                },\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9610"
+                },
+                "uid": "show_platform_software_fed_mode_acl_info_db_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py#L72"
+              }
+            },
+            "tokens": {
+              "platform": "cat9k"
+            }
+          }
+        },
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'asic': int,\n            'oid': str,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'pro': {\n                        Any('*'): {\n                            'proto': str,\n                            'frag': str,\n                            'tcp_flg': str,\n                            'tcp_op': str,\n                            'src_port': str,\n                            'dst_port': str,\n                        },\n                    },\n                    'tost': {\n                        Any('*'): {\n                            'tos': str,\n                            'ttl': str,\n                            'cos': str,\n                            'v4_opt': str,\n                            'src_obj': str,\n                            'dst_obj': str,\n                        },\n                    },\n                    'result': str,\n                    'counter': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_mode_acl_info_db_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6464"
+      }
+    }
+  },
+  "show platform software fed {mode} acl info db summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummary",
+        "doc": "Parser for show platform software fed {switch} {mode} acl info db summary",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'acl_summary': {\n        Any('*'): {\n            'acl_name': str,\n            'feature': str,\n            'no_of_aces': int,\n            'protocol': str,\n            'ingress': str,\n            'egress': str,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_mode_acl_info_db_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6195"
+      }
+    }
+  },
+  "show platform software fed {mode} acl statistics events": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclStatisticsEvents",
+        "doc": null,
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'acl_statistics': {\n        'acl_binds': int,\n        'acl_bind_errors': int,\n        'acl_unbinds': int,\n        'acl_unbind_errors': int,\n        'acl_rebinds': int,\n        'acl_rebind_errors': int,\n        'acl_edits': int,\n        'acl_edit_errors': int,\n        'og_creates': int,\n        'og_create_errors': int,\n        'og_deletes': int,\n        'og_delete_errors': int,\n        'og_edits': int,\n        'og_edit_errors': int,\n        'ipv4_ingress_acl_deny': int,\n        'ipv4_egress_acl_deny': int,\n        'ipv4_acl_implicit_deny': int,\n        'ipv6_ingress_acl_deny': int,\n        'ipv6_egress_acl_deny': int,\n        'ipv6_acl_implicit_deny': int,\n        Optional('mac_ingress_acl_deny'): int,\n        Optional('mac_egress_acl_deny'): int,\n        Optional('mac_acl_implicit_deny'): int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_mode_acl_statistics_events",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7135"
       }
     }
   },
@@ -77666,7 +78215,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_mode_ifm_interfaces_svi",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7200"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7231"
       }
     }
   },
@@ -77682,7 +78231,37 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_mode_ifm_mappings_etherchannel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7257"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7288"
+      }
+    }
+  },
+  "show platform software fed {mode} ip mfib vrf {vrf_name} {group} detail": {
+    "folders": {
+      "iosxe": {
+        "folders": {
+          "cat9k": {
+            "folders": {
+              "c9500": {
+                "class": "ShowPlatformSoftwareFedIpMfibVrfGroupDetail",
+                "doc": "Parser for show platform software fed active ip mfib vrf vrf_mcast 225.0.0.1 detail",
+                "module_name": "iosxe.cat9k.c9500.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'mvrf_table': {\n        Any('*'): {\n            'mcast_table': {\n                'cpu_credit': int,\n                'fset_aux_urid': str,\n                'fset_urid': str,\n                'gid': int,\n                'group_ip': str,\n                'hardware_info_asic': {\n                    'cookie_urid': str,\n                    'enable_rpf_check': int,\n                    'ip_mcid_oid': int,\n                    'punt_and_forward': int,\n                    'punt_on_rpf_fail': int,\n                    'rpf_port_oid': int,\n                    'rpfid': int,\n                    'use_rpfid': int,\n                },\n                'hw_flag': str,\n                'mcid_oid_asic': int,\n                'mlist_handle': str,\n                'mlist_urid': str,\n                'npi_mroute_ent': str,\n                'oif_details': {\n                    Any('*'): {\n                        'adj_id': str,\n                        'flags': str,\n                        'hw_flag': str,\n                        'interface': str,\n                        'intf_type': str,\n                        'msg_type': str,\n                        'parent_if': str,\n                    },\n                },\n                'rpf_adjancency_id': str,\n                'source_ip': str,\n                'svi_fwd_ifs': int,\n                'total_packets': int,\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9500"
+                },
+                "uid": "show_platform_software_fed_mode_ip_mfib_vrf_vrf_name_group_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L3174"
+              }
+            },
+            "tokens": {
+              "platform": "cat9k"
+            }
+          }
+        },
+        "tokens": {
+          "os": "iosxe"
+        }
       }
     }
   },
@@ -77842,7 +78421,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_mode_security-fed_ipsg_if-id_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5996"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6003"
       }
     }
   },
@@ -77858,7 +78437,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_mode_vp_summary_interface_if_id_interface_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9235"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9266"
       }
     }
   },
@@ -77874,7 +78453,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_rp_learning_stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6804"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6827"
       }
     }
   },
@@ -77890,7 +78469,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ip_igmp_snooping_groups_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1757"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1759"
       }
     }
   },
@@ -77910,6 +78489,22 @@
       }
     }
   },
+  "show platform software fed {state} ip igmp snooping summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedIpIgmpSnoopingSummary",
+        "doc": "Parser for show platform software fed switch active ip igmp snooping summary",
+        "module_name": "iosxe.show_platform_software_fed_ip",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'igmp_snooping_summary': {\n        'group_current_count': int,\n        'group_max_count': int,\n        'last_used_group_urid': str,\n        'last_used_vlan_urid': str,\n        'port_current_count': int,\n        'port_max_count': int,\n        'vlan_current_count': int,\n        'vlan_max_count': int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_state_ip_igmp_snooping_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1869"
+      }
+    }
+  },
   "show platform software fed {state} ip igmp snooping vlan {vlan}": {
     "folders": {
       "iosxe": {
@@ -77938,7 +78533,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ip_igmp_snooping_vlan_vlan_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9563"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9594"
       }
     }
   },
@@ -77954,7 +78549,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ip_mfib_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1579"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1581"
       }
     }
   },
@@ -77970,7 +78565,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ip_mfib_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1632"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1634"
+      }
+    }
+  },
+  "show platform software fed {state} ip mfib vrf {vrf_name} count": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedIpMfibVrfCount",
+        "doc": "Parser for show platform software fed switch active ip mfib vrf {vrf_name} count",
+        "module_name": "iosxe.show_platform_software_fed_ip",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mfib_count': {\n        'number_of_entries': int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_state_ip_mfib_vrf_vrf_name_count",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1820"
       }
     }
   },
@@ -77986,7 +78597,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mfib_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1306"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1310"
       }
     }
   },
@@ -78002,7 +78613,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mfib_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1359"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1363"
       }
     }
   },
@@ -78018,7 +78629,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mld_snooping_groups_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L59"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L64"
       }
     }
   },
@@ -78034,7 +78645,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mld_snooping_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1491"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1495"
       }
     }
   },
@@ -78050,7 +78661,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mld_snooping_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L211"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L216"
       }
     }
   },
@@ -78066,7 +78677,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_state_ipv6_mld_snooping_vlan_vlan_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L988"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L993"
       }
     }
   },
@@ -78139,7 +78750,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_num_punt_packet-capture_display-filter_icmp_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2658"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2663"
               }
             },
             "tokens": {
@@ -78169,7 +78780,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_num_punt_packet-capture_display-filter_icmpv6_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2951"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2956"
               }
             },
             "tokens": {
@@ -78199,7 +78810,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_num_punt_packet-capture_display-filter_key_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2327"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2331"
               }
             },
             "tokens": {
@@ -78229,7 +78840,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_num_punt_packet-capture_status",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2514"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2518"
               }
             },
             "tokens": {
@@ -78255,7 +78866,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_acl_bind_db_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6264"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6279"
       }
     }
   },
@@ -78271,7 +78882,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_acl_bind_db_feature_feature_name_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6711"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6734"
       }
     }
   },
@@ -78287,7 +78898,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_acl_bind_db_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6711"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6734"
       }
     }
   },
@@ -78303,7 +78914,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_drop_packet-capture_interfaces-stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8021"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8052"
       }
     }
   },
@@ -78319,7 +78930,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_drop_packet-capture_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7961"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7992"
       }
     }
   },
@@ -78335,7 +78946,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_fnf_sw-stats-show",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7894"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7925"
+      }
+    }
+  },
+  "show platform software fed {switch_var} {state} ip igmp snooping summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedIpIgmpSnoopingSummary",
+        "doc": "Parser for show platform software fed switch active ip igmp snooping summary",
+        "module_name": "iosxe.show_platform_software_fed_ip",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'igmp_snooping_summary': {\n        'group_current_count': int,\n        'group_max_count': int,\n        'last_used_group_urid': str,\n        'last_used_vlan_urid': str,\n        'port_current_count': int,\n        'port_max_count': int,\n        'vlan_current_count': int,\n        'vlan_max_count': int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_var_state_ip_igmp_snooping_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1869"
       }
     }
   },
@@ -78367,7 +78994,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ip_igmp_snooping_vlan_vlan_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9563"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9594"
+      }
+    }
+  },
+  "show platform software fed {switch_var} {state} ip mfib vrf {vrf_name} count": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedIpMfibVrfCount",
+        "doc": "Parser for show platform software fed switch active ip mfib vrf {vrf_name} count",
+        "module_name": "iosxe.show_platform_software_fed_ip",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'mfib_count': {\n        'number_of_entries': int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_var_state_ip_mfib_vrf_vrf_name_count",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1820"
       }
     }
   },
@@ -78383,7 +79026,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ipv6_mfib_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1306"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1310"
       }
     }
   },
@@ -78399,7 +79042,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ipv6_mfib_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1359"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1363"
       }
     }
   },
@@ -78415,7 +79058,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ipv6_mld_snooping_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1491"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1495"
       }
     }
   },
@@ -78431,7 +79074,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ipv6_mld_snooping_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L211"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L216"
       }
     }
   },
@@ -78447,7 +79090,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_state_ipv6_mld_snooping_vlan_vlan_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L988"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L993"
       }
     }
   },
@@ -78463,7 +79106,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_var_switch_vp_summary_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4322"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4329"
       }
     }
   },
@@ -78511,7 +79154,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_ifm_interfaces_tunnel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8069"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8100"
       }
     }
   },
@@ -78527,7 +79170,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_active_ifm_interfaces_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5477"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5484"
       }
     }
   },
@@ -78563,7 +79206,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_active_ip_route_vrf_vrf_name",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1941"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1945"
               }
             },
             "tokens": {
@@ -78719,7 +79362,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_active_punt_entries",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1849"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1853"
               }
             },
             "tokens": {
@@ -78749,7 +79392,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_active_punt_entries___include_label",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1849"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1853"
               }
             },
             "tokens": {
@@ -78823,7 +79466,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_vp_summary_vlan_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4322"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L4329"
       }
     }
   },
@@ -78839,7 +79482,88 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_instance_acl_sgacl_cell_all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3815"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_cts.py#L3817"
+      }
+    }
+  },
+  "show platform software fed {switch} {mode} acl info db detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+        "doc": "Parser for:\n    * 'show platform software fed {switch} {mode} acl info db detail'\n    ",
+        "folders": {
+          "cat9k": {
+            "folders": {
+              "c9350": {
+                "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+                "doc": "Parser for:\n        * 'show platform software fed switch active acl info db detail'\n    ",
+                "module_name": "iosxe.cat9k.c9350.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'sdk_handles': list,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'proto': {\n                        'value': str,\n                        'mask': str,\n                        'tcp_flg': str,\n                        'tcp_op': str,\n                        'src_port': str,\n                        'dst_port': str,\n                    },\n                    'tos': {\n                        'value': str,\n                        'mask': str,\n                        'ttl': str,\n                        'cos': str,\n                        'v4_opt': str,\n                        'src_obj': str,\n                        'dst_obj': str,\n                    },\n                    'action': str,\n                    'logging': str,\n                    Optional('counter_handles'): list,\n                },\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9350"
+                },
+                "uid": "show_platform_software_fed_switch_mode_acl_info_db_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py#L814"
+              },
+              "c9610": {
+                "class": "ShowPlatformSoftwareFedActiveAclInfoDbDetail",
+                "doc": "Parser for:\n        * 'show platform software fed switch active acl info db detail'\n    ",
+                "module_name": "iosxe.cat9k.c9610.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'sdk_handles': list,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'proto': {\n                        'value': str,\n                        'mask': str,\n                        'tcp_flg': str,\n                        'tcp_op': str,\n                        'src_port': str,\n                        'dst_port': str,\n                    },\n                    'tos': {\n                        'value': str,\n                        'mask': str,\n                        'ttl': str,\n                        'cos': str,\n                        'v4_opt': str,\n                        'src_obj': str,\n                        'dst_obj': str,\n                    },\n                    'action': str,\n                    'logging': str,\n                    Optional('counter_handles'): list,\n                },\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9610"
+                },
+                "uid": "show_platform_software_fed_switch_mode_acl_info_db_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py#L72"
+              }
+            },
+            "tokens": {
+              "platform": "cat9k"
+            }
+          }
+        },
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'cg_name': {\n        Any('*'): {\n            'cg_id': int,\n            'feature': str,\n            'prot': str,\n            'region': str,\n            'dir': str,\n            'asic': int,\n            'oid': str,\n            'seq': {\n                Any('*'): {\n                    Optional('ipv4_src_value'): str,\n                    Optional('ipv4_src_mask'): str,\n                    Optional('ipv4_dst_value'): str,\n                    Optional('ipv4_dst_mask'): str,\n                    Optional('ipv6_src_value'): str,\n                    Optional('ipv6_src_mask'): str,\n                    Optional('ipv6_dst_value'): str,\n                    Optional('ipv6_dst_mask'): str,\n                    'pro': {\n                        Any('*'): {\n                            'proto': str,\n                            'frag': str,\n                            'tcp_flg': str,\n                            'tcp_op': str,\n                            'src_port': str,\n                            'dst_port': str,\n                        },\n                    },\n                    'tost': {\n                        Any('*'): {\n                            'tos': str,\n                            'ttl': str,\n                            'cos': str,\n                            'v4_opt': str,\n                            'src_obj': str,\n                            'dst_obj': str,\n                        },\n                    },\n                    'result': str,\n                    'counter': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_mode_acl_info_db_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6464"
+      }
+    }
+  },
+  "show platform software fed {switch} {mode} acl info db summary": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummary",
+        "doc": "Parser for show platform software fed {switch} {mode} acl info db summary",
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'acl_summary': {\n        Any('*'): {\n            'acl_name': str,\n            'feature': str,\n            'no_of_aces': int,\n            'protocol': str,\n            'ingress': str,\n            'egress': str,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_mode_acl_info_db_summary",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6195"
+      }
+    }
+  },
+  "show platform software fed {switch} {mode} acl statistics events": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareFedSwitchActiveAclStatisticsEvents",
+        "doc": null,
+        "module_name": "iosxe.show_platform_software_fed",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'acl_statistics': {\n        'acl_binds': int,\n        'acl_bind_errors': int,\n        'acl_unbinds': int,\n        'acl_unbind_errors': int,\n        'acl_rebinds': int,\n        'acl_rebind_errors': int,\n        'acl_edits': int,\n        'acl_edit_errors': int,\n        'og_creates': int,\n        'og_create_errors': int,\n        'og_deletes': int,\n        'og_delete_errors': int,\n        'og_edits': int,\n        'og_edit_errors': int,\n        'ipv4_ingress_acl_deny': int,\n        'ipv4_egress_acl_deny': int,\n        'ipv4_acl_implicit_deny': int,\n        'ipv6_ingress_acl_deny': int,\n        'ipv6_egress_acl_deny': int,\n        'ipv6_acl_implicit_deny': int,\n        Optional('mac_ingress_acl_deny'): int,\n        Optional('mac_egress_acl_deny'): int,\n        Optional('mac_acl_implicit_deny'): int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_fed_switch_mode_acl_statistics_events",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7135"
       }
     }
   },
@@ -78855,7 +79579,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ifm_interfaces_svi",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7200"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7231"
       }
     }
   },
@@ -78871,7 +79595,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ifm_mappings_etherchannel",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7257"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7288"
       }
     }
   },
@@ -78887,7 +79611,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_inject_ios-cause_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9867"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9898"
       }
     }
   },
@@ -78903,7 +79627,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_adj",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L884"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L889"
       }
     }
   },
@@ -78919,7 +79643,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_adj_ip_addr",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L884"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L889"
       }
     }
   },
@@ -78935,7 +79659,37 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_adj_ip_addr_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L884"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L889"
+      }
+    }
+  },
+  "show platform software fed {switch} {mode} ip mfib vrf {vrf_name} {group} detail": {
+    "folders": {
+      "iosxe": {
+        "folders": {
+          "cat9k": {
+            "folders": {
+              "c9500": {
+                "class": "ShowPlatformSoftwareFedIpMfibVrfGroupDetail",
+                "doc": "Parser for show platform software fed active ip mfib vrf vrf_mcast 225.0.0.1 detail",
+                "module_name": "iosxe.cat9k.c9500.show_platform",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'mvrf_table': {\n        Any('*'): {\n            'mcast_table': {\n                'cpu_credit': int,\n                'fset_aux_urid': str,\n                'fset_urid': str,\n                'gid': int,\n                'group_ip': str,\n                'hardware_info_asic': {\n                    'cookie_urid': str,\n                    'enable_rpf_check': int,\n                    'ip_mcid_oid': int,\n                    'punt_and_forward': int,\n                    'punt_on_rpf_fail': int,\n                    'rpf_port_oid': int,\n                    'rpfid': int,\n                    'use_rpfid': int,\n                },\n                'hw_flag': str,\n                'mcid_oid_asic': int,\n                'mlist_handle': str,\n                'mlist_urid': str,\n                'npi_mroute_ent': str,\n                'oif_details': {\n                    Any('*'): {\n                        'adj_id': str,\n                        'flags': str,\n                        'hw_flag': str,\n                        'interface': str,\n                        'intf_type': str,\n                        'msg_type': str,\n                        'parent_if': str,\n                    },\n                },\n                'rpf_adjancency_id': str,\n                'source_ip': str,\n                'svi_fwd_ifs': int,\n                'total_packets': int,\n            },\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9500"
+                },
+                "uid": "show_platform_software_fed_switch_mode_ip_mfib_vrf_vrf_name_group_detail",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L3174"
+              }
+            },
+            "tokens": {
+              "platform": "cat9k"
+            }
+          }
+        },
+        "tokens": {
+          "os": "iosxe"
+        }
       }
     }
   },
@@ -78951,7 +79705,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_route",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L803"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L808"
       }
     }
   },
@@ -78967,7 +79721,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_route_ip_add",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L578"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L583"
       }
     }
   },
@@ -78983,7 +79737,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_ip_route_ip_add_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L578"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L583"
       }
     }
   },
@@ -79063,7 +79817,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_nat_interfaces",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7319"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7350"
       }
     }
   },
@@ -79095,7 +79849,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_nat_rules",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7411"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7442"
       }
     }
   },
@@ -79255,7 +80009,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_security-fed_ipsg_if-id_if_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L5996"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6003"
       }
     }
   },
@@ -79271,7 +80025,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_mode_vp_summary_interface_if_id_interface_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9235"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L9266"
       }
     }
   },
@@ -79317,7 +80071,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_ip_igmp_snooping_groups_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1757"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1759"
       }
     }
   },
@@ -79333,7 +80087,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_ip_mfib_count",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1579"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1581"
       }
     }
   },
@@ -79349,7 +80103,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_state_ip_mfib_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1632"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py#L1634"
       }
     }
   },
@@ -79415,7 +80169,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_switch_num_punt_packet-capture_display-filter_icmp_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2658"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2663"
               }
             },
             "tokens": {
@@ -79445,7 +80199,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_switch_num_punt_packet-capture_display-filter_icmpv6_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2951"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2956"
               }
             },
             "tokens": {
@@ -79475,7 +80229,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_switch_num_punt_packet-capture_display-filter_key_brief",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2327"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2331"
               }
             },
             "tokens": {
@@ -79505,7 +80259,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_fed_switch_switch_num_punt_packet-capture_status",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2514"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L2518"
               }
             },
             "tokens": {
@@ -79547,7 +80301,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_acl_bind_db_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6264"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6279"
       }
     }
   },
@@ -79563,7 +80317,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_acl_bind_db_feature_feature_name_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6711"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6734"
       }
     }
   },
@@ -79579,7 +80333,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_acl_bind_db_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6711"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L6734"
       }
     }
   },
@@ -79595,7 +80349,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_drop_packet-capture_interfaces-stats",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8021"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L8052"
       }
     }
   },
@@ -79611,7 +80365,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_drop_packet-capture_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7961"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7992"
       }
     }
   },
@@ -79627,7 +80381,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_fed_switch_switch_var_fnf_sw-stats-show",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7894"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software_fed.py#L7925"
       }
     }
   },
@@ -79643,7 +80397,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_ilpower_port_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5345"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5346"
+      }
+    }
+  },
+  "show platform software infrastructure inject": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareInfrastructureInject",
+        "doc": null,
+        "module_name": "iosxe.show_platform_software",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'l3_injected_packets': {\n        Optional('total_inject'): int,\n        Optional('failed_inject'): int,\n        Optional('sent'): int,\n        Optional('prerouted'): int,\n        Optional('non_cef_capable'): int,\n        Optional('non_unicast'): int,\n        Optional('ip'): int,\n        Optional('ipv6'): int,\n        Optional('mpls'): int,\n        Optional('non_ip_tunnel'): int,\n        Optional('udlr_tunnel'): int,\n        Optional('p2mp_replicated_mcast'): int,\n        Optional('non_ip_fastswitched_over_tunnel'): int,\n        Optional('legacy_pak_path'): int,\n        Optional('other_packet'): int,\n        Optional('ip_fragmented'): int,\n        Optional('normal'): int,\n        Optional('nexthop'): int,\n        Optional('adjacency'): int,\n        Optional('feature'): int,\n        Optional('undefined'): int,\n        Optional('pak_find_no_adj'): int,\n        Optional('no_adj_id'): int,\n        Optional('sb_alloc'): int,\n        Optional('sb_local'): int,\n        Optional('p2mcast_failed_count_0_p2mcast_enqueue_fail'): int,\n        Optional('unicast_dhc'): int,\n        Optional('mobile_ip'): int,\n        Optional('ipv6_na'): int,\n        Optional('ipv6_ns'): int,\n        Optional('transport_failed_cases'): int,\n        Optional('grow_packet_buffer'): int,\n        Optional('cant_l3_inject_pkts'): int,\n    },\n    'per_feature_packet_inject_statistics': {\n        Optional('feature_multicast'): int,\n        Optional('feature_edge_switching_service'): int,\n        Optional('feature_session_border_controller'): int,\n        Optional('feature_interrupt_level'): int,\n        Optional('feature_use_outbound_interface'): int,\n        Optional('feature_interrupt_level_with_oce'): int,\n        Optional('feature_icmpv6_error_message'): int,\n        Optional('feature_session_border_controller_media_packet_injection'): int,\n        Optional('feature_tunnel_ethernet_over_gre'): int,\n        Optional('feature_secure_socket_layer_virtual_private_network'): int,\n        Optional('feature_epc_wireshark_injecting_packets'): int,\n        Optional('feature_multicast_overlay_replication'): int,\n    },\n    'l2_injected_packets': {\n        Optional('total_l2_inject'): int,\n        Optional('total_bd__inject'): int,\n        Optional('total_bd_local__inject'): int,\n        Optional('total_efp_inject'): int,\n        Optional('total_vlan_inject'): int,\n        Optional('failed_l2_inject'): int,\n        Optional('failed_bd_local__inject'): int,\n        Optional('failed_bd__inject'): int,\n        Optional('failed_vlan_inject'): int,\n        Optional('failed_efp_inject'): int,\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_infrastructure_inject",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8792"
       }
     }
   },
@@ -79659,7 +80429,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_install-manager_RP_active_operation_history_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2948"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2949"
       }
     }
   },
@@ -79675,7 +80445,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_install-manager_chassis_active_r0_operation_history_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4508"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4509"
       }
     }
   },
@@ -79691,7 +80461,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_install-manager_switch_active_r0_operation_history_summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3020"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3021"
+      }
+    }
+  },
+  "show platform software interface f0 name {intf}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareInterfaceF0Name",
+        "doc": "Parser for show platform software interface f0 name {intf}",
+        "module_name": "iosxe.show_platform_software",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'name': str,\n    'id': int,\n    'qfp_id': int,\n    Optional('schedules'): int,\n    Optional('type'): str,\n    Optional('state'): str,\n    Optional('snmp_id'): int,\n    Optional('mtu'): int,\n    'tx_channel_id': int,\n    'rx_channel_id': int,\n    'aom_state': str,\n    'flow_control_id': int,\n    'bandwidth': int,\n    'encap': str,\n    'ip_address': str,\n    'ipv6_address': str,\n    Optional('icmp_flags'): list,\n    Optional('icmp6_flags'): list,\n    Optional('smi_protocols'): list,\n    'auth_user': str,\n    'frr_linkdown_id': int,\n    'vnet_name': str,\n    'vnet_tag': int,\n    'vnet_extra_info': int,\n    'dirty_status': str,\n    'aom_sanity_check': str,\n    'aom_obj_id': int,\n    'qos_trust_type': str,\n    Optional('flags'): str,\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_interface_f0_name_intf",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8449"
       }
     }
   },
@@ -79707,7 +80493,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_interface_switch_mode_F0_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1871"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1872"
       }
     }
   },
@@ -79723,7 +80509,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_iomd_1/0_macsec_interface_interface_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1223"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1224"
       }
     }
   },
@@ -79739,7 +80525,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_iomd_1/0_macsec_interface_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1374"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1375"
       }
     }
   },
@@ -79755,7 +80541,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_iomd_lc_no_macsec_interface_port_no_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6253"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6254"
       }
     }
   },
@@ -79787,7 +80573,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_database_fed_switch_var_callsite",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7599"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7600"
       }
     }
   },
@@ -79803,7 +80589,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_database_fed_switch_switch_var_callsite",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7599"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7600"
       }
     }
   },
@@ -79939,7 +80725,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L618"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L619"
       }
     }
   },
@@ -79955,7 +80741,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active_alloc_callsite",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L833"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L834"
       }
     }
   },
@@ -79971,7 +80757,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active_alloc_callsite_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L928"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L929"
       }
     }
   },
@@ -79987,7 +80773,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active_alloc_type_alloc_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1011"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1012"
       }
     }
   },
@@ -80003,7 +80789,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active_alloc_type_alloc_type_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1130"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1131"
       }
     }
   },
@@ -80019,7 +80805,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_RP_active_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L733"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L734"
       }
     }
   },
@@ -80035,7 +80821,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_chassis_active_slot",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L698"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L699"
       }
     }
   },
@@ -80051,7 +80837,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_chassis_active_slot_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L793"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L794"
       }
     }
   },
@@ -80067,7 +80853,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L680"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L681"
       }
     }
   },
@@ -80083,7 +80869,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot_alloc_backtrace",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L348"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L349"
       }
     }
   },
@@ -80099,7 +80885,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot_alloc_callsite",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L889"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L890"
       }
     }
   },
@@ -80115,7 +80901,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot_alloc_type_alloc_type",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1091"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1092"
       }
     }
   },
@@ -80131,7 +80917,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot_alloc_type_alloc_type_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1172"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1173"
       }
     }
   },
@@ -80147,7 +80933,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_switch_active_slot_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L773"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L774"
       }
     }
   },
@@ -80163,7 +80949,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_hw_active_alloc_callsite_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L270"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L271"
       }
     }
   },
@@ -80179,7 +80965,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_memory_process_hw_active_slot_alloc_callsite_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L270"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L271"
       }
     }
   },
@@ -80195,7 +80981,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_monitor_session_session",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4059"
       }
     }
   },
@@ -80211,7 +80997,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_mount_rp_active___include_file_system",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7964"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7965"
       }
     }
   },
@@ -80227,7 +81013,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_mount_switch_mode_rp_active___include_file_system",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7964"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L7965"
       }
     }
   },
@@ -80243,7 +81029,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_node_cluster-manager_switch_mode_B0_local",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4752"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4753"
       }
     }
   },
@@ -80259,7 +81045,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_node_cluster-manager_switch_mode_B0_node_node",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3532"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3533"
       }
     }
   },
@@ -80275,7 +81061,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_F0_error-object",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8277"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8278"
       }
     }
   },
@@ -80291,7 +81077,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_F0_pending-ack-update",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1639"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1640"
       }
     }
   },
@@ -80307,7 +81093,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_F0_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8059"
       }
     }
   },
@@ -80323,7 +81109,23 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_FP_active_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2756"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2757"
+      }
+    }
+  },
+  "show platform software object-manager f0 object {object} {object_identifier}": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPlatformSoftwareObjectManagerF0ObjectIdentifier",
+        "doc": "Parser for show platform software object-manager f0 object {object} {object_identifier}",
+        "module_name": "iosxe.show_platform_software",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'object_identifier': {\n        Any('*'): {\n            Optional('object_identifier'): int,\n            Optional('status'): str,\n            Optional('description'): str,\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_platform_software_object-manager_f0_object_object_object_identifier",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8669"
       }
     }
   },
@@ -80339,7 +81141,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_switch_switchstate_serviceprocessor_active_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2756"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L2757"
       }
     }
   },
@@ -80359,7 +81161,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_platform_software_object-manager_switch_switchvirtualstate_serviceprocessor_statistics",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1125"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L1129"
               },
               "c9600": {
                 "class": "ShowPlatformSoftwareObjectmanager",
@@ -80397,7 +81199,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_switch_switch_F0_object_object",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6078"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6079"
       }
     }
   },
@@ -80443,7 +81245,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_switch_switch_type_F0_error-object",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8277"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8278"
       }
     }
   },
@@ -80459,7 +81261,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_switch_switch_type_F0_pending-ack-update",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1639"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L1640"
       }
     }
   },
@@ -80475,7 +81277,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_object-manager_switch_switch_type_F0_statistics",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8058"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8059"
       }
     }
   },
@@ -80549,7 +81351,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_process_slot_switch_active_R0_monitor___inc_Mem_:_Swap:",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L70"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L71"
       }
     }
   },
@@ -80565,7 +81367,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_punt-policer",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3593"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3594"
       }
     }
   },
@@ -80673,7 +81475,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_status_control-processor_brief",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L160"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L161"
       }
     }
   },
@@ -80689,7 +81491,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_F0_cell-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3083"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3084"
       }
     }
   },
@@ -80705,7 +81507,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_F0_policy-summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3358"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3359"
       }
     }
   },
@@ -80721,7 +81523,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_F0_service-all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3289"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3290"
       }
     }
   },
@@ -80737,7 +81539,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_R0_permissions_ipv4_sgt_dgt",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3174"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3175"
       }
     }
   },
@@ -80753,7 +81555,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_r0_service-id_service_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3231"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3232"
       }
     }
   },
@@ -80769,7 +81571,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_F0_cell-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3083"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3084"
       }
     }
   },
@@ -80785,7 +81587,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_F0_policy-aom-info",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6013"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L6014"
       }
     }
   },
@@ -80801,7 +81603,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_F0_policy-summary",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3358"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3359"
       }
     }
   },
@@ -80817,7 +81619,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_F0_service-all",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3289"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3290"
       }
     }
   },
@@ -80833,7 +81635,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_R0_permissions_ipv4_sgt_dgt",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3174"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3175"
       }
     }
   },
@@ -80849,7 +81651,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_steering-policy_forwarding-manager_switch_switch_r0_service-id_service_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3231"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3232"
       }
     }
   },
@@ -80865,7 +81667,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_tdl-database_content_bp_config_mode",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4438"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L4439"
       }
     }
   },
@@ -80881,7 +81683,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_wired-client_switch_switch_state_r0",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3964"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3965"
       }
     }
   },
@@ -80897,7 +81699,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_wired-client_switch_switch_f0",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3900"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L3901"
       }
     }
   },
@@ -80913,7 +81715,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_wired-client_process_active",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5731"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L5732"
       }
     }
   },
@@ -80929,7 +81731,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_wired-client_state_r0_id_iif_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8365"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8366"
       }
     }
   },
@@ -80945,7 +81747,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_wired-client_switch_state_r0_id_iif_id",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8365"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L8366"
       }
     }
   },
@@ -80961,7 +81763,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_yang-management_process",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L420"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L421"
       }
     }
   },
@@ -80977,7 +81779,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_yang-management_process_monitor",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L474"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L475"
       }
     }
   },
@@ -80993,7 +81795,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_software_yang-management_process_state",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L540"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform_software.py#L541"
       }
     }
   },
@@ -81009,7 +81811,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_sudi_certificate",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5858"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5859"
       }
     }
   },
@@ -81025,7 +81827,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_sudi_certificate_sign_nonce_signature",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5858"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5859"
       }
     }
   },
@@ -81041,7 +81843,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_sudi_pki",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6099"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6100"
       }
     }
   },
@@ -81057,7 +81859,7 @@
           "os": "iosxe"
         },
         "uid": "show_platform_usb_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8328"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8329"
       }
     }
   },
@@ -81089,7 +81891,7 @@
           "os": "iosxe"
         },
         "uid": "show_pm_port_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4703"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4771"
       }
     }
   },
@@ -81105,7 +81907,7 @@
           "os": "iosxe"
         },
         "uid": "show_pm_vp_interface_interface_vlan",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4492"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_interface.py#L4560"
       }
     }
   },
@@ -81121,7 +81923,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2388"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2399"
       }
     }
   },
@@ -81148,12 +81950,12 @@
         "doc": " Super Parser for\n        * 'show policy-map control-plane | section {class_map}'\n    ",
         "module_name": "iosxe.show_policy_map",
         "package": "genie.libs.parser",
-        "schema": "{\n    'class_map': {\n        Any('*'): {\n            'match_evaluation': str,\n            'match': list,\n            Optional('packets'): int,\n            Optional('bytes'): int,\n            Optional('rate'): {\n                Optional('interval'): int,\n                Optional('offered_rate_bps'): int,\n                Optional('drop_rate_bps'): int,\n            },\n            Optional('qos_set'): {\n                Any('*'): {\n                    Any('*'): {\n                        Optional('packets_marked'): int,\n                        Optional('marker_statistics'): str,\n                    },\n                },\n            },\n            Optional('police'): {\n                Optional('cir_bps'): int,\n                Optional('cir_bc_bytes'): int,\n                Optional('cir_be_bytes'): int,\n                Optional('police_bps'): int,\n                Optional('police_limit'): int,\n                Optional('extended_limit'): int,\n                Optional('conformed'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n                Optional('exceeded'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n                Optional('violated'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n            },\n        },\n    },\n}",
+        "schema": "{\n    'class_map': {\n        Any('*'): {\n            'match_evaluation': str,\n            'match': list,\n            Optional('packets'): int,\n            Optional('bytes'): int,\n            Optional('rate'): {\n                Optional('interval'): int,\n                Optional('offered_rate_bps'): int,\n                Optional('drop_rate_bps'): int,\n            },\n            Optional('qos_set'): {\n                Any('*'): {\n                    Any('*'): {\n                        Optional('packets_marked'): int,\n                        Optional('marker_statistics'): str,\n                    },\n                },\n            },\n            Optional('police'): {\n                Optional('cir_bps'): int,\n                Optional('cir_bc_bytes'): int,\n                Optional('cir_be_bytes'): int,\n                Optional('police_bps'): int,\n                Optional('police_limit'): int,\n                Optional('extended_limit'): int,\n                Optional('rate_pps'): int,\n                Optional('burst_pkt'): int,\n                Optional('conformed'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n                Optional('exceeded'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n                Optional('violated'): {\n                    Optional('packets'): int,\n                    Optional('bytes'): int,\n                    Optional('bps'): int,\n                    Optional('actions'): {\n                        Any('*'): Or (<class 'bool'>, <class 'str'>),\n                    },\n                },\n            },\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_policy-map_control-plane___section_class_map",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2012"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2014"
       }
     }
   },
@@ -81325,7 +82127,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_type_control_subscriber_binding_policy_map_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2968"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2979"
       }
     }
   },
@@ -81397,7 +82199,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_type_queueing_interface_interface_output",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3385"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3396"
       }
     }
   },
@@ -81413,7 +82215,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_type_queueing_interface_interface_output_class_class_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3385"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3396"
       }
     }
   },
@@ -81429,7 +82231,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_type_queueing_policy_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3448"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3459"
       }
     }
   },
@@ -81445,7 +82247,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2388"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L2399"
       }
     }
   },
@@ -81461,7 +82263,7 @@
           "os": "iosxe"
         },
         "uid": "show_policy-map_policy_name_class_class_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3029"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_policy_map.py#L3040"
       }
     }
   },
@@ -81673,7 +82475,7 @@
           "os": "iosxe"
         },
         "uid": "show_power",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L817"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L829"
       }
     }
   },
@@ -81701,7 +82503,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L221"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L224"
       }
     }
   },
@@ -81717,7 +82519,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_consumption",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L686"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L698"
       }
     }
   },
@@ -81733,7 +82535,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_consumption_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L686"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L698"
       }
     }
   },
@@ -81749,7 +82551,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_meter",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1685"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1697"
       }
     }
   },
@@ -81765,7 +82567,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_meter_module_module",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1685"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1697"
       }
     }
   },
@@ -81781,7 +82583,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_module_moduleNum",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1624"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1636"
       }
     }
   },
@@ -81797,7 +82599,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_police",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1542"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1554"
       }
     }
   },
@@ -81813,7 +82615,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_police_module_moduleNum",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1542"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1554"
       }
     }
   },
@@ -81829,7 +82631,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_police_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1542"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1554"
       }
     }
   },
@@ -81845,7 +82647,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_priority",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L344"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L347"
       }
     }
   },
@@ -81861,7 +82663,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_priority_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L344"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L347"
       }
     }
   },
@@ -81877,7 +82679,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_upoe-plus",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L424"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L427"
       }
     }
   },
@@ -81893,7 +82695,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_upoe-plus_module_mod_num",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1059"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1071"
       }
     }
   },
@@ -81909,7 +82711,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_upoe-plus_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L424"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L427"
       }
     }
   },
@@ -81937,7 +82739,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L221"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L224"
       }
     }
   },
@@ -81953,7 +82755,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_inline_interface_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1191"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L1203"
       }
     }
   },
@@ -81969,7 +82771,7 @@
           "os": "iosxe"
         },
         "uid": "show_power_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L817"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L829"
       }
     }
   },
@@ -82137,7 +82939,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4545"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4546"
       },
       "iosxr": {
         "class": "ShowProcessesCpu",
@@ -82189,7 +82991,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_history",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4891"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4892"
       }
     }
   },
@@ -82217,7 +83019,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_platform",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4326"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4327"
       }
     }
   },
@@ -82233,7 +83035,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_platform_sorted",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7392"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7393"
       }
     }
   },
@@ -82261,7 +83063,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82289,7 +83091,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted_sort_time",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82317,7 +83119,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted_sort_time___exclude_exclude",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82345,7 +83147,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted_sort_time___include_key_word",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82373,7 +83175,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted___exclude_exclude",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82401,7 +83203,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_cpu_sorted___include_key_word",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4190"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4191"
       }
     }
   },
@@ -82445,7 +83247,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_memory",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5031"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5032"
       },
       "iosxr": {
         "class": "ShowProcessesMemory",
@@ -82528,12 +83330,12 @@
         "doc": null,
         "module_name": "iosxe.show_platform",
         "package": "genie.libs.parser",
-        "schema": "{\n    'processor_pool': {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    'reserve_p_pool': {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    'lsmi_io_pool': {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    'per_process_memory': {\n        Any('*'): {\n            'pid': int,\n            'tty': int,\n            'allocated': int,\n            'freed': int,\n            'holding': int,\n            'getbufs': int,\n            'retbufs': int,\n        },\n    },\n}",
+        "schema": "{\n    'processor_pool': {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    Optional('reserve_p_pool'): {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    'lsmi_io_pool': {\n        'total': int,\n        'used': int,\n        'free': int,\n    },\n    'per_process_memory': {\n        Any('*'): {\n            'pid': int,\n            'tty': int,\n            'allocated': int,\n            'freed': int,\n            'holding': int,\n            'getbufs': int,\n            'retbufs': int,\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_processes_memory_sorted",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5150"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5151"
       }
     }
   },
@@ -82561,7 +83363,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_memory___exclude_exclude",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5031"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5032"
       }
     }
   },
@@ -82589,7 +83391,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_memory___include_include",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5031"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5032"
       },
       "iosxr": {
         "class": "ShowProcessesMemory",
@@ -82641,7 +83443,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_memory___section_section",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5031"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L5032"
       }
     }
   },
@@ -82689,7 +83491,7 @@
           "os": "iosxe"
         },
         "uid": "show_processes_processid",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8456"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8457"
       }
     }
   },
@@ -82805,6 +83607,22 @@
       }
     }
   },
+  "show prp channel detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowPrpChannelDetails",
+        "doc": " Parser for show prp channel detail\n    ",
+        "module_name": "iosxe.show_prp",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'prp_channel': {\n        Any('*'): {\n            'layer_type': str,\n            'ports': str,\n            'maxports': str,\n            'port_state': str,\n            'protocol': str,\n            Any('*'): {\n                Optional('slot_port'): str,\n                Optional('port_state'): str,\n                Optional('protocol'): str,\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_prp_channel_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_prp.py#L35"
+      }
+    }
+  },
   "show ptp brief": {
     "folders": {
       "iosxe": {
@@ -83348,7 +84166,7 @@
                   "model": "c9500"
                 },
                 "uid": "show_redundancy",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L568"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L572"
               }
             },
             "tokens": {
@@ -83363,7 +84181,7 @@
           "os": "iosxe"
         },
         "uid": "show_redundancy",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1598"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1599"
       },
       "iosxr": {
         "class": "ShowRedundancy",
@@ -83447,7 +84265,7 @@
           "os": "iosxe"
         },
         "uid": "show_redundancy_config-sync_failures_mcl",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7469"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7470"
       }
     }
   },
@@ -83490,12 +84308,12 @@
         "doc": " Parser for show redundancy states ",
         "module_name": "iosxe.show_platform",
         "package": "genie.libs.parser",
-        "schema": "{\n    'my_state': str,\n    'peer_state': str,\n    'mode': str,\n    Optional('unit'): str,\n    'unit_id': int,\n    'redundancy_mode_operational': str,\n    'redundancy_mode_configured': str,\n    'redundancy_state': str,\n    Optional('maintenance_mode'): str,\n    'manual_swact': str,\n    Optional('manual_swact_reason'): str,\n    'communications': str,\n    Optional('communications_reason'): str,\n    'client_count': int,\n    'client_notification_tmr_msec': int,\n    'rf_debug_mask': str,\n}",
+        "schema": "{\n    'my_state': str,\n    'peer_state': str,\n    'mode': str,\n    Optional('unit'): str,\n    'unit_id': int,\n    'redundancy_mode_operational': str,\n    'redundancy_mode_configured': str,\n    'redundancy_state': str,\n    Optional('maintenance_mode'): str,\n    'manual_swact': str,\n    Optional('manual_swact_reason'): str,\n    'communications': str,\n    Optional('communications_reason'): str,\n    'client_count': int,\n    'client_notification_tmr_msec': int,\n    Optional('rf_debug_mask'): str,\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_redundancy_states",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1809"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L1810"
       }
     }
   },
@@ -83547,6 +84365,22 @@
       }
     }
   },
+  "show rep topology detail": {
+    "folders": {
+      "iosxe": {
+        "class": "ShowRepTopologyDetail",
+        "doc": "Parser for show rep topology detail",
+        "module_name": "iosxe.show_platform",
+        "package": "genie.libs.parser",
+        "schema": "{\n    'rep_segment_no': int,\n    'rep_segment': {\n        Any('*'): {\n            'interfaces': {\n                Any('*'): {\n                    'edge': str,\n                    'role': str,\n                    'vlan_status': str,\n                    'bridge_mac': str,\n                    'port_number': str,\n                    'port_priority': str,\n                    'neighbor_number': str,\n                },\n            },\n        },\n    },\n}",
+        "tokens": {
+          "os": "iosxe"
+        },
+        "uid": "show_rep_topology_detail",
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9449"
+      }
+    }
+  },
   "show rep topology segment {no}": {
     "folders": {
       "iosxe": {
@@ -83559,7 +84393,7 @@
           "os": "iosxe"
         },
         "uid": "show_rep_topology_segment_no",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6871"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6872"
       }
     }
   },
@@ -83591,7 +84425,7 @@
           "os": "iosxe"
         },
         "uid": "show_rib_client",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3414"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_routing.py#L3410"
       }
     }
   },
@@ -85423,7 +86257,7 @@
           "os": "nxos"
         },
         "uid": "show_running-config_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3140"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3144"
       }
     }
   },
@@ -85451,7 +86285,7 @@
           "os": "nxos"
         },
         "uid": "show_running-config_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3140"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3144"
       }
     }
   },
@@ -85515,7 +86349,7 @@
           "os": "nxos"
         },
         "uid": "show_running-config_nv_overlay",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1855"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_vxlan.py#L1864"
       }
     }
   },
@@ -85735,7 +86569,7 @@
           "os": "nxos"
         },
         "uid": "show_running-config___section_^interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3140"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L3144"
       }
     }
   },
@@ -85767,7 +86601,7 @@
           "os": "iosxe"
         },
         "uid": "show_running-config___section_l2vpn_evpn",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5555"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L5560"
       }
     }
   },
@@ -86661,7 +87495,7 @@
         "doc": " Parser for \"show sdwan omp summary\" ",
         "module_name": "iosxe.show_sdwan",
         "package": "genie.libs.parser",
-        "schema": "{\n    'admin_state': str,\n    'alert_received': int,\n    'alert_sent': int,\n    'handshake_received': int,\n    'handshake_sent': int,\n    'hello_received': int,\n    'hello_sent': int,\n    'inform_received': int,\n    'inform_sent': int,\n    'mcast_routes_received': int,\n    'mcast_routes_sent': int,\n    'omp_uptime': str,\n    'oper_state': str,\n    'personality': str,\n    'policy_received': int,\n    'policy_sent': int,\n    'routes_installed': int,\n    'routes_received': int,\n    'routes_sent': int,\n    'services_installed': int,\n    'services_received': int,\n    'services_sent': int,\n    'tlocs_installed': int,\n    'tlocs_received': int,\n    'tlocs_sent': int,\n    'total_packets_sent': int,\n    'update_received': int,\n    'update_sent': int,\n    'vsmart_peers': int,\n}",
+        "schema": "{\n    'admin_state': str,\n    'alert_received': int,\n    'alert_sent': int,\n    'handshake_received': int,\n    'handshake_sent': int,\n    'hello_received': int,\n    'hello_sent': int,\n    'inform_received': int,\n    'inform_sent': int,\n    'mcast_routes_received': int,\n    'mcast_routes_sent': int,\n    'omp_uptime': str,\n    'oper_state': str,\n    'personality': str,\n    'policy_received': int,\n    'policy_sent': int,\n    'routes_installed': int,\n    'routes_received': int,\n    'routes_sent': int,\n    Optional('routes_ipv6_installed'): int,\n    Optional('routes_ipv6_sent'): int,\n    Optional('routes_ipv6_received'): int,\n    'services_installed': int,\n    'services_received': int,\n    'services_sent': int,\n    Optional('services_installed_ipv6'): int,\n    Optional('services_sent_ipv6'): int,\n    Optional('services_received_ipv6'): int,\n    'tlocs_installed': int,\n    'tlocs_received': int,\n    'tlocs_sent': int,\n    Optional('l2_services_installed'): int,\n    Optional('l2_services_received'): int,\n    Optional('l2_services_sent'): int,\n    Optional('l2_routes_installed'): int,\n    Optional('l2_routes_received'): int,\n    Optional('l2_routes_sent'): int,\n    Optional('l2_statuses_installed'): int,\n    Optional('l2_statuses_received'): int,\n    Optional('l2_statuses_sent'): int,\n    Optional('transport_gateway'): str,\n    Optional('link_routes_received'): int,\n    Optional('link_routes_sent'): int,\n    Optional('cap_update_received'): int,\n    Optional('cap_update_sent'): int,\n    Optional('ribout_generation_paused'): str,\n    Optional('peers_down_in_gr'): int,\n    Optional('vedge_peers'): int,\n    Optional('ro_te_routes_sent'): int,\n    Optional('ro-te-routes-ipv6-sent'): int,\n    Optional('topology'): str,\n    'total_packets_sent': int,\n    'update_received': int,\n    'update_sent': int,\n    'vsmart_peers': int,\n}",
         "tokens": {
           "os": "iosxe"
         },
@@ -88721,12 +89555,12 @@
         },
         "module_name": "iosxe.show_spanning_tree",
         "package": "genie.libs.parser",
-        "schema": "{\n    'mode': str,\n    'root_bridge': str,\n    'extended_system_id': bool,\n    'portfast': bool,\n    'portfast_bpdu_guard': bool,\n    'portfast_bpdu_filter': bool,\n    'loopguard': bool,\n    'etherchannel_misconfig_guard': bool,\n    'uplinkfast': bool,\n    'backbonefast': bool,\n    'spannig_tree_name': {\n        Any('*'): {\n            'blocking': int,\n            'listening': int,\n            'learning': int,\n            'forwarding': int,\n            'stp_active': int,\n        },\n    },\n}",
+        "schema": "{\n    'mode': str,\n    'root_bridge': str,\n    'extended_system_id': bool,\n    'portfast': bool,\n    Optional('portfast_bpdu_guard'): bool,\n    Optional('portfast_bpdu_filter'): bool,\n    Optional('portfast_edge_bpdu_guard'): bool,\n    Optional('portfast_edge_bpdu_filter'): bool,\n    'loopguard': bool,\n    'etherchannel_misconfig_guard': bool,\n    'uplinkfast': bool,\n    'backbonefast': bool,\n    'spannig_tree_name': {\n        Any('*'): {\n            'blocking': int,\n            'listening': int,\n            'learning': int,\n            'forwarding': int,\n            'stp_active': int,\n        },\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_spanning-tree_summary_totals",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_spanning_tree.py#L1521"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_spanning_tree.py#L1523"
       }
     }
   },
@@ -88829,12 +89663,12 @@
         "doc": "Parser for \n        * show stack-power budgeting\n    ",
         "module_name": "iosxe.show_power",
         "package": "genie.libs.parser",
-        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('stack_ecomode'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('ecomode'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
+        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('Stack_total_input_power'): int,\n                Optional('stack_auto_off'): str,\n                Optional('power_supply_auto_off'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('auto_off'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_stack-power_budgeting",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L182"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L185"
       }
     }
   },
@@ -88845,12 +89679,12 @@
         "doc": "Parser for \n        * show stack-power detail\n    ",
         "module_name": "iosxe.show_power",
         "package": "genie.libs.parser",
-        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('stack_ecomode'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('ecomode'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
+        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('Stack_total_input_power'): int,\n                Optional('stack_auto_off'): str,\n                Optional('power_supply_auto_off'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('auto_off'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_stack-power_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L477"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L480"
       }
     }
   },
@@ -88877,7 +89711,7 @@
         "doc": "Parser for show stack-power",
         "module_name": "ios.show_power",
         "package": "genie.libs.parser",
-        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('stack_ecomode'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('ecomode'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
+        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('Stack_total_input_power'): int,\n                Optional('stack_auto_off'): str,\n                Optional('power_supply_auto_off'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('auto_off'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
         "tokens": {
           "os": "ios"
         },
@@ -88889,12 +89723,12 @@
         "doc": "Parser for \n        * show stack-power\n        * show stack-power budgeting\n    ",
         "module_name": "iosxe.show_power",
         "package": "genie.libs.parser",
-        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('stack_ecomode'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('ecomode'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
+        "schema": "{\n    'power_stack': {\n        Any('*'): {\n            'mode': str,\n            'topology': str,\n            'total_power': int,\n            'reserved_power': int,\n            'allocated_power': int,\n            Optional('unused_power'): int,\n            Optional('available_power'): int,\n            'switch_num': int,\n            'power_supply_num': int,\n            Optional('power_stack_detail'): {\n                'stack_mode': str,\n                'stack_topology': str,\n                Optional('Stack_total_input_power'): int,\n                Optional('stack_auto_off'): str,\n                Optional('power_supply_auto_off'): str,\n                'switch': {\n                    Any('*'): {\n                        'power_budget': int,\n                        'power_allocated': int,\n                        'low_port_priority_value': int,\n                        'high_port_priority_value': int,\n                        'switch_priority_value': int,\n                        'port_1_status': str,\n                        'port_2_status': str,\n                        'neighbor_on_port_1': str,\n                        'neighbor_on_port_2': str,\n                        Optional('auto_off'): str,\n                        Optional('capacity'): str,\n                    },\n                },\n            },\n            Optional('switches'): {\n                Any('*'): {\n                    'power_supply_a': Or (<class 'int'>, <class 'float'>),\n                    'power_supply_b': Or (<class 'int'>, <class 'float'>),\n                    'power_budget': Or (<class 'int'>, <class 'float'>),\n                    'allocated_power': Or (<class 'int'>, <class 'float'>),\n                    'available_power': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n                    'consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n                },\n            },\n        },\n    },\n    Optional('totals'): {\n        'total_allocated_power': Or (<class 'int'>, <class 'float'>),\n        'total_available_power': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_sys': Or (<class 'int'>, <class 'float'>),\n        'total_consumed_power_poe': Or (<class 'int'>, <class 'float'>),\n    },\n}",
         "tokens": {
           "os": "iosxe"
         },
         "uid": "show_stack-power,_show_stack-power_budgeting",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L91"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_power.py#L94"
       }
     }
   },
@@ -89186,7 +90020,7 @@
           "os": "iosxe"
         },
         "uid": "show_storm-control",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3437"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3442"
       }
     }
   },
@@ -89202,7 +90036,7 @@
           "os": "iosxe"
         },
         "uid": "show_storm-control_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3437"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L3442"
       }
     }
   },
@@ -89278,7 +90112,7 @@
           "os": "iosxe"
         },
         "uid": "show_switch",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3318"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3319"
       }
     }
   },
@@ -89306,7 +90140,7 @@
           "os": "iosxe"
         },
         "uid": "show_switch_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3180"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L3181"
       }
     }
   },
@@ -89370,7 +90204,7 @@
           "os": "iosxe"
         },
         "uid": "show_switch_stack-ports_detail",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8766"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8767"
       }
     }
   },
@@ -89393,6 +90227,18 @@
                 },
                 "uid": "show_switch_stack-ports_summary",
                 "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9300/show_switch_stack_ports_summary.py#L32"
+              },
+              "c9350": {
+                "class": "ShowSwitchStackPortSummary",
+                "doc": "\n    Parser for:\n        * show switch stack-port summary\n    ",
+                "module_name": "iosxe.cat9k.c9350.show_switch",
+                "package": "genie.libs.parser",
+                "schema": "{\n    'stackports': {\n        Any('*'): {\n            'port_status': str,\n            'neighbor': str,\n            'cable_length': str,\n            'link_ok': str,\n            'link_active': str,\n            'sync_ok': str,\n            'link_changes_count': int,\n            'in_loopback': str,\n        },\n    },\n}",
+                "tokens": {
+                  "model": "c9350"
+                },
+                "uid": "show_switch_stack-ports_summary",
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9350/show_switch.py#L31"
               }
             },
             "tokens": {
@@ -89423,7 +90269,7 @@
           "os": "iosxe"
         },
         "uid": "show_switch_stack-ring_speed",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8280"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8281"
       }
     }
   },
@@ -89762,7 +90608,7 @@
           "os": "iosxe"
         },
         "uid": "show_system_mtu",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7361"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L7362"
       }
     }
   },
@@ -90918,7 +91764,7 @@
           "os": "iosxe"
         },
         "uid": "show_time-range_time_range_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9161"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9162"
       }
     }
   },
@@ -91526,12 +92372,12 @@
                 "doc": "Parser for show version",
                 "module_name": "iosxe.cat9k.c9500.show_platform",
                 "package": "genie.libs.parser",
-                "schema": "{\n    'version': {\n        Optional('xe_version'): str,\n        'version_short': str,\n        'os': str,\n        Optional('code_name'): str,\n        'platform': str,\n        'version': str,\n        Optional('label'): str,\n        Optional('build_label'): str,\n        'image_id': str,\n        'rom': str,\n        'bootldr_version': str,\n        'hostname': str,\n        'uptime': str,\n        'uptime_this_cp': str,\n        'returned_to_rom_by': str,\n        'system_image': str,\n        'last_reload_reason': str,\n        'chassis': str,\n        'processor_type': str,\n        'main_mem': str,\n        'processor_board_id': str,\n        Optional('curr_config_register'): str,\n        Optional('revision'): str,\n        'compiled_date': str,\n        'compiled_by': str,\n        'mac_address': str,\n        'mb_assembly_num': str,\n        'mb_sn': str,\n        'model_rev_num': str,\n        'mb_rev_num': str,\n        'model_num': str,\n        Optional('system_sn'): str,\n        Optional('mem_size'): {\n            Any('*'): str,\n        },\n        Optional('license_level'): str,\n        Optional('next_reload_license_level'): str,\n        Optional('defect_id'): {\n            Any('*'): {\n                Optional('type'): str,\n                Optional('sum_version'): str,\n                Optional('state'): str,\n                Optional('file_name'): str,\n            },\n        },\n        'smart_licensing_status': str,\n        Optional('number_of_intfs'): {\n            Any('*'): str,\n        },\n        Optional('disks'): {\n            Any('*'): {\n                'disk_size': str,\n            },\n        },\n    },\n}",
+                "schema": "{\n    'version': {\n        Optional('xe_version'): str,\n        'version_short': str,\n        'os': str,\n        Optional('code_name'): str,\n        'platform': str,\n        'version': str,\n        Optional('label'): str,\n        Optional('build_label'): str,\n        'image_id': str,\n        'rom': str,\n        'bootldr_version': str,\n        'bootldr': str,\n        'hostname': str,\n        'uptime': str,\n        'uptime_this_cp': str,\n        'returned_to_rom_by': str,\n        'system_image': str,\n        'last_reload_reason': str,\n        'chassis': str,\n        'processor_type': str,\n        'main_mem': str,\n        'processor_board_id': str,\n        Optional('curr_config_register'): str,\n        Optional('revision'): str,\n        'compiled_date': str,\n        'compiled_by': str,\n        'mac_address': str,\n        'mb_assembly_num': str,\n        'mb_sn': str,\n        'model_rev_num': str,\n        'mb_rev_num': str,\n        'model_num': str,\n        Optional('system_sn'): str,\n        Optional('mem_size'): {\n            Any('*'): str,\n        },\n        Optional('license_level'): str,\n        Optional('next_reload_license_level'): str,\n        Optional('defect_id'): {\n            Any('*'): {\n                Optional('type'): str,\n                Optional('sum_version'): str,\n                Optional('state'): str,\n                Optional('file_name'): str,\n            },\n        },\n        'smart_licensing_status': str,\n        Optional('number_of_intfs'): {\n            Any('*'): str,\n        },\n        Optional('disks'): {\n            Any('*'): {\n                'disk_size': str,\n            },\n        },\n    },\n}",
                 "tokens": {
                   "model": "c9500"
                 },
                 "uid": "show_version",
-                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L105"
+                "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py#L108"
               }
             },
             "tokens": {
@@ -91546,7 +92392,7 @@
           "os": "iosxe"
         },
         "uid": "show_version",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L346"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L347"
       },
       "iosxr": {
         "class": "ShowVersion",
@@ -91651,7 +92497,7 @@
           "os": "iosxe"
         },
         "uid": "show_version_RP_rp_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4597"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L4598"
       }
     }
   },
@@ -91731,7 +92577,7 @@
           "os": "iosxe"
         },
         "uid": "show_version_running",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6546"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L6547"
       }
     }
   },
@@ -91779,7 +92625,7 @@
           "os": "iosxe"
         },
         "uid": "show_vfi_name_name",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1453"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_l2vpn.py#L1458"
       }
     }
   },
@@ -92579,7 +93425,7 @@
           "os": "nxos"
         },
         "uid": "show_vrf_all_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1912"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1916"
       }
     }
   },
@@ -92595,7 +93441,7 @@
           "os": "nxos"
         },
         "uid": "show_vrf_all_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1912"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1916"
       }
     }
   },
@@ -92767,7 +93613,7 @@
           "os": "nxos"
         },
         "uid": "show_vrf_vrf_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1912"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1916"
       }
     }
   },
@@ -92783,7 +93629,7 @@
           "os": "nxos"
         },
         "uid": "show_vrf_vrf_interface_interface",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1912"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/nxos/show_interface.py#L1916"
       }
     }
   },
@@ -93624,7 +94470,7 @@
           "os": "iosxe"
         },
         "uid": "show_xfsu_eligibility",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8631"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8632"
       }
     }
   },
@@ -93640,7 +94486,7 @@
           "os": "iosxe"
         },
         "uid": "show_xfsu_status",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8929"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L8930"
       }
     }
   },
@@ -93876,7 +94722,7 @@
           "os": "iosxe"
         },
         "uid": "show_filesystem_filesys",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9011"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9012"
       }
     }
   },
@@ -94034,7 +94880,7 @@
           "os": "iosxe"
         },
         "uid": "test_platform_software_database_get-n_all_ios_oper/component",
-        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9303"
+        "url": "https://github.com/CiscoTestAutomation/genieparser/tree/master/src/genie/libs/parser/iosxe/show_platform.py#L9304"
       }
     }
   },
diff --git a/src/genie/libs/parser/__init__.py b/src/genie/libs/parser/__init__.py
index acafc31209..2cfda15954 100644
--- a/src/genie/libs/parser/__init__.py
+++ b/src/genie/libs/parser/__init__.py
@@ -8,7 +8,7 @@
 '''
 
 # metadata
-__version__ = '24.8'
+__version__ = '24.9'
 __author__ = 'Cisco Systems Inc.'
 __contact__ = ['pyats-support@cisco.com', 'pyats-support-ext@cisco.com']
 __copyright__ = 'Copyright (c) 2018, Cisco Systems Inc.'
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py b/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py
index 88a148e5dc..7782181ad7 100755
--- a/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/show_platform.py
@@ -167,7 +167,7 @@ class ShowPlatformHardwareFedQosSchedulerSdkInterfaceSchema(MetaParser):
                         Any(): {
                             'cep_ir': {
                                 Any(): {
-                                    'rate': int,
+                                    'rate': Or(int, str),
                                     'burst': str,
                                     'weight': int,
                                     'hw_id': int,
@@ -272,7 +272,8 @@ def cli(self, mode, interface, switch=None, output=None):
 
         # | 772    | CIR      | 2000000000    | DEFLT | 0      | 55     | PARENT       | 0          | CSTSE     | 763     |        |
         # |        | PIR      | 2000000000    | DEFLT | 255    | 67     | PARENT       | 12         | CSTSE     | 1360    |        |
-        p6_1 = re.compile(r'^(?P<oid>\d+)?\s*\|*\s*(?P<cep_ir>(CIR|EIR|PIR))\s*\|\s*(?P<rate>\d+)\s*\|\s*(?P<burst>\w+)\s*\|'
+        # | 1026   | CIR      | UNLIMITED     | DEFLT | 255    | 8555   | PARENT       | 0          | OQHSE     | 2653    |        |
+        p6_1 = re.compile(r'^(?P<oid>\d+)?\s*\|*\s*(?P<cep_ir>(CIR|EIR|PIR))\s*\|\s*(?P<rate>\w+)\s*\|\s*(?P<burst>\w+)\s*\|'
                           r'\s*(?P<weight>\d+)\s*\|\s*(?P<hw_id>\d+)\s*\|\s*(?P<type>\w+)\s*\|\s*(?P<link_point>\d+)\s*\|'
                           r'\s*(?P<hse_type>\w+)\s*\|\s*(?P<hse_oid>\d+)(\s*\|\s+(?P<voq_id>\d+)\s*\|\s*(?P<in_device>\d+)\|\s*(?P<in_slice>\d+))?$')
 
@@ -461,7 +462,10 @@ def cli(self, mode, interface, switch=None, output=None):
                 if group_dict['oid']:
                     oqhse_sch_dict = svcse_scheduler_dict.setdefault('oid', {}).setdefault(group_dict['oid'], {})
                 cep_ir_dict = oqhse_sch_dict.setdefault('cep_ir', {}).setdefault(group_dict['cep_ir'], {})
-                cep_ir_dict['rate'] = int(group_dict['rate'])
+                try:
+                    cep_ir_dict['rate'] = int(group_dict['rate'])
+                except ValueError:
+                    cep_ir_dict['rate'] = group_dict['rate']
                 cep_ir_dict['burst'] = group_dict['burst']
                 cep_ir_dict['type'] = group_dict['type']
                 cep_ir_dict['weight'] = int(group_dict['weight'])
@@ -811,17 +815,26 @@ class ShowPlatformSoftwareFedActiveAclInfoDbDetail(ShowPlatformSoftwareFedActive
     '''Parser for:
         * 'show platform software fed switch active acl info db detail'
     '''
-    cli_command = 'show platform software fed switch active acl info db detail'
+    cli_command = ['show platform software fed switch active acl info db detail', 
+                   'show platform software fed {switch} {mode} acl info db detail', 
+                   'show platform software fed {mode} acl info db detail']
 
-    def cli(self, output=None):
+    def cli(self, switch=None, mode=None, output=None):
         if not output:
-            output = self.device.execute(self.cli_command)
+            if switch and mode:
+                cmd = self.cli_command[1].format(switch=switch, mode=mode)
+            elif mode:
+                cmd = self.cli_command[2].format(mode=mode)
+            else:
+                cmd = self.cli_command[0]
+            output = self.device.execute(cmd)
 
         proto_flag = False
         tos_flag = False
 
         # [CG ID: 8]    CG Name: racl_ingress
-        p1 = re.compile(r'^\[CG ID:\s+(?P<cg_id>\d+)\]\s+CG\s+Name:\s+(?P<cg_name>[\w\-]+)$')
+        # [Racl, CG ID: 8]    CG Name: racl_permitv6_egress
+        p1 = re.compile(r'^\[.*CG ID:\s+(?P<cg_id>\d+)\]\s+CG\s+Name:\s+(?P<cg_name>[\w\-]+)$')
 
         # [Feature: Racl    Prot: IPv4
         p2 = re.compile(r'^Feature:\s+(?P<feature>\w+)\s+Prot:\s+(?P<prot>\w+)$')
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/show_switch.py b/src/genie/libs/parser/iosxe/cat9k/c9350/show_switch.py
new file mode 100644
index 0000000000..bd6908ee4c
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/show_switch.py
@@ -0,0 +1,84 @@
+'''
+IOSXE C9350 parsers for the following show commands: 
+show_switch.py
+'''
+import re
+
+from genie.metaparser import MetaParser
+from genie.metaparser.util.schemaengine import Any
+
+# import parser utils
+from genie.libs.parser.utils.common import Common
+
+class ShowSwitchStackPortSummarySchema(MetaParser):
+    """Schema for ShowSwitchStackPortSummary"""
+
+    schema = {
+        'stackports': {
+            Any(): {
+                'port_status': str,
+                'neighbor': str,
+                'cable_length': str,
+                'link_ok': str,
+                'link_active': str,
+                'sync_ok': str,
+                'link_changes_count': int,
+                'in_loopback': str,
+            }
+        }
+    }
+
+class ShowSwitchStackPortSummary(ShowSwitchStackPortSummarySchema):
+    """
+    Parser for:
+        * show switch stack-port summary
+    """
+
+    cli_command = ['show switch stack-ports summary']
+    
+    def cli(self, output=None):
+        if not output:
+            # get output from device
+            output = self.device.execute(self.cli_command[0])
+
+        # initial return dictionary
+        ret_dict = {}
+
+        # initial regexp pattern
+        # 1/1        OK           2/2         50cm           Yes       Yes           Yes       1                   No
+        
+        p1 = re.compile(r"^(?P<stackport_id>\S+)"
+                        " +(?P<port_status>\w+)"
+                        " +(?P<neighbor>\S+)"
+                        " +(?P<cable_length>\w+)"
+                        " +(?P<link_ok>\w+)"
+                        " +(?P<link_active>\w+)"
+                        " +(?P<sync_ok>\w+)"
+                        " +(?P<link_changes_count>\d+)"
+                        " +(?P<in_loopback>\w+)$")
+        
+        for line in output.splitlines():
+           line = line.strip()
+ 
+           # Sw#/Port#  Port Status  Neighbor  Cable Length   Link OK   Link Active   Sync OK   #Changes to LinkOK  In Loopback
+           # -------------------------------------------------------------------------------------------------------------------
+           # 1/1        OK           2/2            50cm           Yes       Yes           Yes       1                   No
+           # 1/2        OK           3/1            50cm           Yes       Yes           Yes       1                   No
+           # 2/1        OK           3/2            50cm           Yes       Yes           Yes       1                   No
+           # 2/2        OK           1/1            50cm           Yes       Yes           Yes       1                   No
+           # 3/1        OK           1/2            50cm           Yes       Yes           Yes       1                   No
+           # 3/2        OK           2/1            50cm           Yes       Yes           Yes       1                   No
+           m = p1.match(line)
+           if m:
+                group = m.groupdict()
+                stackport_dict = ret_dict.setdefault('stackports', {}).setdefault(group['stackport_id'], {})
+                stackport_dict['port_status'] = group['port_status']
+                stackport_dict['neighbor'] = group['neighbor']
+                stackport_dict['cable_length'] = group['cable_length']
+                stackport_dict['link_ok'] = group['link_ok']
+                stackport_dict['link_active'] = group['link_active']
+                stackport_dict['sync_ok'] = group['sync_ok']
+                stackport_dict['link_changes_count'] = int(group['link_changes_count'])
+                stackport_dict['in_loopback'] = group['in_loopback']              
+                continue 
+        return ret_dict
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_arguments.json
new file mode 100644
index 0000000000..2fd58a9e33
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_arguments.json
@@ -0,0 +1,5 @@
+{
+    "switch": "switch",
+    "mode": "3",
+    "interface": "FiftyGigE3/1/1"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_expected.py
new file mode 100644
index 0000000000..105f82a0ec
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_expected.py
@@ -0,0 +1,754 @@
+expected_output = {
+    'interface': {
+        'FiftyGigE3/1/1': {
+            'cstse_scheduler': {
+            },
+            'interface_id': '0x4DA',
+            'interface_scheduler': {
+                'oid': {
+                    '2647': {
+                        'ct_r': {
+                            'C-R': {
+                                'cir': 11000000512,
+                                'eir_pir': 11000000512,
+                                'hw_id': 2647,
+                                'is_eir': 'PIR',
+                                'wfq_weights': 'C(1   ) E(1   )',
+                            },
+                            'T-R': {
+                                'cir': 11000000512,
+                                'eir_pir': 11000000512,
+                                'hw_id': 2647,
+                                'is_eir': 'PIR',
+                                'wfq_weights': 'C(1   ) E(1   )',
+                            },
+                        },
+                    },
+                },
+            },
+            'logical_port': 'Disabled',
+            'oqhse_scheduler': {
+                'oid': {
+                    '2653': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 100,
+                                'link_point': 'OQPG-1',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 100,
+                                'link_point': 'OQPG-0',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                        },
+                        'child_group': {
+                            0: {
+                                'branch': 'Left',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1026,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 0,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1026,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 2,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 0,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 2,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                            1: {
+                                'branch': 'Right',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1025,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 4,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1025,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 6,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 4,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 6,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                        },
+                        'mode': '2-I',
+                    },
+                    '2654': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 101,
+                                'link_point': 'OQPG-3',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 101,
+                                'link_point': 'OQPG-2',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                        },
+                        'child_group': {
+                            0: {
+                                'branch': 'Left',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1321,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 0,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1321,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 2,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 0,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 2,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                            1: {
+                                'branch': 'Right',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1027,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 4,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1027,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 6,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 4,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 6,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                        },
+                        'mode': '2-I',
+                    },
+                    '2655': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 102,
+                                'link_point': 'OQPG-5',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 102,
+                                'link_point': 'OQPG-4',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                        },
+                        'child_group': {
+                            0: {
+                                'branch': 'Left',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1334,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 0,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1334,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 2,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 0,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 2,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                            1: {
+                                'branch': 'Right',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1333,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 4,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1333,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 6,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 4,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 6,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                        },
+                        'mode': '2-I',
+                    },
+                    '2656': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 103,
+                                'link_point': 'OQPG-7',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 0,
+                                'hse_type': 'Sys-P SCH',
+                                'hw_id': 103,
+                                'link_point': 'OQPG-6',
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 63,
+                            },
+                        },
+                        'child_group': {
+                            0: {
+                                'branch': 'Left',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1336,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 0,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1336,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 2,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 0,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 2,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                            1: {
+                                'branch': 'Right',
+                                'child': {
+                                    0: {
+                                        'hse_oid': 1335,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'SP-Link': {
+                                                'link_point': 4,
+                                            },
+                                        },
+                                    },
+                                    1: {
+                                        'hse_oid': 1335,
+                                        'hse_type': 'SVCSE',
+                                        'link': {
+                                            'RR/WFQ-Link': {
+                                                'link_point': 6,
+                                            },
+                                        },
+                                    },
+                                },
+                                'load_balance_type': {
+                                    'SP': {
+                                        'c': 2,
+                                        's': 4,
+                                    },
+                                    'WFQ': {
+                                        'c': 2,
+                                        's': 6,
+                                    },
+                                },
+                                'weights': [0, 0, 255, 255, 0, 0, 0, 0],
+                            },
+                        },
+                        'mode': '2-I',
+                    },
+                },
+            },
+            'priority_propagation': 'Disabled',
+            'sub_interface_q_mode': 'Disabled - No Priority Propagation',
+            'svcse_scheduler': {
+                'oid': {
+                    '1025': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2653,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8554,
+                                'link_point': 4,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2653,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8554,
+                                'link_point': 6,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '720': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 720,
+                                },
+                            },
+                        },
+                    },
+                    '1026': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2653,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8555,
+                                'link_point': 0,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2653,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8555,
+                                'link_point': 2,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '721': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 721,
+                                },
+                            },
+                        },
+                    },
+                    '1027': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2654,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8556,
+                                'link_point': 4,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2654,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8556,
+                                'link_point': 6,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '722': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 722,
+                                },
+                            },
+                        },
+                    },
+                    '1321': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2654,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8557,
+                                'link_point': 0,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2654,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8557,
+                                'link_point': 2,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '723': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 723,
+                                },
+                            },
+                        },
+                    },
+                    '1333': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2655,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8558,
+                                'link_point': 4,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2655,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8558,
+                                'link_point': 6,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '724': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 724,
+                                },
+                            },
+                        },
+                    },
+                    '1334': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2655,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8559,
+                                'link_point': 0,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2655,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8559,
+                                'link_point': 2,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '725': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 725,
+                                },
+                            },
+                        },
+                    },
+                    '1335': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2656,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8560,
+                                'link_point': 4,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2656,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8560,
+                                'link_point': 6,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '726': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 726,
+                                },
+                            },
+                        },
+                    },
+                    '1336': {
+                        'cep_ir': {
+                            'CIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2656,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8561,
+                                'link_point': 0,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                            'PIR': {
+                                'burst': 'DEFLT',
+                                'hse_oid': 2656,
+                                'hse_type': 'OQHSE',
+                                'hw_id': 8561,
+                                'link_point': 2,
+                                'rate': 'UNLIMITED',
+                                'type': 'PARENT',
+                                'weight': 255,
+                            },
+                        },
+                        'child': {
+                            'hse_oid': {
+                                '727': {
+                                    'hse_type': 'VSC',
+                                    'in_device': 0,
+                                    'in_slice': 0,
+                                    'voq_id': 727,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+            'system_port_scheduler': {
+                'oid': {
+                    '2652': {
+                        'c_pb': {
+                            'M-B/W': {
+                                'act_wfq': 63,
+                                'burst': 0,
+                                'child_oid': {
+                                    '2653': {
+                                        'child_type': 'OQHSE',
+                                    },
+                                    '2654': {
+                                        'child_type': 'OQHSE',
+                                    },
+                                    '2655': {
+                                        'child_type': 'OQHSE',
+                                    },
+                                    '2656': {
+                                        'child_type': 'OQHSE',
+                                    },
+                                },
+                                'cir': 122070,
+                                'eir_wfq': 1,
+                                'pg_type': 'OQPG-0',
+                                'tx_burst': 0,
+                                'tx_cir': 122070,
+                            },
+                        },
+                    },
+                },
+            },
+            'tc_profile': {
+                'sdk_oid': 77,
+                'tc': {
+                    'tc0': {
+                        'voq_offset': 0,
+                    },
+                    'tc1': {
+                        'voq_offset': 1,
+                    },
+                    'tc2': {
+                        'voq_offset': 2,
+                    },
+                    'tc3': {
+                        'voq_offset': 3,
+                    },
+                    'tc4': {
+                        'voq_offset': 4,
+                    },
+                    'tc5': {
+                        'voq_offset': 5,
+                    },
+                    'tc6': {
+                        'voq_offset': 6,
+                    },
+                    'tc7': {
+                        'voq_offset': 7,
+                    },
+                },
+            },
+        },
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_output.txt
new file mode 100644
index 0000000000..38df06c7ca
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformHardwareFedQosSchedulerSdkInterface/cli/equal/golden_output_3_output.txt
@@ -0,0 +1,165 @@
+==========================================================================================================================================================
+|                                                             Scheduler Configuration                                                                    |
+==========================================================================================================================================================
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ Interface              : FiftyGigE3/1/1 (0x4DA)
+| Priority Propagation  : Disabled                                                       |
+| Sub-interface Q Mode  : Disabled - No Priority Propagation                             |
+| Logical Port          : Disabled                                                       |
+| TC Profile            : SDK OID    :    77
+|                       : TC         : TC0 | TC1 | TC2 | TC3 | TC4 | TC5 | TC6 | TC7     |
+|                       : VOQ Offset :   0 |   1 |   2 |   3 |   4 |   5 |   6 |   7
+|----------------------------------------------------------------------------------------|
+
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+|------------------------------------------------------------------------------------|
+|                        Interface Scheduler Configuration                           |
+|------------------------------------------------------------------------------------|
+| OID    | C/T-R | CIR           | EIR/PIR       | IS_EIR | WFQ  Weights    | H/W Id |
+|------------------------------------------------------------------------------------|
+| 2647   | C-R   | 11000000512   | 11000000512   | PIR    | C(1   ) E(1   ) | 2647   |
+| 2647   | T-R   | 11000000512   | 11000000512   | PIR    | C(1   ) E(1   ) | 2647   |
+|------------------------------------------------------------------------------------|
+|--------------------------------------------------------------------------------------------------------------------------|
+|                                        System Port - Scheduler Configuration                                             |
+|--------------------------------------------------------------------------------------------------------------------------|
+| OID    | C-P/B | CIR           | Burst | TX-CIR        | TX-Burst | EIR WFQ | ACT WFQ | PG Type | Child Type | Child OID |
+|--------------------------------------------------------------------------------------------------------------------------|
+| 2652   | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-0  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2653      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-1  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2653      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-2  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2654      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-3  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2654      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-4  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2655      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-5  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2655      |
+|        | M-B/W | 122070        | 0     | 122070        | 0        | 1       | 63      | OQPG-6  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2656      |
+|        | P-CIR | UNLIMITED     | DEFLT | UNLIMITED     | DEFLT    | 1       | 63      | OQPG-7  |            |           |
+|        |       |               |       |               |          |         |         |         | OQHSE      | 2656      |
+|        |       |               |       |               |          |         |         |         |            |           |
+|--------------------------------------------------------------------------------------------------------------------------|
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                                                           OQHSE - Scheduler Configuration                                                              |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| OID    | MODE | C/E/P-IR | Rate          | Burst | Weight | H/W Id | Parent/Child | Branch [L/R-SP(S:C) WFQ(S:C)]   | Link point | HSE Type  | HSE OID |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2653   | 2-I  | CIR      | UNLIMITED     | DEFLT | 63     | 100    | PARENT       |                                 | OQPG-1     | Sys-P SCH | 0       |
+|        |      | PIR      | UNLIMITED     | DEFLT | 63     | 100    | PARENT       |                                 | OQPG-0     | Sys-P SCH | 0       |
+|        |      |          |               |       |        |        |              | Left   [SP( 0: 2) WFQ( 2: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 0          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1026    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 2          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1026    |
+|        |      |          |               |       |        |        |              | Right  [SP( 4: 2) WFQ( 6: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 4          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1025    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 6          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1025    |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| OID    | MODE | C/E/P-IR | Rate          | Burst | Weight | H/W Id | Parent/Child | Branch [L/R-SP(S:C) WFQ(S:C)]   | Link point | HSE Type  | HSE OID |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2654   | 2-I  | CIR      | UNLIMITED     | DEFLT | 63     | 101    | PARENT       |                                 | OQPG-3     | Sys-P SCH | 0       |
+|        |      | PIR      | UNLIMITED     | DEFLT | 63     | 101    | PARENT       |                                 | OQPG-2     | Sys-P SCH | 0       |
+|        |      |          |               |       |        |        |              | Left   [SP( 0: 2) WFQ( 2: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 0          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1321    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 2          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1321    |
+|        |      |          |               |       |        |        |              | Right  [SP( 4: 2) WFQ( 6: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 4          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1027    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 6          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1027    |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| OID    | MODE | C/E/P-IR | Rate          | Burst | Weight | H/W Id | Parent/Child | Branch [L/R-SP(S:C) WFQ(S:C)]   | Link point | HSE Type  | HSE OID |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2655   | 2-I  | CIR      | UNLIMITED     | DEFLT | 63     | 102    | PARENT       |                                 | OQPG-5     | Sys-P SCH | 0       |
+|        |      | PIR      | UNLIMITED     | DEFLT | 63     | 102    | PARENT       |                                 | OQPG-4     | Sys-P SCH | 0       |
+|        |      |          |               |       |        |        |              | Left   [SP( 0: 2) WFQ( 2: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 0          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1334    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 2          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1334    |
+|        |      |          |               |       |        |        |              | Right  [SP( 4: 2) WFQ( 6: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 4          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1333    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 6          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1333    |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| OID    | MODE | C/E/P-IR | Rate          | Burst | Weight | H/W Id | Parent/Child | Branch [L/R-SP(S:C) WFQ(S:C)]   | Link point | HSE Type  | HSE OID |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+| 2656   | 2-I  | CIR      | UNLIMITED     | DEFLT | 63     | 103    | PARENT       |                                 | OQPG-7     | Sys-P SCH | 0       |
+|        |      | PIR      | UNLIMITED     | DEFLT | 63     | 103    | PARENT       |                                 | OQPG-6     | Sys-P SCH | 0       |
+|        |      |          |               |       |        |        |              | Left   [SP( 0: 2) WFQ( 2: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 0          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1336    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 2          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1336    |
+|        |      |          |               |       |        |        |              | Right  [SP( 4: 2) WFQ( 6: 2)]   |            |           |         |
+|        |      |          |               |       |        |        |              :   0   0 255 255   0   0   0   0
+|        |      |          |               |       |        |        |              |                         SP-Link | 4          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1335    |
+|        |      |          |               |       |        |        |              |                     RR/WFQ-Link | 6          |           |         |
+|        |      |          |               |       |        |        | CHILD        |                                 |            | SVCSE     | 1335    |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+|                                                           CSTSE - Scheduler Configuration                                                              |
+|--------------------------------------------------------------------------------------------------------------------------------------------------------|
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+|                                                           SVCSE - Scheduler Configuration                                                     |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| OID    | C/E/P-IR | Rate          | Burst | Weight | H/W Id | Parent/VSC   | Link point | HSE Type  | HSE OID | VOQ ID | In-Device | In-Slice |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1026   | CIR      | UNLIMITED     | DEFLT | 255    | 8555   | PARENT       | 0          | OQHSE     | 2653    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8555   | PARENT       | 2          | OQHSE     | 2653    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 721     | 721    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1025   | CIR      | UNLIMITED     | DEFLT | 255    | 8554   | PARENT       | 4          | OQHSE     | 2653    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8554   | PARENT       | 6          | OQHSE     | 2653    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 720     | 720    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1027   | CIR      | UNLIMITED     | DEFLT | 255    | 8556   | PARENT       | 4          | OQHSE     | 2654    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8556   | PARENT       | 6          | OQHSE     | 2654    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 722     | 722    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1321   | CIR      | UNLIMITED     | DEFLT | 255    | 8557   | PARENT       | 0          | OQHSE     | 2654    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8557   | PARENT       | 2          | OQHSE     | 2654    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 723     | 723    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1334   | CIR      | UNLIMITED     | DEFLT | 255    | 8559   | PARENT       | 0          | OQHSE     | 2655    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8559   | PARENT       | 2          | OQHSE     | 2655    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 725     | 725    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1333   | CIR      | UNLIMITED     | DEFLT | 255    | 8558   | PARENT       | 4          | OQHSE     | 2655    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8558   | PARENT       | 6          | OQHSE     | 2655    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 724     | 724    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1336   | CIR      | UNLIMITED     | DEFLT | 255    | 8561   | PARENT       | 0          | OQHSE     | 2656    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8561   | PARENT       | 2          | OQHSE     | 2656    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 727     | 727    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+| 1335   | CIR      | UNLIMITED     | DEFLT | 255    | 8560   | PARENT       | 4          | OQHSE     | 2656    |        |           |          |
+|        | PIR      | UNLIMITED     | DEFLT | 255    | 8560   | PARENT       | 6          | OQHSE     | 2656    |        |           |          |
+|        |          |               |       |        |        |              |            |           |         |        |           |          |
+|        |          |               |       |        |        | CHILD        |            | VSC       | 726     | 726    | 0         | 0        |
+|-----------------------------------------------------------------------------------------------------------------------------------------------|
+==========================================================================================================================================================
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..2773ff1d08
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,184 @@
+expected_output = {
+    'cg_name': {
+        'racl_permitv6_egress': {
+            'cg_id': 8,
+            'dir': 'Egress',
+            'feature': 'Racl',
+            'prot': 'IPv6',
+            'region': '0xa005f158',
+            'sdk_handles': [{'asic': 0, 'oid': '0x89D'}],
+            'seq': {
+                '10': {
+                    'action': 'DENY',
+                    'counter_handles': [{'asic': 0, 'oid': '0xA60'}],
+                    'ipv6_dst_value': '0x00300000.0x00000000.0x00000000.0x00010000',
+                    'ipv6_src_mask': '0xffffffff.0xffffffff.0xffffffff.0xffffff00',
+                    'ipv6_src_value': '0x00100000.0x00000000.0x00000000.0x00010000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+                '20': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00300000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0xffffffff.0xffffffff.0xffffffff.0xffffff00',
+                    'ipv6_src_value': '0x00100000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+                '30': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '40': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967293': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0xffff',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967294': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0xffff',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967295': {
+                    'action': 'DENY',
+                    'counter_handles': [{'asic': 0, 'oid': '0xA69'}],
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+            },
+        },
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..b8595f8c1d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,101 @@
+--------------------------------------------------------------
+         ACLs details (programmed in datapath)
+--------------------------------------------------------------
+
+[Racl, CG ID: 8]    CG Name: racl_permitv6_egress
+ Feature: Racl    Prot: IPv6
+ Region grp: 0xa005f158    Dir: Egress
+ SDK-handle(asic: 0, OID: 0x89D)
+
+    Seq Num:10
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+        Counter handle: (asic: 0 , OID: 0xA60 (0))
+    Result  action: DENY    Logging: NO_LOG
+
+    Seq Num:20
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:30
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x59       0x0      0x0         0x0        0x0          0x0
+        M:  0xff       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x59        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:40
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x0          0x0
+        M:  0xff       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:4294967293
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x87          0x0
+        M:  0xff       0x0      0x0         0x0        0xffff          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NONE
+
+    Seq Num:4294967294
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x88          0x0
+        M:  0xff       0x0      0x0         0x0        0xffff          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NONE
+
+    Seq Num:4294967295
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+        Counter handle: (asic: 0 , OID: 0xA69 (0))
+    Result  action: DENY    Logging: NONE
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_expected.py
new file mode 100644
index 0000000000..3c945b07f9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_expected.py
@@ -0,0 +1,64 @@
+expected_output ={
+   "stackports":{
+      "1/1":{
+         "port_status":"OK",
+         "neighbor":"2/2",
+         "cable_length":"50cm",
+         "link_ok":"Yes",
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      },
+      "1/2":{
+         "port_status":"OK",
+         "neighbor":"3/1",
+         "cable_length":"50cm",
+         "link_ok":"Yes",
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      },
+      "2/1":{
+         "port_status":"OK",
+         "neighbor":"3/2",
+         "cable_length":"50cm",
+         "link_ok":"Yes",        
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      },
+      "2/2":{
+         "port_status":"OK",
+         "neighbor":"1/1",
+         "cable_length":"50cm",
+         "link_ok":"Yes",
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      },
+      "3/1":{
+         "port_status":"OK",
+         "neighbor":"1/2",
+         "cable_length":"50cm",
+         "link_ok":"Yes",
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      },
+      "3/2":{
+         "port_status":"OK",
+         "neighbor":"2/1",
+         "cable_length":"50cm",
+         "link_ok":"Yes",
+         "link_active":"Yes",
+         "sync_ok":"Yes",
+         "link_changes_count":1,
+         "in_loopback":"No"
+      }
+   }
+}
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_output.txt
new file mode 100644
index 0000000000..8c305e8ea4
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9350/tests/ShowSwitchStackPortSummary/cli/equal/golden_1_output.txt
@@ -0,0 +1,9 @@
+Sw#/Port#  Port Status  Neighbor  Cable Length   Link OK   Link Active   Sync OK   #Changes to LinkOK  In Loopback
+        -------------------------------------------------------------------------------------------------------------------
+        1/1        OK           2/2            50cm           Yes       Yes           Yes       1                   No
+        1/2        OK           3/1            50cm           Yes       Yes           Yes       1                   No
+        2/1        OK           3/2            50cm           Yes       Yes           Yes       1                   No
+        2/2        OK           1/1            50cm           Yes       Yes           Yes       1                   No
+        3/1        OK           1/2            50cm           Yes       Yes           Yes       1                   No
+        3/2        OK           2/1            50cm           Yes       Yes           Yes       1                   No
+
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py b/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py
index 030f420027..4eda166704 100755
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py
@@ -18,6 +18,8 @@
    * show platform software fed {switch} active ip route vrf {vrf_name}
    * show platform hardware fed {switch} {mode} fwd-asic resource tcam utilization
    * show platform hardware fed active fwd-asic resource tcam utilization
+   * show platform software fed {mode} ip mfib vrf {vrf_name} {group} detail
+   * show platform software fed {switch} {mode} ip mfib vrf {vrf_name} {group} detail
 '''
 
 # Python
@@ -52,6 +54,7 @@ class ShowVersionSchema(MetaParser):
                     'image_id': str,
                     'rom': str,
                     'bootldr_version': str,
+                    'bootldr': str,
                     'hostname': str,
                     'uptime': str,
                     'uptime_this_cp': str,
@@ -314,6 +317,7 @@ def cli(self, output=None):
             m = p5.match(line)
             if m:
                 version_dict['bootldr_version'] = m.groupdict()['bootldr_version']
+                version_dict['bootldr'] = m.groupdict()['bootldr_version']
                 continue
 
             # SF2 uptime is 1 day, 18 hours, 48 minutes
@@ -2648,9 +2652,10 @@ class ShowPlatformSoftwareFedSwitchActivePuntPacketCaptureDisplayFilterIcmpBrief
                     'icmp_type': int,
                     'code': int
                 }
-            }
-        }
-    }
+			}
+		}
+	}
+
 
 # =====================================================================================================#
 #  Parser for 'show platform software fed switch active punt packet-capture display-filter icmp brief #
@@ -3111,4 +3116,315 @@ def cli(self, switch_num, switch , output=None):
                 ipv6_hdr['next_hdr']  =int(group['next_hdr'])
                 continue
    
-        return res_dict
\ No newline at end of file
+        return res_dict
+
+
+# =========================================
+# Parser for 'show platform software fed active ip mfib vrf vrf_mcast group detail'
+# =========================================
+
+class ShowPlatformSoftwareFedIpMfibVrfGroupDetailSchema(MetaParser):
+    """Schema for show platform software fed active ip mfib vrf {vrf_name} {group} detail"""
+
+    schema = {
+    'mvrf_table': {
+        Any(): {
+            'mcast_table': {
+                'cpu_credit': int,
+                'fset_aux_urid': str,
+                'fset_urid': str,
+                'gid': int,
+                'group_ip': str,
+                'hardware_info_asic': {
+                    'cookie_urid': str,
+                    'enable_rpf_check': int,
+                    'ip_mcid_oid': int,
+                    'punt_and_forward': int,
+                    'punt_on_rpf_fail': int,
+                    'rpf_port_oid': int,
+                    'rpfid': int,
+                    'use_rpfid': int
+                },
+                'hw_flag': str,
+                'mcid_oid_asic': int,
+                'mlist_handle': str,
+                'mlist_urid': str,
+                'npi_mroute_ent': str,
+                'oif_details': {
+                    Any(): {
+                        'adj_id': str,
+                        'flags': str,
+                        'hw_flag': str,
+                        'interface': str,
+                        'intf_type': str,
+                        'msg_type': str,
+                        'parent_if': str
+                    }
+                },
+                'rpf_adjancency_id': str,
+                'source_ip': str,
+                'svi_fwd_ifs': int,
+                'total_packets': int
+                }
+            },
+        }
+    }
+
+
+class ShowPlatformSoftwareFedIpMfibVrfGroupDetail(ShowPlatformSoftwareFedIpMfibVrfGroupDetailSchema):
+    """Parser for show platform software fed active ip mfib vrf vrf_mcast 225.0.0.1 detail"""
+
+    cli_command = [
+        "show platform software fed {mode} ip mfib vrf {vrf_name} {group} detail",
+        "show platform software fed {switch} {mode} ip mfib vrf {vrf_name} {group} detail",
+    ]
+
+    def cli(self, mode='', vrf_name='', group='', switch=None, output=None):
+        if output is None:
+            if switch:
+                cmd = self.cli_command[1].format(mode=mode, vrf_name=vrf_name, group=group, switch=switch)
+            else:
+                cmd = self.cli_command[0].format(mode=mode, vrf_name=vrf_name, group=group)
+            output = self.device.execute(cmd)
+
+        ret_dict = {}
+        index = 1
+        index1 = 1
+    
+        # Mvrf: 2  ( 14.14.14.2, 225.0.0.1 ) Attrs:
+        p1 = re.compile(r'.* +\( +(?P<source_ip>[\w\:\.\*\/]+)+\, +(?P<group_ip>[\w\:\.\/]+)')
+    
+        # Hw Flag                 : InHw
+        p2 = re.compile(r'Hw Flag +\: +(?P<hw_flag>\w+)')
+    
+        # Mlist_hndl (Id)         : 0x118831561f8 ( 0x1fd2 )
+        p3 = re.compile(r'Mlist_hndl +\(Id\) +\: +(?P<mlist_handle>\S+)')
+    
+        # Mlist Urid              : 0x1000000000001f91
+        p4 = re.compile(r'Mlist Urid +\: +(?P<mlist_urid>\S+)')
+    
+        # Fset Urid (Hash)        : 0x3000000000000059 ( cad91c96 )
+        p5 = re.compile(r'Fset Urid +\(Hash\) +\: +(?P<fset_urid>\S+)')
+    
+        # Fset Aux Urid           : 0x0
+        p6 = re.compile(r'Fset Aux Urid +\: +(?P<fset_aux_urid>\S+)')
+    
+        # RPF Adjacency ID        : 0xf80054f1
+        p7 = re.compile(r'RPF Adjacency ID +\: +(?P<rpf_adjancency_id>\S+)')
+    
+        # CPU Credit              : 0
+        p8 = re.compile(r'CPU Credit +\: +(?P<cpu_credit>\d+)')
+    
+        # Total Packets           : 17918 ( 19 pps approx.)
+        p9 = re.compile(r'Total Packets +\: +(?P<total_packets>\d+)')
+    
+        # npi_mroute_ent          : 0x118831bdc90
+        p10 = re.compile(r'npi_mroute_ent +\: +(?P<npi_mroute_ent>\S+)')
+    
+        # svi_fwd_ifs             : 0
+        p11 = re.compile(r'svi_fwd_ifs +\: +(?P<svi_fwd_ifs>\d+)')
+    
+        # OIF Details:
+        #  AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+        #  0xf80054a1     Hu1/0/9            --------         ---        F NS       --------       NORMAL
+        #  0xf80054f1     Hu1/0/23           --------         ---        A          --------       NORMAL
+        p12 = re.compile(
+            r'(?P<adj_id>\d\S+) +(?P<interface>[\w\:\.\/]+) +(?P<parent_if>\S+) +(?P<hw_flag>\S+) +(?P<flags>\D+) +(?P<intf_type>\S+) +(?P<msg_type>\w+)')
+    
+        # GID                   : 8276
+        p13 = re.compile(r'GID +\: +(?P<gid>\d+)')
+    
+        # MCID OID Asic[0]      : 2282
+        p14 = re.compile(r'MCID OID Asic\[0\] +\: +(?P<mcid_oid_asic>\d+)')
+    
+        # IP MCID OID         :2282 (cookie: urid:0x30::59)
+        p15 = re.compile(r'IP MCID OID +\:+(?P<ip_mcid_oid>\d+) +\(cookie\: +urid\:(?P<cookie_urid>\S+)\)')
+    
+        # RPF PORT OID        :2130
+        p16 = re.compile(r'RPF PORT OID  +\:+(?P<rpf_port_oid>\d+)')
+    
+        # punt_on_rpf_fail    :1
+        p17 = re.compile(r'punt_on_rpf_fail  +\:+(?P<punt_on_rpf_fail>\d+)')
+    
+        # punt_and_forward    :0
+        p18 = re.compile(r'punt_and_forward  +\:+(?P<punt_and_forward>\d+)')
+    
+        # use_rpfid           :0
+        p19 = re.compile(r'use_rpfid  +\:+(?P<use_rpfid>\d+)')
+    
+        # rpfid               :0
+        p20 = re.compile(r'rpfid  +\:+(?P<rpfid>\d+)')
+    
+        # enable_rpf_check    :1
+        p21 = re.compile(r'enable_rpf_check  +\:+(?P<enable_rpf_check>\d+)')
+    
+        ret_dict = {}
+        for line in output.splitlines():
+            line = line.strip()
+    
+            # Mvrf: 2  ( 14.14.14.2, 225.0.0.1 ) Attrs:
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                vrf_dict = ret_dict.setdefault('mvrf_table', {}).setdefault(index, {})
+                mvrf_dict = vrf_dict.setdefault('mcast_table', {})
+                mvrf_dict['source_ip'] = group['source_ip']
+                mvrf_dict['group_ip'] = group['group_ip']
+                index += 1
+                index1 = 1
+                continue
+    
+            # Hw Flag                 : InHw
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['hw_flag'] = group['hw_flag']
+                continue
+    
+            # Mlist_hndl (Id)         : 0x118831561f8 ( 0x1fd2 )
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['mlist_handle'] = group['mlist_handle']
+                continue
+    
+            # Mlist Urid              : 0x1000000000001f91
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['mlist_urid'] = group['mlist_urid']
+                continue
+    
+            # Fset Urid (Hash)        : 0x3000000000000059 ( cad91c96 )
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['fset_urid'] = group['fset_urid']
+                continue
+    
+            # Fset Aux Urid           : 0x0
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['fset_aux_urid'] = group['fset_aux_urid']
+                continue
+    
+            # RPF Adjacency ID        : 0xf80054f1
+            m = p7.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['rpf_adjancency_id'] = group['rpf_adjancency_id']
+                continue
+    
+            # CPU Credit              : 0
+            m = p8.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['cpu_credit'] = int(group['cpu_credit'])
+                continue
+    
+            # Total Packets           : 17918 ( 19 pps approx.)
+            m = p9.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['total_packets'] = int(group['total_packets'])
+                continue
+    
+            # npi_mroute_ent          : 0x118831bdc90
+            m = p10.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['npi_mroute_ent'] = group['npi_mroute_ent']
+                continue
+    
+            # svi_fwd_ifs             : 0
+            m = p11.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['svi_fwd_ifs'] = int(group['svi_fwd_ifs'])
+                continue
+    
+            # OIF Details:
+            #  AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+            #  0xf80054a1     Hu1/0/9            --------         ---        F NS       --------       NORMAL
+            #  0xf80054f1     Hu1/0/23           --------         ---        A          --------       NORMAL
+            m = p12.match(line)
+            if m:
+                group = m.groupdict()
+                global_dict = mvrf_dict.setdefault('oif_details', {}).setdefault(index1, {})
+                global_dict['adj_id'] = group['adj_id']
+                global_dict['interface'] = group['interface']
+                global_dict['parent_if'] = group['parent_if']
+                global_dict['hw_flag'] = group['hw_flag']
+                global_dict['flags'] = group['flags'].strip()
+                global_dict['intf_type'] = group['intf_type']
+                global_dict['msg_type'] = group['msg_type']
+                index1 += 1
+                continue
+    
+            # GID                   : 8276
+            m = p13.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['gid'] = int(group['gid'])
+                continue
+    
+            # MCID OID Asic[0]      : 2282
+            m = p14.match(line)
+            if m:
+                group = m.groupdict()
+                mvrf_dict['mcid_oid_asic'] = int(group['mcid_oid_asic'])
+                continue
+    
+            # IP MCID OID         :2282 (cookie: urid:0x30::59)
+            m = p15.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict = mvrf_dict.setdefault('hardware_info_asic', {})
+                local_dict['ip_mcid_oid'] = int(group['ip_mcid_oid'])
+                local_dict['cookie_urid'] = group['cookie_urid']
+                continue
+    
+            # RPF PORT OID        :2130
+            m = p16.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['rpf_port_oid'] = int(group['rpf_port_oid'])
+                continue
+    
+            # punt_on_rpf_fail    :1
+            m = p17.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['punt_on_rpf_fail'] = int(group['punt_on_rpf_fail'])
+                continue
+    
+            # punt_and_forward    :0
+            m = p18.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['punt_and_forward'] = int(group['punt_and_forward'])
+                continue
+    
+            # use_rpfid           :0
+            m = p19.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['use_rpfid'] = int(group['use_rpfid'])
+                continue
+    
+            # rpfid               :0
+            m = p20.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['rpfid'] = int(group['rpfid'])
+                continue
+    
+            # enable_rpf_check    :1
+            m = p21.match(line)
+            if m:
+                group = m.groupdict()
+                local_dict['enable_rpf_check'] = int(group['enable_rpf_check'])
+                continue
+    
+        return ret_dict
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_arguments.json
new file mode 100644
index 0000000000..e88882459f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_arguments.json
@@ -0,0 +1,4 @@
+{
+        "switch": "switch"
+}
+
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..31d51dc64b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,98 @@
+expected_output = {
+    'mvrf_table': {
+        1: {
+            'mcast_table': {
+                'cpu_credit': 1,
+                'fset_aux_urid': '0x0',
+                'fset_urid': '0x3000000000000004',
+                'gid': 8195,
+                'group_ip': '227.0.0.1',
+                'hardware_info_asic': {
+                    'cookie_urid': '0x30::4',
+                    'enable_rpf_check': 1,
+                    'ip_mcid_oid': 2113,
+                    'punt_and_forward': 1,
+                    'punt_on_rpf_fail': 1,
+                    'rpf_port_oid': 660,
+                    'rpfid': 0,
+                    'use_rpfid': 0
+                },
+                'hw_flag': 'InHw',
+                'mcid_oid_asic': 2113,
+                'mlist_handle': '0x118807d8e78',
+                'mlist_urid': '0x1000000000000017',
+                'npi_mroute_ent': '0x118825a0178',
+                'oif_details': {
+                    1: {
+                        'adj_id': '0xf80054d6',
+                        'flags': 'A',
+                        'hw_flag': 'Cpu',
+                        'interface': 'Tu0',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    },
+                    2: {
+                        'adj_id': '0xf8005551',
+                        'flags': 'F NS',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/23',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    }
+                },
+                'rpf_adjancency_id': '0xf80054d6',
+                'source_ip': '*',
+                'svi_fwd_ifs': 0,
+                'total_packets': 0}},
+        2: {
+            'mcast_table': {
+                'cpu_credit': 0,
+                'fset_aux_urid': '0x0',
+                'fset_urid': '0x3000000000000046',
+                'gid': 8259,
+                'group_ip': '227.0.0.1',
+                'hardware_info_asic': {
+                    'cookie_urid': '0x30::46',
+                    'enable_rpf_check': 1,
+                    'ip_mcid_oid': 2256,
+                    'punt_and_forward': 0,
+                    'punt_on_rpf_fail': 1,
+                    'rpf_port_oid': 2116,
+                    'rpfid': 0,
+                    'use_rpfid': 0
+                },
+                'hw_flag': 'InHw',
+                'mcid_oid_asic': 2256,
+                'mlist_handle': '0x1188334c298',
+                'mlist_urid': '0x1000000000001fbf',
+                'npi_mroute_ent': '0x118833ccf78',
+                'oif_details': {
+                    1: {
+                        'adj_id': '0xf8005501',
+                        'flags': 'A',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/9',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    },
+                    2: {
+                        'adj_id': '0xf8005551',
+                        'flags': 'F NS',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/23',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    }
+                },
+                'rpf_adjancency_id': '0xf8005501',
+                'source_ip': '11.11.11.2',
+                'svi_fwd_ifs': 0,
+                'total_packets': 0
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..36abfc82ac
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,51 @@
+  Mvrf: 2  ( *, 227.0.0.1 ) Attrs: C
+    Hw Flag                 : InHw
+    Mlist_hndl (Id)         : 0x118807d8e78 ( 0x5b )
+    Mlist Urid              : 0x1000000000000017
+    Fset Urid (Hash)        : 0x3000000000000004 ( 64cbf57e )
+    Fset Aux Urid           : 0x0
+    RPF Adjacency ID        : 0xf80054d6
+    CPU Credit              : 1
+    Total Packets           : 0 ( 0 pps approx.)
+    npi_mroute_ent          : 0x118825a0178
+    svi_fwd_ifs             : 0
+    OIF Details:
+      AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+      0xf80054d6     Tu0                --------         Cpu        A          --------       NORMAL
+      0xf8005551     Hu1/0/23           --------         ---        F NS       --------       NORMAL
+    GID                   : 8195
+    MCID OID Asic[0]      : 2113
+    Hardware Info ASIC[0] :
+      IP MCID OID         :2113 (cookie: urid:0x30::4)
+      RPF PORT OID        :660
+      punt_on_rpf_fail    :1
+      punt_and_forward    :1
+      use_rpfid           :0
+      rpfid               :0
+      enable_rpf_check    :1
+
+  Mvrf: 2  ( 11.11.11.2, 227.0.0.1 ) Attrs:
+    Hw Flag                 : InHw
+    Mlist_hndl (Id)         : 0x1188334c298 ( 0x1ff5 )
+    Mlist Urid              : 0x1000000000001fbf
+    Fset Urid (Hash)        : 0x3000000000000046 ( 99d23813 )
+    Fset Aux Urid           : 0x0
+    RPF Adjacency ID        : 0xf8005501
+    CPU Credit              : 0
+    Total Packets           : 0 ( 0 pps approx.)
+    npi_mroute_ent          : 0x118833ccf78
+    svi_fwd_ifs             : 0
+    OIF Details:
+      AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+      0xf8005501     Hu1/0/9            --------         ---        A          --------       NORMAL
+      0xf8005551     Hu1/0/23           --------         ---        F NS       --------       NORMAL
+    GID                   : 8259
+    MCID OID Asic[0]      : 2256
+    Hardware Info ASIC[0] :
+      IP MCID OID         :2256 (cookie: urid:0x30::46)
+      RPF PORT OID        :2116
+      punt_on_rpf_fail    :1
+      punt_and_forward    :0
+      use_rpfid           :0
+      rpfid               :0
+      enable_rpf_check    :1
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..31d51dc64b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_expected.py
@@ -0,0 +1,98 @@
+expected_output = {
+    'mvrf_table': {
+        1: {
+            'mcast_table': {
+                'cpu_credit': 1,
+                'fset_aux_urid': '0x0',
+                'fset_urid': '0x3000000000000004',
+                'gid': 8195,
+                'group_ip': '227.0.0.1',
+                'hardware_info_asic': {
+                    'cookie_urid': '0x30::4',
+                    'enable_rpf_check': 1,
+                    'ip_mcid_oid': 2113,
+                    'punt_and_forward': 1,
+                    'punt_on_rpf_fail': 1,
+                    'rpf_port_oid': 660,
+                    'rpfid': 0,
+                    'use_rpfid': 0
+                },
+                'hw_flag': 'InHw',
+                'mcid_oid_asic': 2113,
+                'mlist_handle': '0x118807d8e78',
+                'mlist_urid': '0x1000000000000017',
+                'npi_mroute_ent': '0x118825a0178',
+                'oif_details': {
+                    1: {
+                        'adj_id': '0xf80054d6',
+                        'flags': 'A',
+                        'hw_flag': 'Cpu',
+                        'interface': 'Tu0',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    },
+                    2: {
+                        'adj_id': '0xf8005551',
+                        'flags': 'F NS',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/23',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    }
+                },
+                'rpf_adjancency_id': '0xf80054d6',
+                'source_ip': '*',
+                'svi_fwd_ifs': 0,
+                'total_packets': 0}},
+        2: {
+            'mcast_table': {
+                'cpu_credit': 0,
+                'fset_aux_urid': '0x0',
+                'fset_urid': '0x3000000000000046',
+                'gid': 8259,
+                'group_ip': '227.0.0.1',
+                'hardware_info_asic': {
+                    'cookie_urid': '0x30::46',
+                    'enable_rpf_check': 1,
+                    'ip_mcid_oid': 2256,
+                    'punt_and_forward': 0,
+                    'punt_on_rpf_fail': 1,
+                    'rpf_port_oid': 2116,
+                    'rpfid': 0,
+                    'use_rpfid': 0
+                },
+                'hw_flag': 'InHw',
+                'mcid_oid_asic': 2256,
+                'mlist_handle': '0x1188334c298',
+                'mlist_urid': '0x1000000000001fbf',
+                'npi_mroute_ent': '0x118833ccf78',
+                'oif_details': {
+                    1: {
+                        'adj_id': '0xf8005501',
+                        'flags': 'A',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/9',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    },
+                    2: {
+                        'adj_id': '0xf8005551',
+                        'flags': 'F NS',
+                        'hw_flag': '---',
+                        'interface': 'Hu1/0/23',
+                        'intf_type': '--------',
+                        'msg_type': 'NORMAL',
+                        'parent_if': '--------'
+                    }
+                },
+                'rpf_adjancency_id': '0xf8005501',
+                'source_ip': '11.11.11.2',
+                'svi_fwd_ifs': 0,
+                'total_packets': 0
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..36abfc82ac
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowPlatformSoftwareFedIpMfibVrfGroupDetail/cli/equal/golden_output_output.txt
@@ -0,0 +1,51 @@
+  Mvrf: 2  ( *, 227.0.0.1 ) Attrs: C
+    Hw Flag                 : InHw
+    Mlist_hndl (Id)         : 0x118807d8e78 ( 0x5b )
+    Mlist Urid              : 0x1000000000000017
+    Fset Urid (Hash)        : 0x3000000000000004 ( 64cbf57e )
+    Fset Aux Urid           : 0x0
+    RPF Adjacency ID        : 0xf80054d6
+    CPU Credit              : 1
+    Total Packets           : 0 ( 0 pps approx.)
+    npi_mroute_ent          : 0x118825a0178
+    svi_fwd_ifs             : 0
+    OIF Details:
+      AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+      0xf80054d6     Tu0                --------         Cpu        A          --------       NORMAL
+      0xf8005551     Hu1/0/23           --------         ---        F NS       --------       NORMAL
+    GID                   : 8195
+    MCID OID Asic[0]      : 2113
+    Hardware Info ASIC[0] :
+      IP MCID OID         :2113 (cookie: urid:0x30::4)
+      RPF PORT OID        :660
+      punt_on_rpf_fail    :1
+      punt_and_forward    :1
+      use_rpfid           :0
+      rpfid               :0
+      enable_rpf_check    :1
+
+  Mvrf: 2  ( 11.11.11.2, 227.0.0.1 ) Attrs:
+    Hw Flag                 : InHw
+    Mlist_hndl (Id)         : 0x1188334c298 ( 0x1ff5 )
+    Mlist Urid              : 0x1000000000001fbf
+    Fset Urid (Hash)        : 0x3000000000000046 ( 99d23813 )
+    Fset Aux Urid           : 0x0
+    RPF Adjacency ID        : 0xf8005501
+    CPU Credit              : 0
+    Total Packets           : 0 ( 0 pps approx.)
+    npi_mroute_ent          : 0x118833ccf78
+    svi_fwd_ifs             : 0
+    OIF Details:
+      AdjID          Interface          ParentIf        HwFlag      Flags      IntfType       MsgType
+      0xf8005501     Hu1/0/9            --------         ---        A          --------       NORMAL
+      0xf8005551     Hu1/0/23           --------         ---        F NS       --------       NORMAL
+    GID                   : 8259
+    MCID OID Asic[0]      : 2256
+    Hardware Info ASIC[0] :
+      IP MCID OID         :2256 (cookie: urid:0x30::46)
+      RPF PORT OID        :2116
+      punt_on_rpf_fail    :1
+      punt_and_forward    :0
+      use_rpfid           :0
+      rpfid               :0
+      enable_rpf_check    :1
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_1_expected.py
index acc5ecebcc..51d23e6547 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_1_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_1_expected.py
@@ -1,6 +1,7 @@
 expected_output = {
     'version': {
         'bootldr_version': 'System Bootstrap, Version 17.3.1r[FC2], RELEASE SOFTWARE (P)',
+        'bootldr': 'System Bootstrap, Version 17.3.1r[FC2], RELEASE SOFTWARE (P)',
         'chassis': 'C9500-24Y4C',
         'code_name': 'Amsterdam',
         'compiled_by': 'mcpre',
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_2_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_2_expected.py
index e2427b039f..7ed8a6525a 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_2_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_2_expected.py
@@ -1,7 +1,8 @@
 
 expected_output = {
-   'version': {   'bootldr_version': 'System Bootstrap, Version 17.1.1r, '
+   'version': {    'bootldr_version': 'System Bootstrap, Version 17.1.1r, '
                                       'RELEASE SOFTWARE (P)',
+                   'bootldr': 'System Bootstrap, Version 17.1.1r, RELEASE SOFTWARE (P)',
                    'chassis': 'C9500-12Q',
                    'code_name': 'Amsterdam',
                    'compiled_by': 'mcpre',
@@ -37,4 +38,4 @@
                    'uptime_this_cp': '4 days, 15 hours, 58 minutes',
                    'version': '17.2.1',
                    'version_short': '17.2',
-                   'xe_version': '17.02.01'}}
\ No newline at end of file
+                   'xe_version': '17.02.01'}}
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_3_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_3_expected.py
index 4eed6e8b51..21977e0d6a 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_3_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_3_expected.py
@@ -13,6 +13,7 @@
       "os":"IOS-XE",
       "rom":"IOS-XE ROMMON",
       "bootldr_version":"System Bootstrap, Version 17.11.1r, RELEASE SOFTWARE (P)",
+      "bootldr":"System Bootstrap, Version 17.11.1r, RELEASE SOFTWARE (P)",
       "hostname":"denis_scorpion",
       "uptime":"1 week, 1 day, 19 hours, 23 minutes",
       "uptime_this_cp":"1 week, 1 day, 19 hours, 25 minutes",
@@ -47,4 +48,4 @@
       "model_num":"C9500X-60L4D",
       "system_sn":"FDO25400JP2"
    }
-}
\ No newline at end of file
+}
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_4_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_4_expected.py
index 266c16b826..71ec0b82ec 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_4_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_4_expected.py
@@ -12,6 +12,7 @@
         "os": "IOS-XE",
         "rom": "IOS-XE ROMMON",
         "bootldr_version": "System Bootstrap, Version 17.8.1r[FC1], RELEASE SOFTWARE (P)",
+        "bootldr": "System Bootstrap, Version 17.8.1r[FC1], RELEASE SOFTWARE (P)",
         "hostname": "svs-fc-dis-r-a-1",
         "uptime": "11 hours, 42 minutes",
         "uptime_this_cp": "11 hours, 44 minutes",
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_expected.py
index accb0f58f2..4382da1593 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_expected.py
@@ -10,6 +10,7 @@
         "compiled_by": "makale",
         "rom": "IOS-XE ROMMON",
         "bootldr_version": "System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)",
+        "bootldr": "System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)",
         "hostname": "SF2",
         "uptime": "1 day, 18 hours, 48 minutes",
         "returned_to_rom_by": "Reload Command",
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_expected.py
index 64b4abdfbe..fc44c4426b 100644
--- a/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_expected.py
+++ b/src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_expected.py
@@ -11,6 +11,7 @@
             "compiled_by": "makale",
             "rom": "IOS-XE ROMMON",
             "bootldr_version": "System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)",
+            "bootldr": "System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)",
             "hostname": "SF2",
             "uptime": "1 day, 18 hours, 48 minutes",
             "returned_to_rom_by": "Reload Command",
@@ -51,4 +52,4 @@
             "curr_config_register": "0x102",
             "xe_version": "2019-10-31_17.49_makale"
         }
-    }
\ No newline at end of file
+    }
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/show_hardware.py b/src/genie/libs/parser/iosxe/cat9k/c9610/show_hardware.py
new file mode 100644
index 0000000000..985a9c524e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/show_hardware.py
@@ -0,0 +1,216 @@
+''' show_hardware.py
+IOSXE parsers for the following show commands:
+    * show hardware led
+'''
+
+# Python
+import re
+
+# Metaparser
+from genie.metaparser import MetaParser
+from genie.metaparser.util.schemaengine import Any, Optional
+
+# parser utils
+from genie.libs.parser.utils.common import Common
+
+
+class ShowHardwareLedSchema(MetaParser):
+    """
+    Schema for show hardware led
+    """
+    schema = {
+        Optional('switch'): {
+            Any():{
+                'line_card': {
+                    Any():{
+                        'number_of_ports_in_status':int,
+                        'port_led_status':{
+                            str: str
+                        },
+                        'beacon': str,
+                        'status': str
+                    }
+                },
+                'supervisor': {
+                    Any():{
+                        Optional('port_led_status'):{
+                            str: str
+                        },
+                        'slot': int,
+                        'beacon': str,
+                        'status': str,
+                        'system': str,
+                        'active': str
+                    }
+                },
+                'fantray_status': str,
+                'fantray_beacon': str,
+                'model': str,
+                'system': str
+            }
+        },
+        Optional('line_card'): {
+            Any():{
+                'number_of_ports_in_status':int,
+                'port_led_status':{
+                    str: str
+                },
+                'beacon': str,
+                'status': str
+            }
+        },
+        Optional('supervisor'): {
+            Any():{
+                Optional('port_led_status'):{
+                    str: str
+                },
+                'slot': int,
+                'beacon': str,
+                Optional('status'): str,
+                Optional('system'): str,
+                Optional('active'): str
+            }
+        },
+        Optional('fantray_status'): str,
+        Optional('fantray_beacon'): str,
+        Optional('model'): str,
+        Optional('system'): str
+    }
+                  
+class ShowHardwareLed(ShowHardwareLedSchema):
+    """ Parser for show hardware led"""
+
+    cli_command = 'show hardware led'
+    
+    def cli(self, output=None): 
+        if output is None:
+            output = self.device.execute(self.cli_command)
+
+        # Switch 1:
+        p0 = re.compile(r'^Switch\s+(?P<switch_num>\d+):$')
+
+        # SWITCH: C9606R
+        p1 = re.compile(r'^SWITCH:\s+(?P<model>\S+)$')
+
+        # SYSTEM: GREEN
+        p2 = re.compile(r'^SYSTEM:\s+(?P<system>\w+)$')
+
+        # Line Card : 1
+        p3 = re.compile(r'^Line\sCard\s*:\s+(?P<line_card>\d+)$')
+
+        # PORT STATUS: (124) Hu1/0/1:GREEN Hu1/0/2:OFF Hu1/0/3:GREEN Hu1/0/4:OFF Hu1/0/5:OFF Hu1/0/6:GREEN Hu1/0/7:OFF Hu1/0/8:OFF Hu1/0/9:OFF Hu1/0/10:GREEN Hu1/0/11:GREEN Hu1/0/12:GREEN Hu1/0/13:GREEN Hu1/0/14:GREEN Fou1/0/15:GREEN Fou1/0/16:GREEN Fou1/0/17:GREEN Fou1/0/18:GREEN Fou1/0/19:GREEN Fou1/0/20:GREEN Fou1/0/21:GREEN Fou1/0/22:GREEN Hu1/0/23:GREEN Hu1/0/24:GREEN Hu1/0/25:OFF Hu1/0/26:GREEN Hu1/0/27:GREEN Hu1/0/28:GREEN Hu1/0/29:GREEN Hu1/0/30:GREEN Hu1/0/31:OFF Hu1/0/32:GREEN Hu1/0/33:GREEN Hu1/0/34:GREEN Hu1/0/35:GREEN Hu1/0/36:GREEN
+        p4 = re.compile(r'^PORT\sSTATUS:\s+\((?P<number_of_ports_in_status>\d+)\)\s+(?P<led_ports>((\S+:\w+\s*))+)$')
+        
+        # BEACON: OFF
+        p5 = re.compile(r'^BEACON:\s+(?P<beacon>.+)$')
+
+        # STATUS: GREEN
+        p6 = re.compile(r'^STATUS:\s+(?P<status>\w+)$')
+
+        # MODULE: slot 3
+        p7 = re.compile(r'^MODULE:\s*slot\s*(?P<supervisor>\d+)$')
+
+        # SUPERVISOR: ACTIVE
+        p8 = re.compile(r'^SUPERVISOR:\s*(?P<status>\w+)$')
+
+        # ACTIVE: GREEN
+        p9 = re.compile(r'^ACTIVE:\s+(?P<active>\w+)$')
+
+        # FANTRAY STATUS: GREEN
+        p10 = re.compile('^FANTRAY STATUS:\s+(?P<fantray_status>\w+)$')
+
+        # FANTRAY BEACON: OFF
+        p11 = re.compile('^FANTRAY BEACON:\s+(?P<fantray_beacon>\w+)$')
+
+        ret_dict = {}
+        root_dict = {}
+        system_flag = False
+        for line in output.splitlines():
+            line = line.strip()
+            
+            # Switch 1:
+            m = p0.match(line)
+            if m:
+                system_flag = False
+                root_dict = ret_dict.setdefault('switch', {}).setdefault(int(m.groupdict()['switch_num']), {})
+                continue
+
+            # SWITCH: C9606R
+            m = p1.match(line)
+            if m:
+                if not ret_dict:
+                    root_dict = ret_dict
+                root_dict['model'] = m.groupdict()['model']
+                continue
+            
+            # SYSTEM: GREEN
+            m = p2.match(line)
+            if m:
+                if system_flag:
+                    card_dict['system'] = m.groupdict()['system']
+                    continue
+                root_dict['system'] = m.groupdict()['system']
+                continue
+            
+            # Line Card : 1
+            m = p3.match(line)
+            if m:
+                card_dict = root_dict.setdefault('line_card', {}).setdefault(int(m.groupdict()['line_card']), {})
+                continue
+
+            # PORT STATUS: (124) Hu1/0/1:GREEN Hu1/0/2:OFF Hu1/0/3:GREEN Hu1/0/4:OFF Hu1/0/5:OFF Hu1/0/6:GREEN Hu1/0/7:OFF Hu1/0/8:OFF Hu1/0/9:OFF Hu1/0/10:GREEN Hu1/0/11:GREEN Hu1/0/12:GREEN Hu1/0/13:GREEN Hu1/0/14:GREEN Fou1/0/15:GREEN Fou1/0/16:GREEN Fou1/0/17:GREEN Fou1/0/18:GREEN Fou1/0/19:GREEN Fou1/0/20:GREEN Fou1/0/21:GREEN Fou1/0/22:GREEN Hu1/0/23:GREEN Hu1/0/24:GREEN Hu1/0/25:OFF Hu1/0/26:GREEN Hu1/0/27:GREEN Hu1/0/28:GREEN Hu1/0/29:GREEN Hu1/0/30:GREEN Hu1/0/31:OFF Hu1/0/32:GREEN Hu1/0/33:GREEN Hu1/0/34:GREEN Hu1/0/35:GREEN Hu1/0/36:GREEN       
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                for port in group['led_ports'].split():
+                    port = (port.split(':'))
+                    port_led_dict = card_dict.setdefault('port_led_status',{})
+                    port_led_dict.update({Common.convert_intf_name(port[0]): port[1]})
+                card_dict['number_of_ports_in_status'] = int(group['number_of_ports_in_status'])
+                continue
+
+            # BEACON: OFF
+            m = p5.match(line)
+            if m:
+                card_dict['beacon'] = m.groupdict()['beacon']
+                continue
+
+            # STATUS: GREEN
+            m = p6.match(line)
+            if m:
+                card_dict['status'] = m.groupdict()['status']
+                continue
+
+            # MODULE: slot 3
+            m = p7.match(line)
+            if m:
+                supervisor = m.groupdict()['supervisor']
+                continue
+
+            # SUPERVISOR: ACTIVE
+            m = p8.match(line)
+            if m:
+                system_flag = True
+                card_dict = root_dict.setdefault('supervisor', {}).setdefault(m.groupdict()['status'].lower(), {})
+                card_dict['slot'] = int(supervisor)
+                continue
+
+            # ACTIVE: GREEN
+            m = p9.match(line)
+            if m:
+                card_dict['active'] = m.groupdict()['active']
+                continue
+
+            # FANTRAY STATUS: GREEN
+            m = p10.match(line)
+            if m:
+                root_dict['fantray_status'] = m.groupdict()['fantray_status']
+                continue
+
+            # FANTRAY BEACON: OFF
+            m = p11.match(line)
+            if m:
+                root_dict['fantray_beacon'] = m.groupdict()['fantray_beacon']
+                continue
+
+        return ret_dict
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py b/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py
new file mode 100644
index 0000000000..4d1354854c
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/show_platform.py
@@ -0,0 +1,287 @@
+'''show_platform.py
+
+IOSXE c9610 parsers for the following show commands:
+    * show platform hardware fed active fwd-asic resource tcam utilization
+    * show platform software fed {switch} {mode} acl info db detail
+    * show platform software fed {mode} acl info db detail
+'''
+from genie.metaparser import MetaParser
+from genie.libs.parser.utils.common import Common
+import re
+from genie.metaparser.util.schemaengine import Schema, Any, Or, Optional, Use, And
+from genie.libs.parser.iosxe.cat9k.c9600.show_platform import ShowPlatformFedActiveTcamUtilization as ShowPlatformFedActiveTcamUtilization_c9600
+
+
+class ShowPlatformFedActiveTcamUtilization(ShowPlatformFedActiveTcamUtilization_c9600):
+    """ Parser for show platform hardware fed active fwd-asic resource tcam utilization"""
+    pass
+
+
+class ShowPlatformSoftwareFedActiveAclInfoDbDetailSchema(MetaParser):
+    """Schema for show platform software fed switch active acl info db detail"""
+
+    schema = {
+        'cg_name': {
+            Any(): {
+                'cg_id':int,
+                'feature':str,
+                'prot':str,
+                'region':str,
+                'dir':str,
+                'sdk_handles': list,
+                'seq':{
+                    Any():{
+                        Optional('ipv4_src_value'):str,
+                        Optional('ipv4_src_mask'):str,
+                        Optional('ipv4_dst_value'):str,
+                        Optional('ipv4_dst_mask'):str,
+                        Optional('ipv6_src_value'):str,
+                        Optional('ipv6_src_mask'):str,
+                        Optional('ipv6_dst_value'):str,
+                        Optional('ipv6_dst_mask'):str,
+                        'proto':{
+                                'value':str,
+                                'mask':str,
+                                'tcp_flg':str,
+                                'tcp_op':str,
+                                'src_port':str,
+                                'dst_port':str,
+                        },
+                        'tos':{
+                                'value':str,
+                                'mask':str,
+                                'ttl':str,
+                                'cos':str,
+                                'v4_opt':str,
+                                'src_obj':str,
+                                'dst_obj':str,
+                        },
+                        'action':str,
+                        'logging':str,
+                        Optional('counter_handles'): list,
+                    },
+                },
+            },
+        },
+    }
+
+# ============================================================================
+#  Parser for
+#  * 'show platform software fed switch active acl info db detail'
+# ============================================================================
+class ShowPlatformSoftwareFedActiveAclInfoDbDetail(ShowPlatformSoftwareFedActiveAclInfoDbDetailSchema):
+    '''Parser for:
+        * 'show platform software fed switch active acl info db detail'
+    '''
+    cli_command = ['show platform software fed {switch} {mode} acl info db detail', 
+                   'show platform software fed {mode} acl info db detail']
+
+    def cli(self, mode, switch=None, output=None):
+        if not output:
+            if switch:
+                cmd = self.cli_command[0].format(switch=switch, mode=mode)
+            else:
+                cmd = self.cli_command[1].format(mode=mode)
+            output = self.device.execute(cmd)
+
+        proto_flag = False
+        tos_flag = False
+
+        # [CG ID: 8]    CG Name: racl_ingress
+        # [Racl, CG ID: 8]    CG Name: racl_permitv6_egress
+        p1 = re.compile(r'^\[.*CG ID:\s+(?P<cg_id>\d+)\]\s+CG\s+Name:\s+(?P<cg_name>[\w\-]+)$')
+
+        # [Feature: Racl    Prot: IPv4
+        p2 = re.compile(r'^Feature:\s+(?P<feature>\w+)\s+Prot:\s+(?P<prot>\w+)$')
+
+        # Region grp: 0x2c0603d8    Dir: Ingress
+        p3 = re.compile(r'^Region\s+grp:\s+(?P<region>0x[\da-fA-F]+)\s+Dir:\s+(?P<dir>\w+)$')
+
+        # SDK-handle(asic: 0, OID: 0x44D)
+        p4 = re.compile(r'^SDK-handle\(asic:\s+(?P<asic>\d+),\s+OID:\s+(?P<oid>0x\w+)\)$')
+
+        # Seq Num:10
+        p5 = re.compile(r'^Seq Num:+(?P<seq>[\d\w]+)$')
+
+        # ipv4_src: value = 0x00000000       mask = 0x00000000
+        p6 = re.compile(r'^ipv4_src:\s+value+\s=\s+(?P<ipv4_src_value>[\d\w]+)+\s+mask+\s=\s+(?P<ipv4_src_mask>[\d\w]+)$')
+
+        # ipv4_dst: value = 0x00000000       mask = 0x00000000
+        p7 = re.compile(r'^ipv4_dst:\s+value+\s=\s+(?P<ipv4_dst_value>[\d\w]+)+\s+mask+\s=\s+(?P<ipv4_dst_mask>[\d\w]+)$')
+
+        # ipv6_src: value = 0x00001100.0x01000000.0x00000000.0x30000000
+        p7_1 = re.compile(r'^ipv6_src:\s+value+\s=\s+(?P<ipv6_src_value>[\S]+)$')
+
+        # ipv6_dst: value = 0x00001100.0x00000000.0x00000000.0x3000000
+        p7_2 = re.compile(r'^ipv6_dst:\s+value+\s=\s+(?P<ipv6_dst_value>[\S]+)$')
+
+        # mask = 0xffffffff.0xffffffff.0xffffffff.0xffffffff
+        p7_3 = re.compile(r'^mask+\s=\s+(?P<ipv6_mask>[\S]+)$')
+
+        # proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        p8_0=re.compile(r'^proto+\s+frag+\s+tcp_flg+\s+tcp_op+\s+src_port+\s+dst_port$')
+
+        #  tos      ttl       cos      v4_opt    src_obj     dst_obj
+        p8_1 = re.compile(r'^tos+\s+ttl+\s+cos+\s+[v4_opt|ext_hdr]+\s+src_obj+\s+dst_obj$')
+
+        # V:  0x1       0x0      0x0         0x0        0x0          0x0
+        # M:  0xff       0x0      0x0         0x0        0x0          0x0
+        p8 = re.compile(r'^(?P<type>[\w\_]+)+:\s+(?P<proto>[\w]+)+\s+(?P<frag>[\w]+)+\s+(?P<tcp_flg>[\w]+)+\s+(?P<tcp_op>[\w]+)+\s+(?P<src_port>[\w]+)+\s+(?P<dst_port>[\w]+)$')
+        # V:  0x0       0x0      0x0         0x0        0x0          0x0
+        # M:  0x0       0x0      0x0         0x0        0x0          0x0
+        p9 = re.compile(r'^(?P<type>[\w\_]+)+:\s+(?P<tos>[\w]+)+\s+(?P<ttl>[\w]+)+\s+(?P<cos>[\w]+)+\s+(?P<v4_opt>[\w]+)+\s+(?P<src_obj>[\w]+)+\s+(?P<dst_obj>[\w]+)$')
+
+        # Result  action: DENY    Logging: NO_LOG
+        p10 = re.compile(r'Result\s+action:\s+(?P<action>\S+)\s+Logging:\s+(?P<logging>\S+)$')
+
+        # Counter handle: (asic: 0 , OID: 0x577 (0))
+        p11 = re.compile(r'^Counter\s+handle:\s+\(asic:\s+(?P<asic>\d+)\s*,\s*OID:\s+(?P<oid>0x[\da-fA-F]+)\s*\(\d+\)\)$')
+
+        ret_dict = {}
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # [CG ID: 8]    CG Name: racl_ingress
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                cg_name_dict = ret_dict.setdefault('cg_name', {}).setdefault(group['cg_name'], {})
+                cg_name_dict['cg_id'] = int(group['cg_id'])
+                continue
+
+            # Feature: Racl    Prot: IPv4
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                cg_name_dict['feature'] = group['feature']
+                cg_name_dict['prot'] = group['prot']
+                continue
+
+            # Region grp: 0x2c0603d8    Dir: Ingress
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                cg_name_dict['region'] = group['region']
+                cg_name_dict['dir'] = group['dir']
+                continue
+
+            # SDK-handle(asic: 0, OID: 0x44D)
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                sdk_handles = cg_name_dict.setdefault('sdk_handles', [])
+                sdk_handles.append({'asic': int(group['asic']), 'oid': group['oid']})
+                continue
+
+            # Seq Num:10
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                seq_dict = cg_name_dict.setdefault('seq', {}).setdefault(group['seq'], {})
+                continue
+
+            # ipv4_src: value = 0x78010500       mask = 0xffffff00
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                if 'seq_dict' in locals():
+                    seq_dict['ipv4_src_value'] = group['ipv4_src_value']
+                    seq_dict['ipv4_src_mask'] = group['ipv4_src_mask']
+                continue
+
+            # ipv4_dst: value = 0x7a010502       mask = 0xffffffff
+            m = p7.match(line)
+            if m:
+                group = m.groupdict()
+                if 'seq_dict' in locals():
+                    seq_dict['ipv4_dst_value'] = group['ipv4_dst_value']
+                    seq_dict['ipv4_dst_mask'] = group['ipv4_dst_mask']
+                continue
+            
+            # ipv6_src: value = 0x00001100.0x01000000.0x00000000.0x30000000
+            m = p7_1.match(line)
+            if m:
+                group = m.groupdict()
+                if 'seq_dict' in locals():
+                    seq_dict['ipv6_src_value'] = group['ipv6_src_value']
+                continue
+            
+            # ipv6_dst: value = 0x00001100.0x00000000.0x00000000.0x3000000
+            m = p7_2.match(line)
+            if m:
+                group = m.groupdict()
+                if 'seq_dict' in locals():
+                    seq_dict['ipv6_dst_value'] = group['ipv6_dst_value']
+                continue
+            
+            # mask = 0xffffffff.0xffffffff.0xffffffff.0xffffffff
+            m = p7_3.match(line)
+            if m:
+                group = m.groupdict()
+                if 'seq_dict' in locals():
+                    if 'ipv6_src_value' in seq_dict:
+                        seq_dict['ipv6_src_mask'] = group['ipv6_mask']
+                    elif 'ipv6_dst_value' in seq_dict:
+                        seq_dict['ipv6_dst_mask'] = group['ipv6_mask']
+                continue
+
+            # proto    frag    tcp_flg    tcp_op    src_port    dst_port
+            m = p8_0.match(line)
+            if m:
+                proto_flag = True
+                continue
+
+            # tos      ttl       cos      v4_opt    src_obj     dst_obj
+            m = p8_1.match(line)
+            if m:
+                tos_flag = True
+                proto_flag = False
+                continue
+
+            # V:  0x1       0x0      0x0         0x0        0x0          0x0
+            m = p8.match(line)
+            if m and proto_flag:
+                group = m.groupdict()
+                seq_dict['proto'] = {
+                    'value': group['proto'],
+                    'mask': group['frag'],
+                    'tcp_flg': group['tcp_flg'],
+                    'tcp_op': group['tcp_op'],
+                    'src_port': group['src_port'],
+                    'dst_port': group['dst_port'],
+                }
+                continue
+
+            # M:  0x0       0x0      0x0         0x0        0x0          0x0
+            m = p9.match(line)
+            if m and tos_flag:
+                group = m.groupdict()
+                seq_dict['tos'] = {
+                    'value': group['tos'],
+                    'mask': group['ttl'],
+                    'ttl': group['ttl'],
+                    'cos': group['cos'],
+                    'v4_opt': group['v4_opt'],
+                    'src_obj': group['src_obj'],
+                    'dst_obj': group['dst_obj'],
+                }
+                continue
+
+            # Result action: DENY    Logging: NO_LOG
+            m = p10.match(line)
+            if m:
+                group = m.groupdict()
+                seq_dict['action'] = group['action']
+                seq_dict['logging'] = group['logging']
+                continue
+
+            # Counter handle: (asic: 0 , OID: 0x577 (0))
+            m = p11.match(line)
+            if m:
+                group = m.groupdict()
+                counter_handles = seq_dict.setdefault('counter_handles', [])
+                counter_handles.append({'asic': int(group['asic']), 'oid': group['oid']})
+                continue
+
+        return ret_dict
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..a82da9e68e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_expected.py
@@ -0,0 +1,233 @@
+expected_output = {
+    'fantray_beacon': 'OFF',
+    'fantray_status': 'GREEN',
+    'line_card': {
+        1: {
+            'beacon': 'OFF',
+            'number_of_ports_in_status': 68,
+            'port_led_status': {
+                'FiftyGigE1/0/1': 'OFF',
+                'FiftyGigE1/0/10': 'AMBER',
+                'FiftyGigE1/0/11': 'OFF',
+                'FiftyGigE1/0/12': 'OFF',
+                'FiftyGigE1/0/13': 'OFF',
+                'FiftyGigE1/0/14': 'OFF',
+                'FiftyGigE1/0/15': 'GREEN',
+                'FiftyGigE1/0/16': 'AMBER',
+                'FiftyGigE1/0/17': 'OFF',
+                'FiftyGigE1/0/18': 'OFF',
+                'FiftyGigE1/0/19': 'GREEN',
+                'FiftyGigE1/0/2': 'GREEN',
+                'FiftyGigE1/0/20': 'AMBER',
+                'FiftyGigE1/0/21': 'GREEN',
+                'FiftyGigE1/0/22': 'OFF',
+                'FiftyGigE1/0/23': 'OFF',
+                'FiftyGigE1/0/24': 'OFF',
+                'FiftyGigE1/0/25': 'OFF',
+                'FiftyGigE1/0/26': 'OFF',
+                'FiftyGigE1/0/27': 'OFF',
+                'FiftyGigE1/0/28': 'OFF',
+                'FiftyGigE1/0/29': 'OFF',
+                'FiftyGigE1/0/3': 'AMBER',
+                'FiftyGigE1/0/30': 'OFF',
+                'FiftyGigE1/0/31': 'OFF',
+                'FiftyGigE1/0/32': 'OFF',
+                'FiftyGigE1/0/33': 'OFF',
+                'FiftyGigE1/0/34': 'OFF',
+                'FiftyGigE1/0/35': 'OFF',
+                'FiftyGigE1/0/36': 'OFF',
+                'FiftyGigE1/0/37': 'OFF',
+                'FiftyGigE1/0/38': 'OFF',
+                'FiftyGigE1/0/39': 'OFF',
+                'FiftyGigE1/0/4': 'OFF',
+                'FiftyGigE1/0/40': 'OFF',
+                'FiftyGigE1/0/5': 'OFF',
+                'FiftyGigE1/0/6': 'OFF',
+                'FiftyGigE1/0/7': 'OFF',
+                'FiftyGigE1/0/8': 'OFF',
+                'FiftyGigE1/0/9': 'GREEN',
+                'FourHundredGigE1/0/43': 'GREEN',
+                'FourHundredGigE1/0/44': 'AMBER',
+                'TwoHundredGigabitEthernet1/0/41': 'OFF',
+                'TwoHundredGigabitEthernet1/0/42': 'OFF',
+            },
+            'status': 'GREEN',
+        },
+        2: {
+            'beacon': 'OFF',
+            'number_of_ports_in_status': 104,
+            'port_led_status': {
+                'FourHundredGigE2/0/27': 'GREEN',
+                'FourHundredGigE2/0/31': 'AMBER',
+                'HundredGigE2/0/1': 'OFF',
+                'HundredGigE2/0/10': 'OFF',
+                'HundredGigE2/0/11': 'OFF',
+                'HundredGigE2/0/12': 'OFF',
+                'HundredGigE2/0/13': 'OFF',
+                'HundredGigE2/0/14': 'OFF',
+                'HundredGigE2/0/15': 'OFF',
+                'HundredGigE2/0/16': 'OFF',
+                'HundredGigE2/0/17': 'OFF',
+                'HundredGigE2/0/18': 'OFF',
+                'HundredGigE2/0/19': 'OFF',
+                'HundredGigE2/0/2': 'OFF',
+                'HundredGigE2/0/20': 'OFF',
+                'HundredGigE2/0/21': 'OFF',
+                'HundredGigE2/0/22': 'OFF',
+                'HundredGigE2/0/23': 'OFF',
+                'HundredGigE2/0/24': 'OFF',
+                'HundredGigE2/0/25': 'OFF',
+                'HundredGigE2/0/26': 'OFF',
+                'HundredGigE2/0/28': 'OFF',
+                'HundredGigE2/0/29': 'OFF',
+                'HundredGigE2/0/3': 'OFF',
+                'HundredGigE2/0/30': 'OFF',
+                'HundredGigE2/0/32': 'OFF',
+                'HundredGigE2/0/4': 'GREEN',
+                'HundredGigE2/0/5': 'AMBER',
+                'HundredGigE2/0/6': 'OFF',
+                'HundredGigE2/0/7': 'OFF',
+                'HundredGigE2/0/8': 'OFF',
+                'HundredGigE2/0/9': 'OFF',
+            },
+            'status': 'GREEN',
+        },
+        5: {
+            'beacon': 'OFF',
+            'number_of_ports_in_status': 48,
+            'port_led_status': {
+                'FiftyGigE5/0/1': 'GREEN',
+                'FiftyGigE5/0/10': 'OFF',
+                'FiftyGigE5/0/11': 'OFF',
+                'FiftyGigE5/0/12': 'OFF',
+                'FiftyGigE5/0/13': 'OFF',
+                'FiftyGigE5/0/14': 'OFF',
+                'FiftyGigE5/0/15': 'OFF',
+                'FiftyGigE5/0/16': 'OFF',
+                'FiftyGigE5/0/17': 'OFF',
+                'FiftyGigE5/0/18': 'OFF',
+                'FiftyGigE5/0/19': 'OFF',
+                'FiftyGigE5/0/2': 'AMBER',
+                'FiftyGigE5/0/20': 'OFF',
+                'FiftyGigE5/0/21': 'OFF',
+                'FiftyGigE5/0/22': 'OFF',
+                'FiftyGigE5/0/23': 'OFF',
+                'FiftyGigE5/0/24': 'OFF',
+                'FiftyGigE5/0/25': 'OFF',
+                'FiftyGigE5/0/26': 'OFF',
+                'FiftyGigE5/0/27': 'OFF',
+                'FiftyGigE5/0/28': 'OFF',
+                'FiftyGigE5/0/29': 'OFF',
+                'FiftyGigE5/0/3': 'AMBER',
+                'FiftyGigE5/0/30': 'OFF',
+                'FiftyGigE5/0/31': 'OFF',
+                'FiftyGigE5/0/32': 'OFF',
+                'FiftyGigE5/0/33': 'OFF',
+                'FiftyGigE5/0/34': 'OFF',
+                'FiftyGigE5/0/35': 'OFF',
+                'FiftyGigE5/0/36': 'OFF',
+                'FiftyGigE5/0/37': 'OFF',
+                'FiftyGigE5/0/38': 'OFF',
+                'FiftyGigE5/0/39': 'OFF',
+                'FiftyGigE5/0/4': 'OFF',
+                'FiftyGigE5/0/40': 'OFF',
+                'FiftyGigE5/0/41': 'OFF',
+                'FiftyGigE5/0/42': 'OFF',
+                'FiftyGigE5/0/43': 'OFF',
+                'FiftyGigE5/0/44': 'OFF',
+                'FiftyGigE5/0/45': 'OFF',
+                'FiftyGigE5/0/46': 'OFF',
+                'FiftyGigE5/0/47': 'OFF',
+                'FiftyGigE5/0/48': 'OFF',
+                'FiftyGigE5/0/5': 'GREEN',
+                'FiftyGigE5/0/6': 'AMBER',
+                'FiftyGigE5/0/7': 'GREEN',
+                'FiftyGigE5/0/8': 'AMBER',
+                'FiftyGigE5/0/9': 'OFF',
+            },
+            'status': 'GREEN',
+        },
+        6: {
+            'beacon': 'OFF',
+            'number_of_ports_in_status': 68,
+            'port_led_status': {
+                'FiftyGigE6/0/1': 'OFF',
+                'FiftyGigE6/0/10': 'OFF',
+                'FiftyGigE6/0/11': 'OFF',
+                'FiftyGigE6/0/12': 'OFF',
+                'FiftyGigE6/0/13': 'OFF',
+                'FiftyGigE6/0/14': 'OFF',
+                'FiftyGigE6/0/15': 'OFF',
+                'FiftyGigE6/0/16': 'OFF',
+                'FiftyGigE6/0/17': 'OFF',
+                'FiftyGigE6/0/18': 'OFF',
+                'FiftyGigE6/0/19': 'OFF',
+                'FiftyGigE6/0/2': 'OFF',
+                'FiftyGigE6/0/20': 'OFF',
+                'FiftyGigE6/0/21': 'OFF',
+                'FiftyGigE6/0/22': 'OFF',
+                'FiftyGigE6/0/23': 'OFF',
+                'FiftyGigE6/0/24': 'OFF',
+                'FiftyGigE6/0/25': 'GREEN',
+                'FiftyGigE6/0/26': 'OFF',
+                'FiftyGigE6/0/27': 'OFF',
+                'FiftyGigE6/0/28': 'OFF',
+                'FiftyGigE6/0/29': 'OFF',
+                'FiftyGigE6/0/3': 'OFF',
+                'FiftyGigE6/0/30': 'OFF',
+                'FiftyGigE6/0/31': 'OFF',
+                'FiftyGigE6/0/32': 'OFF',
+                'FiftyGigE6/0/33': 'OFF',
+                'FiftyGigE6/0/34': 'OFF',
+                'FiftyGigE6/0/35': 'OFF',
+                'FiftyGigE6/0/36': 'OFF',
+                'FiftyGigE6/0/37': 'OFF',
+                'FiftyGigE6/0/38': 'OFF',
+                'FiftyGigE6/0/39': 'OFF',
+                'FiftyGigE6/0/4': 'OFF',
+                'FiftyGigE6/0/40': 'OFF',
+                'FiftyGigE6/0/41': 'OFF',
+                'FiftyGigE6/0/42': 'OFF',
+                'FiftyGigE6/0/43': 'OFF',
+                'FiftyGigE6/0/44': 'OFF',
+                'FiftyGigE6/0/45': 'OFF',
+                'FiftyGigE6/0/46': 'OFF',
+                'FiftyGigE6/0/47': 'OFF',
+                'FiftyGigE6/0/48': 'OFF',
+                'FiftyGigE6/0/49': 'OFF',
+                'FiftyGigE6/0/5': 'OFF',
+                'FiftyGigE6/0/50': 'OFF',
+                'FiftyGigE6/0/51': 'OFF',
+                'FiftyGigE6/0/52': 'OFF',
+                'FiftyGigE6/0/53': 'OFF',
+                'FiftyGigE6/0/54': 'OFF',
+                'FiftyGigE6/0/55': 'OFF',
+                'FiftyGigE6/0/56': 'OFF',
+                'FiftyGigE6/0/6': 'OFF',
+                'FiftyGigE6/0/7': 'OFF',
+                'FiftyGigE6/0/8': 'OFF',
+                'FiftyGigE6/0/9': 'OFF',
+                'HundredGigE6/0/57': 'OFF',
+                'HundredGigE6/0/58': 'OFF',
+                'HundredGigE6/0/59': 'OFF',
+                'HundredGigE6/0/60': 'OFF',
+            },
+            'status': 'GREEN',
+        },
+    },
+    'model': 'C9606R',
+    'supervisor': {
+        'active': {
+            'active': 'GREEN',
+            'beacon': 'OFF',
+            'slot': 4,
+            'status': 'GREEN',
+            'system': 'GREEN',
+        },
+        'standby': {
+            'beacon': 'The standby Route-Processor is currently offline',
+            'slot': 3,
+        },
+    },
+    'system': 'GREEN',
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..646284bfca
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output1_output.txt
@@ -0,0 +1,44 @@
+SWITCH: C9606R
+SYSTEM: GREEN
+
+Line Card : 1 
+PORT STATUS: (68) Fif1/0/1:OFF Fif1/0/2:GREEN Fif1/0/3:AMBER Fif1/0/4:OFF Fif1/0/5:OFF Fif1/0/6:OFF Fif1/0/7:OFF Fif1/0/8:OFF Fif1/0/9:GREEN Fif1/0/10:AMBER Fif1/0/11:OFF Fif1/0/12:OFF Fif1/0/13:OFF Fif1/0/14:OFF Fif1/0/15:GREEN Fif1/0/16:AMBER Fif1/0/17:OFF Fif1/0/18:OFF Fif1/0/19:GREEN Fif1/0/20:AMBER Fif1/0/21:GREEN Fif1/0/22:OFF Fif1/0/23:OFF Fif1/0/24:OFF Fif1/0/25:OFF Fif1/0/26:OFF Fif1/0/27:OFF Fif1/0/28:OFF Fif1/0/29:OFF Fif1/0/30:OFF Fif1/0/31:OFF Fif1/0/32:OFF Fif1/0/33:OFF Fif1/0/34:OFF Fif1/0/35:OFF Fif1/0/36:OFF Fif1/0/37:OFF Fif1/0/38:OFF Fif1/0/39:OFF Fif1/0/40:OFF TwoH1/0/41:OFF TwoH1/0/42:OFF Fou1/0/43:GREEN Fou1/0/44:AMBER 
+BEACON: OFF
+STATUS: GREEN
+
+Line Card : 2 
+PORT STATUS: (104) Hu2/0/1:OFF Hu2/0/2:OFF Hu2/0/3:OFF Hu2/0/4:GREEN Hu2/0/5:AMBER Hu2/0/6:OFF Hu2/0/7:OFF Hu2/0/8:OFF Hu2/0/9:OFF Hu2/0/10:OFF Hu2/0/11:OFF Hu2/0/12:OFF Hu2/0/13:OFF Hu2/0/14:OFF Hu2/0/15:OFF Hu2/0/16:OFF Hu2/0/17:OFF Hu2/0/18:OFF Hu2/0/19:OFF Hu2/0/20:OFF Hu2/0/21:OFF Hu2/0/22:OFF Hu2/0/23:OFF Hu2/0/24:OFF Hu2/0/25:OFF Hu2/0/26:OFF Fou2/0/27:GREEN Hu2/0/28:OFF Hu2/0/29:OFF Hu2/0/30:OFF Fou2/0/31:AMBER Hu2/0/32:OFF 
+BEACON: OFF
+STATUS: GREEN
+
+MODULE: slot 3
+SUPERVISOR: STANDBY 
+PORT STATUS: (0) 
+BEACON: The standby Route-Processor is currently offline
+
+
+MODULE: slot 4
+SUPERVISOR: ACTIVE 
+PORT STATUS: (0) 
+BEACON: OFF
+STATUS: GREEN
+SYSTEM: GREEN
+ACTIVE: GREEN
+
+Line Card : 5 
+PORT STATUS: (48) Fif5/0/1:GREEN Fif5/0/2:AMBER Fif5/0/3:AMBER Fif5/0/4:OFF Fif5/0/5:GREEN Fif5/0/6:AMBER Fif5/0/7:GREEN Fif5/0/8:AMBER Fif5/0/9:OFF Fif5/0/10:OFF Fif5/0/11:OFF Fif5/0/12:OFF Fif5/0/13:OFF Fif5/0/14:OFF Fif5/0/15:OFF Fif5/0/16:OFF Fif5/0/17:OFF Fif5/0/18:OFF Fif5/0/19:OFF Fif5/0/20:OFF Fif5/0/21:OFF Fif5/0/22:OFF Fif5/0/23:OFF Fif5/0/24:OFF Fif5/0/25:OFF Fif5/0/26:OFF Fif5/0/27:OFF Fif5/0/28:OFF Fif5/0/29:OFF Fif5/0/30:OFF Fif5/0/31:OFF Fif5/0/32:OFF Fif5/0/33:OFF Fif5/0/34:OFF Fif5/0/35:OFF Fif5/0/36:OFF Fif5/0/37:OFF Fif5/0/38:OFF Fif5/0/39:OFF Fif5/0/40:OFF Fif5/0/41:OFF Fif5/0/42:OFF Fif5/0/43:OFF Fif5/0/44:OFF Fif5/0/45:OFF Fif5/0/46:OFF Fif5/0/47:OFF Fif5/0/48:OFF 
+BEACON: OFF
+STATUS: GREEN
+
+Line Card : 6 
+PORT STATUS: (68) Fif6/0/1:OFF Fif6/0/2:OFF Fif6/0/3:OFF Fif6/0/4:OFF Fif6/0/5:OFF Fif6/0/6:OFF Fif6/0/7:OFF Fif6/0/8:OFF Fif6/0/9:OFF Fif6/0/10:OFF Fif6/0/11:OFF Fif6/0/12:OFF Fif6/0/13:OFF Fif6/0/14:OFF Fif6/0/15:OFF Fif6/0/16:OFF Fif6/0/17:OFF Fif6/0/18:OFF Fif6/0/19:OFF Fif6/0/20:OFF Fif6/0/21:OFF Fif6/0/22:OFF Fif6/0/23:OFF Fif6/0/24:OFF Fif6/0/25:GREEN Fif6/0/26:OFF Fif6/0/27:OFF Fif6/0/28:OFF Fif6/0/29:OFF Fif6/0/30:OFF Fif6/0/31:OFF Fif6/0/32:OFF Fif6/0/33:OFF Fif6/0/34:OFF Fif6/0/35:OFF Fif6/0/36:OFF Fif6/0/37:OFF Fif6/0/38:OFF Fif6/0/39:OFF Fif6/0/40:OFF Fif6/0/41:OFF Fif6/0/42:OFF Fif6/0/43:OFF Fif6/0/44:OFF Fif6/0/45:OFF Fif6/0/46:OFF Fif6/0/47:OFF Fif6/0/48:OFF Fif6/0/49:OFF Fif6/0/50:OFF Fif6/0/51:OFF Fif6/0/52:OFF Fif6/0/53:OFF Fif6/0/54:OFF Fif6/0/55:OFF Fif6/0/56:OFF Hu6/0/57:OFF Hu6/0/58:OFF Hu6/0/59:OFF Hu6/0/60:OFF 
+BEACON: OFF
+STATUS: GREEN
+
+GigabitEthernet0/0 (MGMT): GREEN
+
+TenGigabitEthernet0/1 (SFP MGMT): OFF 
+
+TenGigabitEthernet0/2 (SFP MGMT): OFF 
+FANTRAY STATUS: GREEN
+FANTRAY BEACON: OFF
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..ea27245ec2
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_expected.py
@@ -0,0 +1,339 @@
+expected_output = {
+    'switch': {
+        1: {
+            'fantray_beacon': 'OFF',
+            'fantray_status': 'GREEN',
+            'line_card': {
+                1: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 48,
+                    'port_led_status': {
+                        'FiftyGigE1/1/0/1': 'AMBER',
+                        'FiftyGigE1/1/0/10': 'OFF',
+                        'FiftyGigE1/1/0/11': 'GREEN',
+                        'FiftyGigE1/1/0/12': 'OFF',
+                        'FiftyGigE1/1/0/13': 'OFF',
+                        'FiftyGigE1/1/0/14': 'OFF',
+                        'FiftyGigE1/1/0/15': 'OFF',
+                        'FiftyGigE1/1/0/16': 'OFF',
+                        'FiftyGigE1/1/0/17': 'OFF',
+                        'FiftyGigE1/1/0/18': 'GREEN',
+                        'FiftyGigE1/1/0/19': 'OFF',
+                        'FiftyGigE1/1/0/2': 'OFF',
+                        'FiftyGigE1/1/0/20': 'OFF',
+                        'FiftyGigE1/1/0/21': 'AMBER',
+                        'FiftyGigE1/1/0/22': 'OFF',
+                        'FiftyGigE1/1/0/23': 'OFF',
+                        'FiftyGigE1/1/0/24': 'OFF',
+                        'FiftyGigE1/1/0/25': 'GREEN',
+                        'FiftyGigE1/1/0/26': 'OFF',
+                        'FiftyGigE1/1/0/27': 'OFF',
+                        'FiftyGigE1/1/0/28': 'OFF',
+                        'FiftyGigE1/1/0/29': 'OFF',
+                        'FiftyGigE1/1/0/3': 'OFF',
+                        'FiftyGigE1/1/0/30': 'OFF',
+                        'FiftyGigE1/1/0/31': 'OFF',
+                        'FiftyGigE1/1/0/32': 'OFF',
+                        'FiftyGigE1/1/0/33': 'AMBER',
+                        'FiftyGigE1/1/0/34': 'OFF',
+                        'FiftyGigE1/1/0/35': 'OFF',
+                        'FiftyGigE1/1/0/36': 'OFF',
+                        'FiftyGigE1/1/0/37': 'OFF',
+                        'FiftyGigE1/1/0/38': 'OFF',
+                        'FiftyGigE1/1/0/39': 'AMBER',
+                        'FiftyGigE1/1/0/4': 'OFF',
+                        'FiftyGigE1/1/0/40': 'OFF',
+                        'FiftyGigE1/1/0/41': 'AMBER',
+                        'FiftyGigE1/1/0/42': 'OFF',
+                        'FiftyGigE1/1/0/43': 'GREEN',
+                        'FiftyGigE1/1/0/44': 'GREEN',
+                        'FiftyGigE1/1/0/45': 'OFF',
+                        'FiftyGigE1/1/0/46': 'OFF',
+                        'FiftyGigE1/1/0/47': 'GREEN',
+                        'FiftyGigE1/1/0/48': 'OFF',
+                        'FiftyGigE1/1/0/5': 'GREEN',
+                        'FiftyGigE1/1/0/6': 'OFF',
+                        'FiftyGigE1/1/0/7': 'OFF',
+                        'FiftyGigE1/1/0/8': 'OFF',
+                        'FiftyGigE1/1/0/9': 'OFF',
+                    },
+                    'status': 'GREEN',
+                },
+                2: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 104,
+                    'port_led_status': {
+                        'FourHundredGigE1/2/0/27': 'OFF',
+                        'FourHundredGigE1/2/0/31': 'OFF',
+                        'HundredGigE1/2/0/1': 'AMBER',
+                        'HundredGigE1/2/0/10': 'OFF',
+                        'HundredGigE1/2/0/11': 'GREEN',
+                        'HundredGigE1/2/0/12': 'OFF',
+                        'HundredGigE1/2/0/13': 'OFF',
+                        'HundredGigE1/2/0/14': 'OFF',
+                        'HundredGigE1/2/0/15': 'OFF',
+                        'HundredGigE1/2/0/16': 'OFF',
+                        'HundredGigE1/2/0/17': 'OFF',
+                        'HundredGigE1/2/0/18': 'OFF',
+                        'HundredGigE1/2/0/19': 'OFF',
+                        'HundredGigE1/2/0/2': 'OFF',
+                        'HundredGigE1/2/0/20': 'OFF',
+                        'HundredGigE1/2/0/21': 'OFF',
+                        'HundredGigE1/2/0/22': 'OFF',
+                        'HundredGigE1/2/0/23': 'OFF',
+                        'HundredGigE1/2/0/24': 'OFF',
+                        'HundredGigE1/2/0/25': 'OFF',
+                        'HundredGigE1/2/0/26': 'OFF',
+                        'HundredGigE1/2/0/28': 'OFF',
+                        'HundredGigE1/2/0/29': 'OFF',
+                        'HundredGigE1/2/0/3': 'OFF',
+                        'HundredGigE1/2/0/30': 'OFF',
+                        'HundredGigE1/2/0/32': 'OFF',
+                        'HundredGigE1/2/0/4': 'OFF',
+                        'HundredGigE1/2/0/5': 'OFF',
+                        'HundredGigE1/2/0/6': 'OFF',
+                        'HundredGigE1/2/0/7': 'OFF',
+                        'HundredGigE1/2/0/8': 'OFF',
+                        'HundredGigE1/2/0/9': 'OFF',
+                    },
+                    'status': 'GREEN',
+                },
+                5: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 72,
+                    'port_led_status': {
+                        'HundredGigE1/5/0/1': 'OFF',
+                        'HundredGigE1/5/0/10': 'OFF',
+                        'HundredGigE1/5/0/11': 'OFF',
+                        'HundredGigE1/5/0/12': 'GREEN',
+                        'HundredGigE1/5/0/13': 'OFF',
+                        'HundredGigE1/5/0/14': 'OFF',
+                        'HundredGigE1/5/0/15': 'OFF',
+                        'HundredGigE1/5/0/16': 'OFF',
+                        'HundredGigE1/5/0/17': 'GREEN',
+                        'HundredGigE1/5/0/18': 'OFF',
+                        'HundredGigE1/5/0/19': 'AMBER',
+                        'HundredGigE1/5/0/2': 'OFF',
+                        'HundredGigE1/5/0/20': 'OFF',
+                        'HundredGigE1/5/0/21': 'OFF',
+                        'HundredGigE1/5/0/22': 'OFF',
+                        'HundredGigE1/5/0/23': 'AMBER',
+                        'HundredGigE1/5/0/24': 'OFF',
+                        'HundredGigE1/5/0/3': 'OFF',
+                        'HundredGigE1/5/0/4': 'OFF',
+                        'HundredGigE1/5/0/5': 'AMBER',
+                        'HundredGigE1/5/0/6': 'OFF',
+                        'HundredGigE1/5/0/7': 'OFF',
+                        'HundredGigE1/5/0/8': 'OFF',
+                        'HundredGigE1/5/0/9': 'GREEN',
+                    },
+                    'status': 'GREEN',
+                },
+            },
+            'model': 'C9606R',
+            'supervisor': {
+                'active': {
+                    'active': 'GREEN',
+                    'beacon': 'OFF',
+                    'slot': 3,
+                    'status': 'GREEN',
+                    'system': 'Yellow',
+                },
+            },
+            'system': 'GREEN',
+        },
+        2: {
+            'fantray_beacon': 'OFF',
+            'fantray_status': 'GREEN',
+            'line_card': {
+                1: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 48,
+                    'port_led_status': {
+                        'FiftyGigE2/1/0/1': 'GREEN',
+                        'FiftyGigE2/1/0/10': 'OFF',
+                        'FiftyGigE2/1/0/11': 'OFF',
+                        'FiftyGigE2/1/0/12': 'OFF',
+                        'FiftyGigE2/1/0/13': 'OFF',
+                        'FiftyGigE2/1/0/14': 'OFF',
+                        'FiftyGigE2/1/0/15': 'OFF',
+                        'FiftyGigE2/1/0/16': 'OFF',
+                        'FiftyGigE2/1/0/17': 'GREEN',
+                        'FiftyGigE2/1/0/18': 'OFF',
+                        'FiftyGigE2/1/0/19': 'OFF',
+                        'FiftyGigE2/1/0/2': 'OFF',
+                        'FiftyGigE2/1/0/20': 'OFF',
+                        'FiftyGigE2/1/0/21': 'OFF',
+                        'FiftyGigE2/1/0/22': 'OFF',
+                        'FiftyGigE2/1/0/23': 'AMBER',
+                        'FiftyGigE2/1/0/24': 'AMBER',
+                        'FiftyGigE2/1/0/25': 'OFF',
+                        'FiftyGigE2/1/0/26': 'OFF',
+                        'FiftyGigE2/1/0/27': 'OFF',
+                        'FiftyGigE2/1/0/28': 'OFF',
+                        'FiftyGigE2/1/0/29': 'OFF',
+                        'FiftyGigE2/1/0/3': 'OFF',
+                        'FiftyGigE2/1/0/30': 'OFF',
+                        'FiftyGigE2/1/0/31': 'OFF',
+                        'FiftyGigE2/1/0/32': 'GREEN',
+                        'FiftyGigE2/1/0/33': 'AMBER',
+                        'FiftyGigE2/1/0/34': 'OFF',
+                        'FiftyGigE2/1/0/35': 'OFF',
+                        'FiftyGigE2/1/0/36': 'OFF',
+                        'FiftyGigE2/1/0/37': 'GREEN',
+                        'FiftyGigE2/1/0/38': 'OFF',
+                        'FiftyGigE2/1/0/39': 'OFF',
+                        'FiftyGigE2/1/0/4': 'OFF',
+                        'FiftyGigE2/1/0/40': 'OFF',
+                        'FiftyGigE2/1/0/41': 'AMBER',
+                        'FiftyGigE2/1/0/42': 'OFF',
+                        'FiftyGigE2/1/0/43': 'GREEN',
+                        'FiftyGigE2/1/0/44': 'GREEN',
+                        'FiftyGigE2/1/0/45': 'OFF',
+                        'FiftyGigE2/1/0/46': 'OFF',
+                        'FiftyGigE2/1/0/47': 'GREEN',
+                        'FiftyGigE2/1/0/48': 'OFF',
+                        'FiftyGigE2/1/0/5': 'GREEN',
+                        'FiftyGigE2/1/0/6': 'OFF',
+                        'FiftyGigE2/1/0/7': 'OFF',
+                        'FiftyGigE2/1/0/8': 'OFF',
+                        'FiftyGigE2/1/0/9': 'GREEN',
+                    },
+                    'status': 'GREEN',
+                },
+                2: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 68,
+                    'port_led_status': {
+                        'FiftyGigE2/2/0/1': 'OFF',
+                        'FiftyGigE2/2/0/10': 'OFF',
+                        'FiftyGigE2/2/0/11': 'OFF',
+                        'FiftyGigE2/2/0/12': 'OFF',
+                        'FiftyGigE2/2/0/13': 'OFF',
+                        'FiftyGigE2/2/0/14': 'OFF',
+                        'FiftyGigE2/2/0/15': 'OFF',
+                        'FiftyGigE2/2/0/16': 'OFF',
+                        'FiftyGigE2/2/0/17': 'OFF',
+                        'FiftyGigE2/2/0/18': 'OFF',
+                        'FiftyGigE2/2/0/19': 'OFF',
+                        'FiftyGigE2/2/0/2': 'OFF',
+                        'FiftyGigE2/2/0/20': 'GREEN',
+                        'FiftyGigE2/2/0/21': 'OFF',
+                        'FiftyGigE2/2/0/22': 'OFF',
+                        'FiftyGigE2/2/0/23': 'OFF',
+                        'FiftyGigE2/2/0/24': 'OFF',
+                        'FiftyGigE2/2/0/25': 'OFF',
+                        'FiftyGigE2/2/0/26': 'OFF',
+                        'FiftyGigE2/2/0/27': 'OFF',
+                        'FiftyGigE2/2/0/28': 'OFF',
+                        'FiftyGigE2/2/0/29': 'OFF',
+                        'FiftyGigE2/2/0/3': 'OFF',
+                        'FiftyGigE2/2/0/30': 'OFF',
+                        'FiftyGigE2/2/0/31': 'OFF',
+                        'FiftyGigE2/2/0/32': 'OFF',
+                        'FiftyGigE2/2/0/33': 'OFF',
+                        'FiftyGigE2/2/0/34': 'OFF',
+                        'FiftyGigE2/2/0/35': 'OFF',
+                        'FiftyGigE2/2/0/36': 'OFF',
+                        'FiftyGigE2/2/0/37': 'OFF',
+                        'FiftyGigE2/2/0/38': 'OFF',
+                        'FiftyGigE2/2/0/39': 'OFF',
+                        'FiftyGigE2/2/0/4': 'OFF',
+                        'FiftyGigE2/2/0/40': 'OFF',
+                        'FiftyGigE2/2/0/5': 'OFF',
+                        'FiftyGigE2/2/0/6': 'OFF',
+                        'FiftyGigE2/2/0/7': 'OFF',
+                        'FiftyGigE2/2/0/8': 'OFF',
+                        'FiftyGigE2/2/0/9': 'OFF',
+                        'FourHundredGigE2/2/0/43': 'GREEN',
+                        'FourHundredGigE2/2/0/44': 'OFF',
+                        'TwoHundredGigabitEthernet2/2/0/41': 'OFF',
+                        'TwoHundredGigabitEthernet2/2/0/42': 'OFF',
+                    },
+                    'status': 'GREEN',
+                },
+                5: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 104,
+                    'port_led_status': {
+                        'FourHundredGigE2/5/0/27': 'OFF',
+                        'FourHundredGigE2/5/0/31': 'OFF',
+                        'HundredGigE2/5/0/1': 'AMBER',
+                        'HundredGigE2/5/0/10': 'OFF',
+                        'HundredGigE2/5/0/11': 'OFF',
+                        'HundredGigE2/5/0/12': 'OFF',
+                        'HundredGigE2/5/0/13': 'OFF',
+                        'HundredGigE2/5/0/14': 'OFF',
+                        'HundredGigE2/5/0/15': 'OFF',
+                        'HundredGigE2/5/0/16': 'OFF',
+                        'HundredGigE2/5/0/17': 'OFF',
+                        'HundredGigE2/5/0/18': 'OFF',
+                        'HundredGigE2/5/0/19': 'OFF',
+                        'HundredGigE2/5/0/2': 'OFF',
+                        'HundredGigE2/5/0/20': 'OFF',
+                        'HundredGigE2/5/0/21': 'OFF',
+                        'HundredGigE2/5/0/22': 'OFF',
+                        'HundredGigE2/5/0/23': 'OFF',
+                        'HundredGigE2/5/0/24': 'OFF',
+                        'HundredGigE2/5/0/25': 'OFF',
+                        'HundredGigE2/5/0/26': 'OFF',
+                        'HundredGigE2/5/0/28': 'OFF',
+                        'HundredGigE2/5/0/29': 'OFF',
+                        'HundredGigE2/5/0/3': 'GREEN',
+                        'HundredGigE2/5/0/30': 'OFF',
+                        'HundredGigE2/5/0/32': 'OFF',
+                        'HundredGigE2/5/0/4': 'OFF',
+                        'HundredGigE2/5/0/5': 'GREEN',
+                        'HundredGigE2/5/0/6': 'OFF',
+                        'HundredGigE2/5/0/7': 'OFF',
+                        'HundredGigE2/5/0/8': 'OFF',
+                        'HundredGigE2/5/0/9': 'OFF',
+                    },
+                    'status': 'GREEN',
+                },
+                6: {
+                    'beacon': 'OFF',
+                    'number_of_ports_in_status': 72,
+                    'port_led_status': {
+                        'HundredGigE2/6/0/1': 'OFF',
+                        'HundredGigE2/6/0/10': 'OFF',
+                        'HundredGigE2/6/0/11': 'OFF',
+                        'HundredGigE2/6/0/12': 'OFF',
+                        'HundredGigE2/6/0/13': 'AMBER',
+                        'HundredGigE2/6/0/14': 'OFF',
+                        'HundredGigE2/6/0/15': 'OFF',
+                        'HundredGigE2/6/0/16': 'OFF',
+                        'HundredGigE2/6/0/17': 'OFF',
+                        'HundredGigE2/6/0/18': 'OFF',
+                        'HundredGigE2/6/0/19': 'OFF',
+                        'HundredGigE2/6/0/2': 'OFF',
+                        'HundredGigE2/6/0/20': 'OFF',
+                        'HundredGigE2/6/0/21': 'OFF',
+                        'HundredGigE2/6/0/22': 'OFF',
+                        'HundredGigE2/6/0/23': 'AMBER',
+                        'HundredGigE2/6/0/24': 'OFF',
+                        'HundredGigE2/6/0/3': 'OFF',
+                        'HundredGigE2/6/0/4': 'GREEN',
+                        'HundredGigE2/6/0/5': 'OFF',
+                        'HundredGigE2/6/0/6': 'OFF',
+                        'HundredGigE2/6/0/7': 'OFF',
+                        'HundredGigE2/6/0/8': 'OFF',
+                        'HundredGigE2/6/0/9': 'GREEN',
+                    },
+                    'status': 'GREEN',
+                },
+            },
+            'model': 'C9606R',
+            'supervisor': {
+                'standby': {
+                    'active': 'AMBER',
+                    'beacon': 'OFF',
+                    'slot': 3,
+                    'status': 'GREEN',
+                    'system': 'GREEN',
+                },
+            },
+            'system': 'GREEN',
+        },
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..029e3fbaca
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowHardwareLed/cli/equal/golden_output_output.txt
@@ -0,0 +1,67 @@
+Switch 1:
+SWITCH: C9606R
+SYSTEM: GREEN
+ 
+Line Card : 1
+PORT STATUS: (48) Fif1/1/0/1:AMBER Fif1/1/0/2:OFF Fif1/1/0/3:OFF Fif1/1/0/4:OFF Fif1/1/0/5:GREEN Fif1/1/0/6:OFF Fif1/1/0/7:OFF Fif1/1/0/8:OFF Fif1/1/0/9:OFF Fif1/1/0/10:OFF Fif1/1/0/11:GREEN Fif1/1/0/12:OFF Fif1/1/0/13:OFF Fif1/1/0/14:OFF Fif1/1/0/15:OFF Fif1/1/0/16:OFF Fif1/1/0/17:OFF Fif1/1/0/18:GREEN Fif1/1/0/19:OFF Fif1/1/0/20:OFF Fif1/1/0/21:AMBER Fif1/1/0/22:OFF Fif1/1/0/23:OFF Fif1/1/0/24:OFF Fif1/1/0/25:GREEN Fif1/1/0/26:OFF Fif1/1/0/27:OFF Fif1/1/0/28:OFF Fif1/1/0/29:OFF Fif1/1/0/30:OFF Fif1/1/0/31:OFF Fif1/1/0/32:OFF Fif1/1/0/33:AMBER Fif1/1/0/34:OFF Fif1/1/0/35:OFF Fif1/1/0/36:OFF Fif1/1/0/37:OFF Fif1/1/0/38:OFF Fif1/1/0/39:AMBER Fif1/1/0/40:OFF Fif1/1/0/41:AMBER Fif1/1/0/42:OFF Fif1/1/0/43:GREEN Fif1/1/0/44:GREEN Fif1/1/0/45:OFF Fif1/1/0/46:OFF Fif1/1/0/47:GREEN Fif1/1/0/48:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+Line Card : 2
+PORT STATUS: (104) Hu1/2/0/1:AMBER Hu1/2/0/2:OFF Hu1/2/0/3:OFF Hu1/2/0/4:OFF Hu1/2/0/5:OFF Hu1/2/0/6:OFF Hu1/2/0/7:OFF Hu1/2/0/8:OFF Hu1/2/0/9:OFF Hu1/2/0/10:OFF Hu1/2/0/11:GREEN Hu1/2/0/12:OFF Hu1/2/0/13:OFF Hu1/2/0/14:OFF Hu1/2/0/15:OFF Hu1/2/0/16:OFF Hu1/2/0/17:OFF Hu1/2/0/18:OFF Hu1/2/0/19:OFF Hu1/2/0/20:OFF Hu1/2/0/21:OFF Hu1/2/0/22:OFF Hu1/2/0/23:OFF Hu1/2/0/24:OFF Hu1/2/0/25:OFF Hu1/2/0/26:OFF Fou1/2/0/27:OFF Hu1/2/0/28:OFF Hu1/2/0/29:OFF Hu1/2/0/30:OFF Fou1/2/0/31:OFF Hu1/2/0/32:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+MODULE: slot 3
+SUPERVISOR: ACTIVE
+PORT STATUS: (0)
+BEACON: OFF
+STATUS: GREEN
+SYSTEM: Yellow
+ACTIVE: GREEN
+ 
+Line Card : 5
+PORT STATUS: (72) Hu1/5/0/1:OFF Hu1/5/0/2:OFF Hu1/5/0/3:OFF Hu1/5/0/4:OFF Hu1/5/0/5:AMBER Hu1/5/0/6:OFF Hu1/5/0/7:OFF Hu1/5/0/8:OFF Hu1/5/0/9:GREEN Hu1/5/0/10:OFF Hu1/5/0/11:OFF Hu1/5/0/12:GREEN Hu1/5/0/13:OFF Hu1/5/0/14:OFF Hu1/5/0/15:OFF Hu1/5/0/16:OFF Hu1/5/0/17:GREEN Hu1/5/0/18:OFF Hu1/5/0/19:AMBER Hu1/5/0/20:OFF Hu1/5/0/21:OFF Hu1/5/0/22:OFF Hu1/5/0/23:AMBER Hu1/5/0/24:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+GigabitEthernet0/0 (MGMT): GREEN
+ 
+TenGigabitEthernet0/1 (SFP MGMT): OFF
+ 
+TenGigabitEthernet0/2 (SFP MGMT): OFF
+FANTRAY STATUS: GREEN
+FANTRAY BEACON: OFF
+Switch 2:
+SWITCH: C9606R
+SYSTEM: GREEN
+ 
+Line Card : 1
+PORT STATUS: (48) Fif2/1/0/1:GREEN Fif2/1/0/2:OFF Fif2/1/0/3:OFF Fif2/1/0/4:OFF Fif2/1/0/5:GREEN Fif2/1/0/6:OFF Fif2/1/0/7:OFF Fif2/1/0/8:OFF Fif2/1/0/9:GREEN Fif2/1/0/10:OFF Fif2/1/0/11:OFF Fif2/1/0/12:OFF Fif2/1/0/13:OFF Fif2/1/0/14:OFF Fif2/1/0/15:OFF Fif2/1/0/16:OFF Fif2/1/0/17:GREEN Fif2/1/0/18:OFF Fif2/1/0/19:OFF Fif2/1/0/20:OFF Fif2/1/0/21:OFF Fif2/1/0/22:OFF Fif2/1/0/23:AMBER Fif2/1/0/24:AMBER Fif2/1/0/25:OFF Fif2/1/0/26:OFF Fif2/1/0/27:OFF Fif2/1/0/28:OFF Fif2/1/0/29:OFF Fif2/1/0/30:OFF Fif2/1/0/31:OFF Fif2/1/0/32:GREEN Fif2/1/0/33:AMBER Fif2/1/0/34:OFF Fif2/1/0/35:OFF Fif2/1/0/36:OFF Fif2/1/0/37:GREEN Fif2/1/0/38:OFF Fif2/1/0/39:OFF Fif2/1/0/40:OFF Fif2/1/0/41:AMBER Fif2/1/0/42:OFF Fif2/1/0/43:GREEN Fif2/1/0/44:GREEN Fif2/1/0/45:OFF Fif2/1/0/46:OFF Fif2/1/0/47:GREEN Fif2/1/0/48:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+Line Card : 2
+PORT STATUS: (68) Fif2/2/0/1:OFF Fif2/2/0/2:OFF Fif2/2/0/3:OFF Fif2/2/0/4:OFF Fif2/2/0/5:OFF Fif2/2/0/6:OFF Fif2/2/0/7:OFF Fif2/2/0/8:OFF Fif2/2/0/9:OFF Fif2/2/0/10:OFF Fif2/2/0/11:OFF Fif2/2/0/12:OFF Fif2/2/0/13:OFF Fif2/2/0/14:OFF Fif2/2/0/15:OFF Fif2/2/0/16:OFF Fif2/2/0/17:OFF Fif2/2/0/18:OFF Fif2/2/0/19:OFF Fif2/2/0/20:GREEN Fif2/2/0/21:OFF Fif2/2/0/22:OFF Fif2/2/0/23:OFF Fif2/2/0/24:OFF Fif2/2/0/25:OFF Fif2/2/0/26:OFF Fif2/2/0/27:OFF Fif2/2/0/28:OFF Fif2/2/0/29:OFF Fif2/2/0/30:OFF Fif2/2/0/31:OFF Fif2/2/0/32:OFF Fif2/2/0/33:OFF Fif2/2/0/34:OFF Fif2/2/0/35:OFF Fif2/2/0/36:OFF Fif2/2/0/37:OFF Fif2/2/0/38:OFF Fif2/2/0/39:OFF Fif2/2/0/40:OFF TwoH2/2/0/41:OFF TwoH2/2/0/42:OFF Fou2/2/0/43:GREEN Fou2/2/0/44:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+MODULE: slot 3
+SUPERVISOR: STANDBY
+PORT STATUS: (0)
+BEACON: OFF
+STATUS: GREEN
+SYSTEM: GREEN
+ACTIVE: AMBER
+ 
+Line Card : 5
+PORT STATUS: (104) Hu2/5/0/1:AMBER Hu2/5/0/2:OFF Hu2/5/0/3:GREEN Hu2/5/0/4:OFF Hu2/5/0/5:GREEN Hu2/5/0/6:OFF Hu2/5/0/7:OFF Hu2/5/0/8:OFF Hu2/5/0/9:OFF Hu2/5/0/10:OFF Hu2/5/0/11:OFF Hu2/5/0/12:OFF Hu2/5/0/13:OFF Hu2/5/0/14:OFF Hu2/5/0/15:OFF Hu2/5/0/16:OFF Hu2/5/0/17:OFF Hu2/5/0/18:OFF Hu2/5/0/19:OFF Hu2/5/0/20:OFF Hu2/5/0/21:OFF Hu2/5/0/22:OFF Hu2/5/0/23:OFF Hu2/5/0/24:OFF Hu2/5/0/25:OFF Hu2/5/0/26:OFF Fou2/5/0/27:OFF Hu2/5/0/28:OFF Hu2/5/0/29:OFF Hu2/5/0/30:OFF Fou2/5/0/31:OFF Hu2/5/0/32:OFF
+BEACON: OFF
+STATUS: GREEN
+ 
+Line Card : 6
+PORT STATUS: (72) Hu2/6/0/1:OFF Hu2/6/0/2:OFF Hu2/6/0/3:OFF Hu2/6/0/4:GREEN Hu2/6/0/5:OFF Hu2/6/0/6:OFF Hu2/6/0/7:OFF Hu2/6/0/8:OFF Hu2/6/0/9:GREEN Hu2/6/0/10:OFF Hu2/6/0/11:OFF Hu2/6/0/12:OFF Hu2/6/0/13:AMBER Hu2/6/0/14:OFF Hu2/6/0/15:OFF Hu2/6/0/16:OFF Hu2/6/0/17:OFF Hu2/6/0/18:OFF Hu2/6/0/19:OFF Hu2/6/0/20:OFF Hu2/6/0/21:OFF Hu2/6/0/22:OFF Hu2/6/0/23:AMBER Hu2/6/0/24:OFF
+BEACON: OFF
+STATUS: GREEN
+FANTRAY STATUS: GREEN
+FANTRAY BEACON: OFF
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..1d1c2f8b19
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_expected.py
@@ -0,0 +1,50 @@
+expected_output={
+    'Slice0': {
+        'egress_wide_direction': 'Wide',
+        'free0': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free0': 4542,
+        'inw_used0': 1,
+        'used0': 1,
+    },
+    'Slice1': {
+        'egress_wide_direction': 'Wide',
+        'free1': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free1': 4542,
+        'inw_used1': 1,
+        'used1': 1,
+    },
+    'Slice2': {
+        'egress_wide_direction': 'Wide',
+        'free2': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free2': 4514,
+        'inw_used2': 6,
+        'used2': 1,
+    },
+    'Slice3': {
+        'egress_wide_direction': 'Wide',
+        'free3': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free3': 4542,
+        'inw_used3': 1,
+        'used3': 1,
+    },
+    'Slice4': {
+        'egress_wide_direction': 'Wide',
+        'free4': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free4': 4542,
+        'inw_used4': 1,
+        'used4': 1,
+    },
+    'Slice5': {
+        'egress_wide_direction': 'Wide',
+        'free5': 4606,
+        'ingress_wide_direction': 'Wide',
+        'inw_free5': 4514,
+        'inw_used5': 6,
+        'used5': 1,
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..69c69f76e0
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output1_output.txt
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------------------------------------------------------
+***Number of TCAM entries shown under Free is for unidimensional scale. Using the TCAM for one of the feature will
+***change the available TCAM for other features in the same slice
+-------------------------------------------------------------------------------------------------------------------
+                                         Slice0       Slice1       Slice2       Slice3       Slice4       Slice5
+-------------------------------------------------------------------------------------------------------------------
+       Resource                        Used  Free   Used  Free   Used  Free   Used  Free   Used  Free   Used  Free
+-------------------------------------------------------------------------------------------------------------------
+IPv4 LPTS TCAM entries                   35  8638     35  8638     35  8610     35  8638     35  8638     35  8610
+IPv6 LPTS TCAM entries                   29  4542     29  4542     29  4514     29  4542     29  4542     29  4514
+Egress Narrow_Pool_0 TCAM entries         1  8702      1  8702      1  8702      1  8702      1  8702      1  8702
+Egress Wide TCAM entries                  1  4606      1  4606      1  4606      1  4606      1  4606      1  4606
+Ingress Narrow_Pool_0 TCAM entries        1  8638      1  8638     24  8610      1  8638      1  8638     24  8610
+Ingress Narrow_Pool_1 TCAM entries        0  8674      0  8674      0  8669      0  8674      0  8674      0  8669
+Ingress Wide TCAM entries                 1  4542      1  4542      6  4514      1  4542      1  4542      6  4514
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..d3138cfa37
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_expected.py
@@ -0,0 +1,50 @@
+expected_output={
+	'Slice0': {
+		'egress_wide_direction': 'Wide',
+		'used0': 1,
+		'free0': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used0': 1,
+		'inw_free0': 4542
+	},
+	'Slice1': {
+		'egress_wide_direction': 'Wide',
+		'used1': 1,
+		'free1': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used1': 1,
+		'inw_free1': 4542
+	},
+	'Slice2': {
+		'egress_wide_direction': 'Wide',
+		'used2': 1,
+		'free2': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used2': 6,
+		'inw_free2': 4514
+	},
+	'Slice3': {
+		'egress_wide_direction': 'Wide',
+		'used3': 1,
+		'free3': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used3': 1,
+		'inw_free3': 4542
+	},
+	'Slice4': {
+		'egress_wide_direction': 'Wide',
+		'used4': 1,
+		'free4': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used4': 1,
+		'inw_free4': 4542
+	},
+	'Slice5': {
+		'egress_wide_direction': 'Wide',
+		'used5': 1,
+		'free5': 4606,
+		'ingress_wide_direction': 'Wide',
+		'inw_used5': 6,
+		'inw_free5': 4514
+	}
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..69c69f76e0
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformFedActiveTcamUtilization/cli/equal/golden_output_output.txt
@@ -0,0 +1,15 @@
+-------------------------------------------------------------------------------------------------------------------
+***Number of TCAM entries shown under Free is for unidimensional scale. Using the TCAM for one of the feature will
+***change the available TCAM for other features in the same slice
+-------------------------------------------------------------------------------------------------------------------
+                                         Slice0       Slice1       Slice2       Slice3       Slice4       Slice5
+-------------------------------------------------------------------------------------------------------------------
+       Resource                        Used  Free   Used  Free   Used  Free   Used  Free   Used  Free   Used  Free
+-------------------------------------------------------------------------------------------------------------------
+IPv4 LPTS TCAM entries                   35  8638     35  8638     35  8610     35  8638     35  8638     35  8610
+IPv6 LPTS TCAM entries                   29  4542     29  4542     29  4514     29  4542     29  4542     29  4514
+Egress Narrow_Pool_0 TCAM entries         1  8702      1  8702      1  8702      1  8702      1  8702      1  8702
+Egress Wide TCAM entries                  1  4606      1  4606      1  4606      1  4606      1  4606      1  4606
+Ingress Narrow_Pool_0 TCAM entries        1  8638      1  8638     24  8610      1  8638      1  8638     24  8610
+Ingress Narrow_Pool_1 TCAM entries        0  8674      0  8674      0  8669      0  8674      0  8674      0  8669
+Ingress Wide TCAM entries                 1  4542      1  4542      6  4514      1  4542      1  4542      6  4514
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/empty/empty_output_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..867de26c91
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,198 @@
+expected_output =  {
+ "cg_name": {
+  "racl_permitv4_egress": {
+   "cg_id": 21,
+   "feature": "Racl",
+   "prot": "IPv4",
+   "region": "0x1006c0b8",
+   "dir": "Egress",
+   "sdk_handles": [
+    {
+     "asic": 0,
+     "oid": "0xA62"
+    }
+   ],
+   "seq": {
+    "10": {
+     "ipv4_src_value": "0x00000002",
+     "ipv4_src_mask": "0x000000ff",
+     "ipv4_dst_value": "0x00000002",
+     "ipv4_dst_mask": "0x000000ff",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "action": "PERMIT",
+     "logging": "NO_LOG"
+    },
+    "4294967295": {
+     "ipv4_src_value": "0x00000000",
+     "ipv4_src_mask": "0x00000000",
+     "ipv4_dst_value": "0x00000000",
+     "ipv4_dst_mask": "0x00000000",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "counter_handles": [
+      {
+       "asic": 0,
+       "oid": "0xA63"
+      }
+     ],
+     "action": "DENY",
+     "logging": "NONE"
+    }
+   }
+  },
+  "racl_permitv6_egress": {
+   "cg_id": 22,
+   "feature": "Racl",
+   "prot": "IPv6",
+   "region": "0x1005b4f8",
+   "dir": "Egress",
+   "sdk_handles": [
+    {
+     "asic": 0,
+     "oid": "0xA55"
+    }
+   ],
+   "seq": {
+    "50": {
+     "ipv6_src_value": "0x00100000.0x00000000.0x00000000.0x00000000",
+     "ipv6_src_mask": "0xffffffff.0xffffffff.0xffffffff.0xffffff00",
+     "ipv6_dst_value": "0x00300000.0x00000000.0x00000000.0x00000000",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "action": "PERMIT",
+     "logging": "NO_LOG"
+    },
+    "60": {
+     "ipv6_src_value": "0x00100000.0x00000000.0x00000000.0x00010000",
+     "ipv6_src_mask": "0xffffffff.0xffffffff.0xffffffff.0xffffff00",
+     "ipv6_dst_value": "0x00300000.0x00000000.0x00000000.0x00010000",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "counter_handles": [
+      {
+       "asic": 0,
+       "oid": "0xA5D"
+      }
+     ],
+     "action": "DENY",
+     "logging": "NO_LOG"
+    },
+    "70": {
+     "ipv6_src_value": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "ipv6_src_mask": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "ipv6_dst_value": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "proto": {
+      "value": "0xff",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "action": "PERMIT",
+     "logging": "NO_LOG"
+    },
+    "4294967295": {
+     "ipv6_src_value": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "ipv6_src_mask": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "ipv6_dst_value": "0x00000000.0x00000000.0x00000000.0x00000000",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "counter_handles": [
+      {
+       "asic": 0,
+       "oid": "0xA60"
+      }
+     ],
+     "action": "DENY",
+     "logging": "NONE"
+    }
+   }
+  }
+ }
+}
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..aa3078adcd
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,90 @@
+--------------------------------------------------------------
+         ACLs details (programmed in datapath)
+--------------------------------------------------------------
+
+[CG ID: 21]    CG Name: racl_permitv4_egress
+              Feature: Racl    Prot: IPv4
+              Region grp: 0x1006c0b8    Dir: Egress
+              SDK-handle(asic: 0, OID: 0xA62)
+
+    Seq Num:10
+        ipv4_src: value = 0x00000002       mask = 0x000000ff
+        ipv4_dst: value = 0x00000002       mask = 0x000000ff
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      v4_opt    src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:4294967295
+        ipv4_src: value = 0x00000000       mask = 0x00000000
+        ipv4_dst: value = 0x00000000       mask = 0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      v4_opt    src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Counter handle: (asic: 0 , OID: 0xA63 (0))
+    Result  action: DENY    Logging: NONE
+
+[CG ID: 22]    CG Name: racl_permitv6_egress
+              Feature: Racl    Prot: IPv6
+              Region grp: 0x1005b4f8    Dir: Egress
+              SDK-handle(asic: 0, OID: 0xA55)
+
+    Seq Num:50
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:60
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Counter handle: (asic: 0 , OID: 0xA5D (0))
+    Result  action: DENY    Logging: NO_LOG
+
+    Seq Num:70
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x59       0x0      0x0         0x0        0x0          0x0
+        M:  0xff       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:4294967295
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Counter handle: (asic: 0 , OID: 0xA60 (0))
+    Result  action: DENY    Logging: NONE
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..2773ff1d08
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,184 @@
+expected_output = {
+    'cg_name': {
+        'racl_permitv6_egress': {
+            'cg_id': 8,
+            'dir': 'Egress',
+            'feature': 'Racl',
+            'prot': 'IPv6',
+            'region': '0xa005f158',
+            'sdk_handles': [{'asic': 0, 'oid': '0x89D'}],
+            'seq': {
+                '10': {
+                    'action': 'DENY',
+                    'counter_handles': [{'asic': 0, 'oid': '0xA60'}],
+                    'ipv6_dst_value': '0x00300000.0x00000000.0x00000000.0x00010000',
+                    'ipv6_src_mask': '0xffffffff.0xffffffff.0xffffffff.0xffffff00',
+                    'ipv6_src_value': '0x00100000.0x00000000.0x00000000.0x00010000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+                '20': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00300000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0xffffffff.0xffffffff.0xffffffff.0xffffff00',
+                    'ipv6_src_value': '0x00100000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+                '30': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '40': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NO_LOG',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967293': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0xffff',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967294': {
+                    'action': 'PERMIT',
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0xffff',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0xff',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0xff',
+                        'value': '0x0',
+                    },
+                },
+                '4294967295': {
+                    'action': 'DENY',
+                    'counter_handles': [{'asic': 0, 'oid': '0xA69'}],
+                    'ipv6_dst_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_mask': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'ipv6_src_value': '0x00000000.0x00000000.0x00000000.0x00000000',
+                    'logging': 'NONE',
+                    'proto': {
+                        'dst_port': '0x0',
+                        'mask': '0x0',
+                        'src_port': '0x0',
+                        'tcp_flg': '0x0',
+                        'tcp_op': '0x0',
+                        'value': '0x0',
+                    },
+                    'tos': {
+                        'cos': '0x0',
+                        'dst_obj': '0x0',
+                        'mask': '0x0',
+                        'src_obj': '0x0',
+                        'ttl': '0x0',
+                        'v4_opt': '0x0',
+                        'value': '0x0',
+                    },
+                },
+            },
+        },
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..b8595f8c1d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,101 @@
+--------------------------------------------------------------
+         ACLs details (programmed in datapath)
+--------------------------------------------------------------
+
+[Racl, CG ID: 8]    CG Name: racl_permitv6_egress
+ Feature: Racl    Prot: IPv6
+ Region grp: 0xa005f158    Dir: Egress
+ SDK-handle(asic: 0, OID: 0x89D)
+
+    Seq Num:10
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00010000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+        Counter handle: (asic: 0 , OID: 0xA60 (0))
+    Result  action: DENY    Logging: NO_LOG
+
+    Seq Num:20
+        ipv6_src: value = 0x00100000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+        ipv6_dst: value = 0x00300000.0x00000000.0x00000000.0x00000000
+                   mask = 0xffffffff.0xffffffff.0xffffffff.0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:30
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x59       0x0      0x0         0x0        0x0          0x0
+        M:  0xff       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x59        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:40
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x0          0x0
+        M:  0xff       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:4294967293
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x87          0x0
+        M:  0xff       0x0      0x0         0x0        0xffff          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NONE
+
+    Seq Num:4294967294
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x3a       0x0      0x0         0x0        0x88          0x0
+        M:  0xff       0x0      0x0         0x0        0xffff          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x3a        0x0          0x0
+        M:  0x0       0x0      0x0         0xff        0x0          0x0
+    Result  action: PERMIT    Logging: NONE
+
+    Seq Num:4294967295
+        ipv6_src: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+        ipv6_dst: value = 0x00000000.0x00000000.0x00000000.0x00000000
+                   mask = 0x00000000.0x00000000.0x00000000.0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      ext_hdr   src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+        Counter handle: (asic: 0 , OID: 0xA69 (0))
+    Result  action: DENY    Logging: NONE
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_3_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_3_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_3_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..4d0249bc42
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_arguments.json
@@ -0,0 +1,3 @@
+{
+    "mode": "active"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..b62958b961
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_expected.py
@@ -0,0 +1,142 @@
+expected_output =  {
+ "cg_name": {
+  "racl_ingress": {
+   "cg_id": 8,
+   "feature": "Racl",
+   "prot": "IPv4",
+   "region": "0x2c0603d8",
+   "dir": "Ingress",
+   "sdk_handles": [
+    {
+     "asic": 0,
+     "oid": "0x44D"
+    },
+    {
+     "asic": 1,
+     "oid": "0x4BC"
+    },
+    {
+     "asic": 2,
+     "oid": "0x49A"
+    },
+    {
+     "asic": 3,
+     "oid": "0x470"
+    }
+   ],
+   "seq": {
+    "10": {
+     "ipv4_src_value": "0x78010500",
+     "ipv4_src_mask": "0xffffff00",
+     "ipv4_dst_value": "0x7a010502",
+     "ipv4_dst_mask": "0xffffffff",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "counter_handles": [
+      {
+       "asic": 0,
+       "oid": "0x577"
+      },
+      {
+       "asic": 1,
+       "oid": "0x5D2"
+      },
+      {
+       "asic": 2,
+       "oid": "0x5D2"
+      },
+      {
+       "asic": 3,
+       "oid": "0x570"
+      }
+     ],
+     "action": "DENY",
+     "logging": "NO_LOG"
+    },
+    "20": {
+     "ipv4_src_value": "0x78010100",
+     "ipv4_src_mask": "0xffffff00",
+     "ipv4_dst_value": "0x7a010100",
+     "ipv4_dst_mask": "0xffffff00",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "action": "PERMIT",
+     "logging": "NO_LOG"
+    },
+    "4294967295": {
+     "ipv4_src_value": "0x00000000",
+     "ipv4_src_mask": "0x00000000",
+     "ipv4_dst_value": "0x00000000",
+     "ipv4_dst_mask": "0x00000000",
+     "proto": {
+      "value": "0x0",
+      "mask": "0x0",
+      "tcp_flg": "0x0",
+      "tcp_op": "0x0",
+      "src_port": "0x0",
+      "dst_port": "0x0"
+     },
+     "tos": {
+      "value": "0x0",
+      "mask": "0x0",
+      "ttl": "0x0",
+      "cos": "0x0",
+      "v4_opt": "0x0",
+      "src_obj": "0x0",
+      "dst_obj": "0x0"
+     },
+     "counter_handles": [
+      {
+       "asic": 0,
+       "oid": "0x578"
+      },
+      {
+       "asic": 1,
+       "oid": "0x5D3"
+      },
+      {
+       "asic": 2,
+       "oid": "0x5D3"
+      },
+      {
+       "asic": 3,
+       "oid": "0x571"
+      }
+     ],
+     "action": "DENY",
+     "logging": "NONE"
+    }
+   }
+  }
+ }
+}
diff --git a/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..c5722a3361
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/cat9k/c9610/tests/ShowPlatformSoftwareFedActiveAclInfoDbDetail/cli/equal/golden_output_output.txt
@@ -0,0 +1,52 @@
+--------------------------------------------------------------
+         ACLs details (programmed in datapath)
+--------------------------------------------------------------
+
+[CG ID: 8]    CG Name: racl_ingress
+              Feature: Racl    Prot: IPv4
+              Region grp: 0x2c0603d8    Dir: Ingress
+              SDK-handle(asic: 0, OID: 0x44D)
+              SDK-handle(asic: 1, OID: 0x4BC)
+              SDK-handle(asic: 2, OID: 0x49A)
+              SDK-handle(asic: 3, OID: 0x470)
+
+    Seq Num:10
+        ipv4_src: value = 0x78010500       mask = 0xffffff00
+        ipv4_dst: value = 0x7a010502       mask = 0xffffffff
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      v4_opt    src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Counter handle: (asic: 0 , OID: 0x577 (0))
+    Counter handle: (asic: 1 , OID: 0x5D2 (0))
+    Counter handle: (asic: 2 , OID: 0x5D2 (0))
+    Counter handle: (asic: 3 , OID: 0x570 (0))
+    Result  action: DENY    Logging: NO_LOG
+
+    Seq Num:20
+        ipv4_src: value = 0x78010100       mask = 0xffffff00
+        ipv4_dst: value = 0x7a010100       mask = 0xffffff00
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      v4_opt    src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Result  action: PERMIT    Logging: NO_LOG
+
+    Seq Num:4294967295
+        ipv4_src: value = 0x00000000       mask = 0x00000000
+        ipv4_dst: value = 0x00000000       mask = 0x00000000
+            proto    frag    tcp_flg    tcp_op    src_port    dst_port
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+            tos      ttl       cos      v4_opt    src_obj     dst_obj
+        V:  0x0       0x0      0x0         0x0        0x0          0x0
+        M:  0x0       0x0      0x0         0x0        0x0          0x0
+    Counter handle: (asic: 0 , OID: 0x578 (0))
+    Counter handle: (asic: 1 , OID: 0x5D3 (0))
+    Counter handle: (asic: 2 , OID: 0x5D3 (0))
+    Counter handle: (asic: 3 , OID: 0x571 (0))
+    Result  action: DENY    Logging: NONE
diff --git a/src/genie/libs/parser/iosxe/rv1/show_lisp.py b/src/genie/libs/parser/iosxe/rv1/show_lisp.py
index 8cc0e5a1e1..974809dddd 100644
--- a/src/genie/libs/parser/iosxe/rv1/show_lisp.py
+++ b/src/genie/libs/parser/iosxe/rv1/show_lisp.py
@@ -190,6 +190,7 @@ def cli(self, service, instance_id, lisp_id=None, locator_table=None, output=Non
             out = output
 
         ret_dict = {}
+        database_count = 0
 
         state_dict = {
             'disabled': False,
@@ -1076,10 +1077,11 @@ def cli(self, service, instance_id, lisp_id=None, locator_table=None, output=Non
 
             # Database:                               0
             m = p60.match(line)
-            if m:
+            if m and database_count == 0:
                 group = m.groupdict()
                 database = int(group['database'])
                 publication_dict.update({'database':database})
+                database_count = 1
                 continue
 
             # Prefix-list:                            0
diff --git a/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_expected.py b/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_expected.py
index 1a2d0ac31b..f5a8865e4d 100644
--- a/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_expected.py
+++ b/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_expected.py
@@ -104,7 +104,7 @@
                     'publication_entries_exported': {
                         'map_cache': 3,
                         'rib': 3,
-                        'database': 0,
+                        'database': 4,
                         'prefix_list': 0
                     },
                     'site_reg_entries_exported': {
diff --git a/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_output.txt b/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_output.txt
index 3730a0da6a..34bb009c71 100644
--- a/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_output.txt
+++ b/src/genie/libs/parser/iosxe/rv1/tests/ShowLispInstanceIdService/cli/equal/golden_output5_output.txt
@@ -70,7 +70,7 @@
   Publication entries exported to:
     Map-cache:                              3
     RIB:                                    3
-    Database:                               0 (Preserve-priority: disabled)
+    Database:                               4 (Preserve-priority: disabled)
     Prefix-list:                            0
   Site-registeration entries exported to:
     Map-cache:                              0
diff --git a/src/genie/libs/parser/iosxe/show_ap.py b/src/genie/libs/parser/iosxe/show_ap.py
index 2071ce3e68..ba6e47de88 100644
--- a/src/genie/libs/parser/iosxe/show_ap.py
+++ b/src/genie/libs/parser/iosxe/show_ap.py
@@ -61,10 +61,17 @@ def cli(self, output=None):
         # AP002C.C862.E708  2      AIR-AP1815I-A-K9      002c.c862.e708  002c.c88a.fd20  default location    US    9.4.57.241    Registered
         if "Country Code" not in out and "Regulatory Domain" not in out:
             ap_neighbor_info_capture = re.compile(
-                   r"^(?P<ap_name>\S+)\s+(?P<slots_count>\d+)\s+(?P<ap_model>\S+)\s+" 
-                   "(?P<ethernet_mac>\S+)\s+(?P<radio_mac>\S+)\s+(?P<location>.*)\s+" 
-                   "(?P<country>\S+)\s+(?P<ap_ip_address>\d+\.\d+\.\d+\.\d+)\s+" 
-                   "(?P<state>(Registered))")
+                                                r"^(?P<ap_name>\S+)\s+"
+                                                r"(?P<slots_count>\d+)\s+"
+                                                r"(?P<ap_model>\S+)\s+"
+                                                r"(?P<ethernet_mac>\S+)\s+"
+                                                r"(?P<radio_mac>\S+)\s+"
+                                                r"(?P<location>.*?)\s+"
+                                                r"(?P<country>\S+)\s+"
+                                                r"(?P<ap_ip_address>(?:\d{1,3}\.){3}\d{1,3}|(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(?::[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+"
+                                                r"(?P<state>Registered)"
+        # regex changed for ap_ip_address to handle ipv4 and ipv6 address
+    )
         else:
             # For the new output
             # CC = Country Code
@@ -73,12 +80,20 @@ def cli(self, output=None):
             # AP Name                          Slots AP Model             Ethernet MAC   Radio MAC      CC   RD   IP Address                                State        Location
             # ---------------------------------------------------------------------------------------------------------------------------------------------------------------------
             # APF8B7.E2C4.1120                 2     AIR-AP1852I-B-K9     f8b7.e2c4.1120 f8b7.e2c4.9b60 US   -B   20.20.13.142                              Registered   default location
+            #AP002A.1087.CA0A                 2     AIR-AP2802E-D-K9     002a.1087.ca0a 00a2.eefd.9f20 IN   -D   2001:9:3:13:c822:82c8:32da:484d           Registered   default location
             ap_neighbor_info_capture = re.compile(
-                r"^(?P<ap_name>\S+)\s+(?P<slots_count>\d+)\s+(?P<ap_model>\S+)\s+"
-                "(?P<ethernet_mac>\S+)\s+(?P<radio_mac>\S+)\s+(?P<country>.*)\s+"
-                "(?P<regulatory_domain>\S+)\s+(?P<ap_ip_address>\d+\.\d+\.\d+\.\d+)\s+"
-                "(?P<state>(Registered))\s+(?P<location>.*)")
-
+                                                r"^(?P<ap_name>\S+)\s+"
+                                                r"(?P<slots_count>\d+)\s+"
+                                                r"(?P<ap_model>\S+)\s+"
+                                                r"(?P<ethernet_mac>\S+)\s+"
+                                                r"(?P<radio_mac>\S+)\s+"
+                                                r"(?P<country>.*?)\s+"
+                                                r"(?P<regulatory_domain>\S+)\s+"
+                                                r"(?P<ap_ip_address>(?:\d{1,3}\.){3}\d{1,3}|(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,7}:|(?:[0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,5}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){1,4}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){1,3}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){1,2}(?::[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:(?:(?::[0-9a-fA-F]{1,4}){1,6})|:(?:(?::[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(?::[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+"
+                                                r"(?P<state>Registered)\s+"
+                                                r"(?P<location>.*)"
+                                            )
+            # regex changed for ap_ip_address to handle ipv4 and ipv6 address
 
         remove_lines = ('AP Name', '----')
 
@@ -106,6 +121,7 @@ def filter_lines(raw_output, remove_lines):
                 ap_neighbor_count = int(groups['ap_neighbor_count'])
                 ap_summary_dict['ap_neighbor_count'] = ap_neighbor_count
             # a121-cap22                       2      9130AXI   a4b2.32ff.2db9  2c57.41ff.b979  Fab A  UK          10.6.33.106                               Registered
+            # AP002A.1087.CA0A                 2     AIR-AP2802E-D-K9     002a.1087.ca0a 00a2.eefd.9f20 IN   -D   2001:9:3:13:c822:82c8:32da:484d           Registered   default location
             elif ap_neighbor_info_capture.match(line):
                 ap_neighbor_info_match = ap_neighbor_info_capture.match(line)
                 groups = ap_neighbor_info_match.groupdict()
@@ -338,7 +354,7 @@ class ShowApDot115GhzChannelSchema(MetaParser):
             Optional("wlc_leader_ip"): str,
             Optional("wlc_leader_ipv4"): str,
             Optional("wlc_leader_ipv6"): str,
-            "last_run_seconds": int,
+            Optional("last_run_seconds"): int,
             "dca_level": str,
             Optional("dca_aggressive"): str,
             "dca_db": int,
@@ -406,7 +422,40 @@ def cli(self, output=None):
         #     Allowed Channel List                     : 36,40,44,48,149,153,157,161 
         #     Unused Channel List                      : 52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,144,165,169,173 
 
-        lead_auto_chan_assn_capture = re.compile(r"^Leader\s+Automatic\s+Channel\s+Assignment$")
+
+        #new o/p
+        # Local Automatic Channel Assignment
+        #     Channel Assignment Mode                    : AUTO
+        #     Channel Update Interval                    : 600 seconds
+        #     Anchor time (Hour of the day)              : 0
+        #     Channel Update Contribution
+        #         Noise                                    : Enable
+        #         Interference                             : Enable
+        #         Load                                     : Disable
+        #         Device Aware                             : Disable
+        #     CleanAir Event-driven RRM option           : Disabled
+        #     Zero Wait DFS                              : Disabled
+        #     Channel Assignment Leader                  : dao (9.3.100.10)
+
+        #     DCA Sensitivity Level                      : MEDIUM : 15 dB
+        #     DCA 802.11n/ac Channel Width               : best
+        #     DBS Max Channel Width                      : 40 MHz
+        #     DCA Minimum Energy Limit                   : -95 dBm
+        #     DCA Aggressive on startup                  : Enabled
+        #     Channel Energy Levels
+        #         Minimum                                  : -86 dBm
+        #         Average                                  : -84 dBm
+        #         Maximum                                  : -82 dBm
+        #     Channel Dwell Times
+        #         Minimum                                  : 12 hours 38 minutes 5 seconds 
+        #         Average                                  : 4 days 1 hour 16 minutes 37 seconds 
+        #         Maximum                                  : 15 days 9 hours 33 minutes 48 seconds 
+        #     802.11a 5 GHz Auto-RF Channel List
+        #         Allowed Channel List                     : 36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161
+        #         Unused Channel List                      : 165,169,173
+
+
+        lead_auto_chan_assn_capture = re.compile(r"^(Leader|Local)\s+Automatic\s+Channel\s+Assignment$") #changed regex to handle Local or Leader Automatic Channel Assigment key
         #   Channel Assignment Mode                    : AUTO
         chan_assn_mode_capture = re.compile(r"^Channel\s+Assignment\s+Mode\s+:\s+(?P<chan_assn_mode>\S+)")
         #   Channel Update Interval                    : 12 Hours
diff --git a/src/genie/libs/parser/iosxe/show_bgp.py b/src/genie/libs/parser/iosxe/show_bgp.py
index 304cc88f91..5f13736aa2 100755
--- a/src/genie/libs/parser/iosxe/show_bgp.py
+++ b/src/genie/libs/parser/iosxe/show_bgp.py
@@ -4880,7 +4880,7 @@ def cli(self, neighbor, address_family='', output=None):
         p3_2 = re.compile(r'^\s*(?P<status_codes>(s|x|S|d|h|\*|\>|\s)+)'
                             '(?P<path_type>(i|e|c|l|a|r|I))?(\s)?'
                             '(?P<prefix>(([0-9]+[\.][0-9]+[\.][0-9]+'
-                            '[\.][0-9]+[\/][0-9]+)|([a-zA-Z0-9]+[\:]'
+                            '[\.][0-9]+([\/][0-9]+)?)|([a-zA-Z0-9]+[\:]'
                             '[a-zA-Z0-9]+[\:][a-zA-Z0-9]+[\:]'
                             '[a-zA-Z0-9]+[\:][\:][\/][0-9]+)|'
                             '([a-zA-Z0-9]+[\:][a-zA-Z0-9]+[\:]'
diff --git a/src/genie/libs/parser/iosxe/show_cts.py b/src/genie/libs/parser/iosxe/show_cts.py
index 465acef7c0..6c24201031 100644
--- a/src/genie/libs/parser/iosxe/show_cts.py
+++ b/src/genie/libs/parser/iosxe/show_cts.py
@@ -2615,8 +2615,10 @@ class ShowCtsRoleBasedSgtMapAllSchema(MetaParser):
             Optional('total_sxp'): int,
             Optional('total_internal'): int,
             Optional('total_local'): int,
-            Optional('total_l3if'): int,
+            Optional('total_cached'): int,
+            Optional('total_l3if') : int,
             Optional('total_vlan'): int
+
         },
         Optional('ipv6_sgt_bindings'): {
             Any(): {
@@ -2629,7 +2631,8 @@ class ShowCtsRoleBasedSgtMapAllSchema(MetaParser):
             Optional('total_sxp'): int,
             Optional('total_internal'): int,
             Optional('total_local'): int,
-            Optional('total_l3if'): int,
+            Optional('total_cached'): int,
+            Optional('total_l3if') : int,
             Optional('total_vlan'): int
         }
     }
@@ -2670,7 +2673,6 @@ def cli(self, vrf='', output=None):
         # Total number of L3IF     bindings = 2
         # Total number of VLAN     bindings = 1
         p2 = re.compile(r'^Total\s+number\s+of\s+(?P<binding_type>(\S+))\s+bindings\s+=\s+(?P<binding_count>(\d+))$')
-
         for line in output.splitlines():
             line = line.strip()
 
diff --git a/src/genie/libs/parser/iosxe/show_device.py b/src/genie/libs/parser/iosxe/show_device.py
index 949ef9aeca..34eff3482b 100644
--- a/src/genie/libs/parser/iosxe/show_device.py
+++ b/src/genie/libs/parser/iosxe/show_device.py
@@ -19,9 +19,7 @@
 
 # Metaparser
 from genie.metaparser import MetaParser
-from genie.metaparser.util.schemaengine import Schema, \
-                                         Any, \
-                                         Default
+from genie.metaparser.util.schemaengine import Schema, Any, Or, Optional, Use, And, ListOf, Default
 
 # parser utils
 from genie.libs.parser.utils.common import Common
@@ -442,7 +440,3 @@ def cli(self, output=None):
                 continue
 
         return ret_dict
-
-
-        
-        
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/show_device_tracking.py b/src/genie/libs/parser/iosxe/show_device_tracking.py
index 23e624c3b5..a9c6a79992 100644
--- a/src/genie/libs/parser/iosxe/show_device_tracking.py
+++ b/src/genie/libs/parser/iosxe/show_device_tracking.py
@@ -2445,4 +2445,168 @@ def cli(self, interface='', match='', output=None):
                 count = int(groups['count'])
                 dict_count['count'] = count
 
-        return dict_count
\ No newline at end of file
+        return dict_count
+
+
+class ShowDeviceTrackingCapturePolicySchema(MetaParser):
+    """Schema for show device tracking capture policy """
+
+    schema = {
+        Optional("hw_policy_db"): {
+            Any(): {
+                "targets": int,
+                "targets_list": {
+                    Any(): {
+                        "type": int,
+                        "handle": str
+                    }
+                }
+            }
+        },
+        "target_db": {
+            Any(): {
+                "hw_policy_signature": str,
+                "policies": int,
+                "rules": int,
+                "sig": str,
+                "sw_policy": {
+                    "policy": str,
+                    "feature": str
+                },
+                "mask_id": {
+                    Any(): {
+                        "rule": str,
+                        "protocol": str,
+                        "mask": str,
+                        "action": str,
+                        "match1": int,
+                        "match2": int,
+                        "feat": str
+                    }
+                }
+            }
+        }
+    }
+
+class ShowDeviceTrackingCapturePolicy(ShowDeviceTrackingCapturePolicySchema):
+    """ show device-tracking capture-policy """
+    """ show device-tracking capture-policy interface {interface_name} """
+    """ show device-tracking capture-policy vlan {vlan_id} """
+
+    cli_command = [
+        'show device-tracking capture-policy',
+        'show device-tracking capture-policy interface {interface_name}',
+        'show device-tracking capture-policy vlan {vlan_id}'
+    ]
+
+    def cli(self, interface_name=None, vlan_id=None, output=None):
+        if output is None:
+            if interface_name:
+                cmd = self.cli_command[1].format(interface_name=interface_name)
+            elif vlan_id:
+                cmd = self.cli_command[2].format(vlan_id=vlan_id)
+            else:
+                cmd = self.cli_command[0]
+            
+            output = self.device.execute(cmd) 
+            
+        parsed_dict = {}
+
+        # HW Policy 0000039C #targets:2 
+        p1 = re.compile(r'^HW Policy (?P<policy_id>\w+) #targets:(?P<targets>\d+)$')
+        
+        # Target Gi1/0/4 type 0 handle 40B  
+        p2 = re.compile(r'^Target (?P<target>[\S\s]+?)\s+type (?P<type>\d+) handle (?P<handle>\S+)$')
+        
+        # HW Target Gi1/0/4 HW policy signature 0000039C policies#:2 rules#:6 sig 0000039C 
+        p3 = re.compile(r'^HW Target (?P<target>[\S\s]+?)\s+HW policy signature (?P<signature>\S+) policies#:(?P<policies>\d+) \S{1,7}\W{0,1}(?P<rules>\d+) sig (?P<sig>\S+)$')
+
+        # SW policy dhcp_client feature DHCP Guard  
+        p4 = re.compile(r'^SW policy (?P<policy>\S+) feature (?P<feature>.+)$')
+        
+        # Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546 #feat:1 feature DHCP Guard 
+        p5 = re.compile(r'^Rule (?P<rule>[\S\s]+?) Protocol (?P<protocol>\S+) mask (?P<mask>\S+) action (?P<action>\S+) match1 (?P<match1>\d+) match2 (?P<match2>\d+)\W{0,1}#feat:(?P<feat>\d+)$')
+
+        policy_id = None
+        current_target = None
+        current_policy = None
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # HW Policy 0000039C #targets:2
+            match = p1.match(line)
+            if match:
+                policy_id = match.group('policy_id')
+                targets = int(match.group('targets'))
+                parsed_dict.setdefault('hw_policy_db', {})[policy_id] = {
+                    'targets': targets,
+                    'targets_list': {}
+                }
+                continue
+                
+            # Target Gi1/0/4 type 0 handle 40B
+            match = p2.match(line)
+            if match:
+                target = match.group('target')
+                type_ = int(match.group('type'))
+                handle = match.group('handle')
+                if policy_id:
+                    parsed_dict['hw_policy_db'][policy_id]['targets_list'][target] = {
+                        'type': type_,
+                        'handle': handle
+                    }
+                continue
+
+            # HW Target Gi1/0/4 HW policy signature 0000039C policies#:2 rules#:6 sig 0000039C
+            match = p3.match(line)
+            if match:
+                current_target = match.group('target')
+                signature = match.group('signature')
+                policies = int(match.group('policies'))
+                rules = int(match.group('rules'))
+                sig = match.group('sig')
+                parsed_dict.setdefault('target_db', {})[current_target] = {
+                    'hw_policy_signature': signature,
+                    'policies': policies,
+                    'rules': rules,
+                    'sig': sig,
+                    'sw_policy': {}
+                }
+                continue
+
+            # SW policy dhcp_client feature DHCP Guard 
+            match = p4.match(line)
+            if match:
+                if current_target:
+                    policy = match.group('policy')
+                    feature = match.group('feature')
+                    parsed_dict['target_db'][current_target]['sw_policy'] = {
+                        'policy': policy,
+                        'feature': feature
+                    }
+                continue
+
+            # Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546 #feat:1 feature DHCP Guard 
+            match = p5.match(line)
+            if match:
+                if current_target:
+                    rule = match.group('rule')
+                    protocol = match.group('protocol')
+                    mask = match.group('mask')
+                    action = match.group('action')
+                    match1 = int(match.group('match1'))
+                    match2 = int(match.group('match2'))
+                    feat = match.group('feat')
+                    parsed_dict['target_db'][current_target].setdefault("mask_id", {})[mask] = {
+                        'rule': rule,
+                        'protocol': protocol,
+                        'mask': mask,
+                        'action': action,
+                        'match1': match1,
+                        'match2': match2,
+                        'feat': feat
+                    }
+                continue
+
+        return parsed_dict
diff --git a/src/genie/libs/parser/iosxe/show_hw.py b/src/genie/libs/parser/iosxe/show_hw.py
index 92a6459feb..e070f215f1 100644
--- a/src/genie/libs/parser/iosxe/show_hw.py
+++ b/src/genie/libs/parser/iosxe/show_hw.py
@@ -137,7 +137,7 @@ class ShowHardwareLedSchema(MetaParser):
     """
     schema = {
         Optional('current_mode'): str,
-        Optional('led_ecomode'): str,
+        Optional('led_auto_off'): str,
         Optional('switch'): {
             Any():{
                 'system': str,
@@ -251,8 +251,8 @@ def cli(self, stack=None, switch_num=None, output=None):
         # Current Mode: STATUS
         p12 = re.compile('^Current Mode:\s+(?P<status>\w+)$')
 
-        # LED Ecomode: Enabled
-        p12_1 = re.compile('^LED Ecomode:\s+(?P<ecomode>\w+)$')
+        # LED Auto off: Disabled
+        p12_1 = re.compile('^LED Auto off:\s+(?P<auto_off>\w+)$') 
 
         # MASTER: GREEN
         p13 = re.compile('^MASTER:\s+(?P<master>\w+)$')
@@ -408,11 +408,11 @@ def cli(self, stack=None, switch_num=None, output=None):
                 ret_dict.update({'current_mode' : group['status']})
                 continue
 
-            # LED Ecomode: Enabled
+            # LED Auto off: Disabled
             m = p12_1.match(line)
             if m:
                 group = m.groupdict()
-                ret_dict.update({'led_ecomode' : group['ecomode']})
+                ret_dict.update({'led_auto_off' : group['auto_off']})
                 continue
 
             # MASTER: GREEN
@@ -490,6 +490,7 @@ def cli(self, stack=None, switch_num=None, output=None):
         return ret_dict
 
 
+
 class ShowHardwareLedPortSchema(MetaParser):
     """
     Schema for show hardware led port {port}
diff --git a/src/genie/libs/parser/iosxe/show_interface.py b/src/genie/libs/parser/iosxe/show_interface.py
index 2b705d183c..8618259fed 100755
--- a/src/genie/libs/parser/iosxe/show_interface.py
+++ b/src/genie/libs/parser/iosxe/show_interface.py
@@ -237,7 +237,7 @@ class ShowInterfaces(ShowInterfacesSchema):
     """parser for show interfaces
                   show interfaces <interface>"""
 
-    cli_command = ['show interfaces', 'show interfaces {interface}']
+    cli_command = ['show interfaces', 'show interfaces {interface}', 'show interfaces | include {include}']
     exclude = ['in_octets', 'in_pkts', 'out_octets', 'out_pkts',
                'in_rate', 'in_rate_pkts', 'out_rate', 'out_rate_pkts',
                'input_queue_size', 'in_broadcast_pkts', 'in_multicast_pkts',
@@ -248,10 +248,12 @@ class ShowInterfaces(ShowInterfacesSchema):
                'out_lost_carrier', '(Tunnel.*)', 'input_queue_flushes',
                'reliability', 'out_broadcast_pkts']
 
-    def cli(self, interface="", output=None):
+    def cli(self, interface="", include="", output=None):
         if output is None:
             if interface:
                 cmd = self.cli_command[1].format(interface=interface)
+            elif include:
+                cmd = self.cli_command[2].format(include=include)
             else:
                 cmd = self.cli_command[0]
             out = self.device.execute(cmd)
@@ -2261,13 +2263,15 @@ class ShowIpInterface(ShowIpInterfaceSchema):
     """Parser for show ip interface
                   show ip interface <interface>"""
 
-    cli_command = ['show ip interface','show ip interface {interface}']
+    cli_command = ['show ip interface','show ip interface {interface}', 'show ip interface | include {include}', ]
     exclude = ['unnumbered', 'address_determined_by', '(Tunnel.*)', 'joins', 'leaves']
 
-    def cli(self,interface="",output=None):
+    def cli(self, interface="", include=None, output=None):
         if output is None:
             if interface:
                 cmd = self.cli_command[1].format(interface=interface)
+            elif include:
+                cmd = self.cli_command[2].format(include=include)
             else:
                 cmd = self.cli_command[0]
             out = self.device.execute(cmd)
@@ -2946,14 +2950,16 @@ class ShowIpv6InterfaceSchema(MetaParser):
 
 class ShowIpv6Interface(ShowIpv6InterfaceSchema):
     """Parser for show ipv6 interface"""
-    cli_command = ['show ipv6 interface {interface}','show ipv6 interface']
+    cli_command = ['show ipv6 interface', 'show ipv6 interface {interface}', 'show ipv6 interface | include {include}']
 
-    def cli(self, interface='',output=None):
+    def cli(self, interface='', include=None, output=None):
         if output is None:
-            if not interface:
-                cmd = self.cli_command[1]
+            if interface:
+                cmd = self.cli_command[1].format(interface=interface)
+            elif include:
+                cmd = self.cli_command[2].format(include=include)
             else:
-                cmd = self.cli_command[0].format(interface=interface)
+                cmd = self.cli_command[0]
             out = self.device.execute(cmd)
         else:
             out = output
@@ -4151,9 +4157,10 @@ def cli(self, interface=None, output=None):
             out = output
 
         # Gi1/1      40.6       5.09       0.4     -25.2      N/A
+        # Gi1/1      40.6       5.09       0.4     -25.2      -31.00    Max
         p = re.compile(r'^(?P<port>([\d\/A-Za-z]+)) +(?P<temp>([\d\.-]+)) '
-                       r'+(?P<voltage>([\d\.-]+)) +(?P<current>([\d\.-]+)) '
-                       r'+(?P<opticaltx>(\S+)) +(?P<opticalrx>(\S+))(\s+(?P<max_power>\S+)\s+W)?$')
+                        r'+(?P<voltage>([\d\.-]+)) +(?P<current>([\d\.-]+)) '
+                        r'+(?P<opticaltx>(\S+)) +(?P<opticalrx>(\S+))(\s+(?P<max_power>.*))?$')
 
         result_dict = {}
         for line in out.splitlines():
diff --git a/src/genie/libs/parser/iosxe/show_ip.py b/src/genie/libs/parser/iosxe/show_ip.py
index 5d9d79d369..e9709255be 100644
--- a/src/genie/libs/parser/iosxe/show_ip.py
+++ b/src/genie/libs/parser/iosxe/show_ip.py
@@ -6583,7 +6583,10 @@ def cli(self, interface_name=None, output=None):
 
         # Gi1/0/3      ip trk       active       40.1.1.24                           10
         # Gi1/0/13   ip-mac       active       10.1.1.101       00:0A:00:0B:00:01  10
-        p1 = re.compile(r"^(?P<interface_name>\S+)\s+(?P<filter_type>ip\s?\S+)\s+(?P<filter_mode>\S+)\s+(?P<ip_address>\S+)\s+(?P<mac_address>\S+)?\s+(?P<vlan>[\d,]*)$")
+        # Gi1/0/2    ip          active       192.168.100.2                       100
+        # Gi2/0/3    ip           active       192.168.100.3                       100
+        
+        p1 = re.compile(r"^(?P<interface_name>\S+)\s+(?P<filter_type>ip(\s?\S+)?)\s+(?P<filter_mode>\S+)\s+(?P<ip_address>\S+)\s+(?P<mac_address>\S+)?\s+(?P<vlan>[\d,]*)$")
 
         ret_dict = {}
         for line in output.splitlines():
diff --git a/src/genie/libs/parser/iosxe/show_l2vpn.py b/src/genie/libs/parser/iosxe/show_l2vpn.py
index 831b5d81e4..62beb80416 100755
--- a/src/genie/libs/parser/iosxe/show_l2vpn.py
+++ b/src/genie/libs/parser/iosxe/show_l2vpn.py
@@ -177,8 +177,12 @@
     * show l2vpn evpn vpws vc id <vc_id> detail
     * show l2vpn evpn vpws vc preferred-path
     * show l2vpn evpn default-gateway
+    * show l2vpn evpn esi-mlag summary
+    * show l2vpn evpn esi-mlag mac ip
+    * show l2vpn evpn esi-mlag mac ip vlan <vlan_id>
+    * show l2vpn evpn esi-mlag vlan brief
 
-Copyright (c) 2021 by Cisco Systems, Inc.
+Copyright (c) 2024 by Cisco Systems, Inc.
 All rights reserved.
 '''
 
@@ -193,7 +197,8 @@
                                          Or, \
                                          And, \
                                          Default, \
-                                         Use
+                                         Use, \
+                                         ListOf
 from genie.parsergen import oper_fill_tabular
 # import parser utils
 from genie.libs.parser.utils.common import Common
@@ -5968,3 +5973,288 @@ def cli(self, output=None):
                 continue
 
         return ret_dict
+
+ # ===================================================
+ # Parser for 'show l2vpn evpn esi-mlag summary'
+ # ===================================================
+class ShowL2vpnEvpnEsiMlagSummarySchema(MetaParser):
+     """Schema for show l2vpn evpn esi-mlag summary
+     """
+ 
+     schema = {
+         'esi_mlag': {
+             Any(): {
+                 Optional('bgp_router_id'): str,
+                 Optional('asn'): int,
+                 Optional('up_down_time'): str,
+                 Optional('state'): str,
+                 Optional('src_interface'): str,
+                 'pc_count': int,
+                 'vlan_count': int,
+                 'mac_count': int,
+                 Optional('interfaces'): {
+                     Any(): {
+                         'esi_id': str,
+                         'state': str,
+                     },
+                 },
+             },
+         },
+     }
+ 
+ 
+class ShowL2vpnEvpnEsiMlagSummary(ShowL2vpnEvpnEsiMlagSummarySchema):
+     """Parser for show l2vpn evpn esi-mlag summary
+     """
+ 
+     cli_command = 'show l2vpn evpn esi-mlag summary'
+ 
+     def cli(self, output=None):
+         if output is None:
+             out = self.device.execute(self.cli_command)
+         else:
+             out = output
+ 
+         # initial return dictionary
+         ret_dict = {}
+ 
+         # BGP is not configured or not up
+         p1_0 = re.compile(r'^BGP is not configured or not up$')
+ 
+         # Local BGP RouterID : 10.0.1.14, ASN : 65034
+         p1 = re.compile(r'^Local\s+BGP\s+RouterID\s+:\s+'
+                        r'(?P<bgp_router_id>[\d\.]+)\,\s+ASN\s+:\s+'
+                        r'(?P<asn>\d+)$')
+ 
+         # Neighbor IP : 10.0.1.13, Up/Down : 00:22:25, State/PfxRcd : 2560, Source Interface : Loopback1
+         p2 = re.compile(r'^Neighbor\s+IP\s+:\s+(?P<nbr_ip>[\d\.]+)\,'
+                        r'\s+Up\/Down\s+:\s+(?P<up_down_time>[\:\S]+)\,'
+                        r'\s+State\/PfxRcd\s+:\s+(?P<state>\S+)\,'
+                        r'\s+Source\sInterface\s:\s+(?P<src_interface>\S+)$')
+ 
+         #Total Port-Channel Count       : 3
+         p3 = re.compile(r'^Total\s+Port\-Channel\s+Count\s+:\s+'
+                        r'(?P<pc_count>\d+)$')
+ 
+         #Total VLAN Count               : 300
+         p4 = re.compile(r'^Total\s+VLAN\s+Count\s+:\s+'
+                        r'(?P<vlan_count>\d+)$')
+ 
+         #Total MAC Count                : 1048
+         p5 = re.compile(r'^Total\s+MAC\s+Count\s+:\s+(?P<mac_count>\d+)$')
+ 
+         # Interface       ESI                      State
+         # --------------- ------------------------ ------
+         # Po6             0150.F722.D491.0000.0600 Ready
+         # Po5             0170.1F53.9AB0.8000.0500 Ready
+         p6_0 = re.compile(r'^Interface\s+ESI\s+State$')
+         p6 = re.compile(r'^(?P<interface>[\w\d]+)\s+(?P<esi_id>[\S.]+)'
+                        r'\s+(?P<state>[\w\s]+)$')
+ 
+         for line in out.splitlines():
+             line = line.strip()
+ 
+             # BGP is not configured or not up
+             m = p1_0.match(line)
+             if m:
+                 group = m.groupdict()
+                 nbr_ip = ""
+                 ret_dict.setdefault('esi_mlag', {}).\
+                                 setdefault("", {})
+                 continue
+ 
+             # Local BGP RouterID : 10.0.1.14, ASN : 65034
+             m = p1.match(line)
+             if m:
+                 group = m.groupdict()
+                 bgp_router_id = group['bgp_router_id']
+                 asn = int(group['asn'])
+                 continue
+ 
+             # Neighbor IP : 10.0.1.13, Up/Down : 00:22:25, State/PfxRcd : 2560, Source Interface : Loopback1
+             m = p2.match(line)
+             if m:
+                 group = m.groupdict()
+                 nbr_ip = group['nbr_ip']
+                 ret_dict.setdefault('esi_mlag', {}).\
+                                 setdefault(nbr_ip, {})
+                 ret_dict['esi_mlag'][nbr_ip]['up_down_time'] = group['up_down_time']     
+                 ret_dict['esi_mlag'][nbr_ip]['state'] = group['state']
+                 ret_dict['esi_mlag'][nbr_ip]['src_interface'] = group['src_interface']  
+                 ret_dict['esi_mlag'][nbr_ip]['bgp_router_id'] = bgp_router_id
+                 ret_dict['esi_mlag'][nbr_ip]['asn'] = asn     
+                 continue
+ 
+             #Total Port-Channel Count       : 3
+             m = p3.match(line)
+             if m:
+                 group = m.groupdict()
+                 ret_dict['esi_mlag'][nbr_ip]['pc_count'] = \
+                                                 int(group['pc_count'])
+                 continue
+ 
+             #Total VLAN Count               : 300
+             m = p4.match(line)
+             if m:
+                 group = m.groupdict()
+                 ret_dict['esi_mlag'][nbr_ip]['vlan_count'] = \
+                                             int(group['vlan_count'])
+                 continue
+ 
+             #Total MAC Count                : 1048
+             m = p5.match(line)
+             if m:
+                 group = m.groupdict()
+                 ret_dict['esi_mlag'][nbr_ip]['mac_count'] = \
+                                             int(group['mac_count'])
+                 continue
+             
+             # Interface       ESI                      State
+             # --------------- ------------------------ ------
+             # Po6             0150.F722.D491.0000.0600 Ready
+             # Po5             0170.1F53.9AB0.8000.0500 Ready
+             m = p6_0.match(line)
+             if m:
+                 continue
+                 
+             m = p6.match(line)
+             if m:
+                 group = m.groupdict()
+                 interface = group['interface']
+                 esi_id = group['esi_id']
+                 state = group['state']
+                 ret_dict['esi_mlag'][nbr_ip].setdefault("interfaces", {}).setdefault(interface, {})
+               
+                 ret_dict['esi_mlag'][nbr_ip]['interfaces'][interface]["esi_id"] = esi_id
+                 ret_dict['esi_mlag'][nbr_ip]['interfaces'][interface]["state"] = state
+                 continue
+ 
+         return ret_dict
+ 
+ # ===================================================
+ # Parser for 'show l2vpn evpn esi-mlag mac ip'
+ # ===================================================
+class ShowL2vpnEvpnEsiMlagMacIpSchema(MetaParser):
+     """Schema for show l2vpn evpn esi-mlag mac ip
+                   show l2vpn evpn esi-mlag mac ip vlan <vlan_id>
+     """
+ 
+     schema = {
+         "esi_mlag_entries": ListOf({
+             'vlan': int,
+             'mac': str,
+             'ip': str,
+             'local_intf': str,
+             'neighbor_ip': str,
+             })
+         }
+class ShowL2vpnEvpnEsiMlagMacIp(ShowL2vpnEvpnEsiMlagMacIpSchema):
+     """Parser for show l2vpn evpn esi-mlag mac ip
+                   show l2vpn evpn esi-mlag mac ip vlan <vlan_id>
+     """
+ 
+     cli_command = ['show l2vpn evpn esi-mlag mac ip', 'show l2vpn evpn esi-mlag mac ip vlan {vlan_id}']
+ 
+     def cli(self, vlan_id=None, output=None):
+         cli = self.cli_command
+         if output is None:
+             if vlan_id:
+                cli = self.cli_command[1].format(vlan_id=vlan_id) 
+             else:
+                cli = self.cli_command[0] 
+             out = self.device.execute(cli)
+         else:
+             out = output
+ 
+         # initial return dictionary
+         ret_dict = {}
+         entry_list = []
+     
+         # 1100  0014.0100.0001 2001::250:0:0:2 Po3:1100        10.0.1.12
+         # 1100  0012.0100.0001 101.0.0.1                       10.0.1.12
+         p1 = re.compile(r'^(?P<vlan>\d+)\s+(?P<mac>[\S.]+)\s+'
+                        r'(?P<ip>[\w.:]+)\s+(?P<local_intf>[\S:\s]+)'
+                        r'\s+(?P<neighbor_ip>[\S.]+)$')
+ 
+         for line in out.splitlines():
+             line = line.strip()
+ 
+             # 1100  0014.0100.0001 2001::250:0:0:2 Po3:1100        10.0.1.12
+             # 1100  0012.0100.0001 101.0.0.1                       10.0.1.12
+             m = p1.match(line)
+             if m:
+                 group = m.groupdict()
+                 ret_dict["esi_mlag_entries"] = entry_list
+                 entry_list = ret_dict.setdefault("esi_mlag_entries", {})
+                 entry_list.append({
+                     'vlan' : int(group['vlan']),
+                     'mac' : group['mac'],
+                     'ip' : group['ip'],
+                     'local_intf' : group['local_intf'].strip(),
+                     'neighbor_ip' : group['neighbor_ip'],
+                 })
+                 ret_dict["esi_mlag_entries"] = entry_list
+                 continue
+ 
+         return ret_dict
+ 
+ # ===================================================
+ # Parser for 'show l2vpn evpn esi-mlag mac ip'
+ # ===================================================
+class ShowL2vpnEvpnEsiMlagVlanBriefSchema(MetaParser):
+     """Schema for show l2vpn evpn esi-mlag vlan brief
+     """
+ 
+     schema = {
+         "esi_mlag_vlan": ListOf({
+             'vlan': int,
+             'vni': int,
+             'local_mac_cnt': int,
+             'remote_mac_cnt': int,
+             'state': str,
+             })
+         }
+class ShowL2vpnEvpnEsiMlagVlanBrief(ShowL2vpnEvpnEsiMlagVlanBriefSchema):
+     """Parser for show l2vpn evpn esi-mlag vlan brief
+     """
+ 
+     cli_command = ['show l2vpn evpn esi-mlag vlan brief']
+ 
+     def cli(self, output=None):
+         if output is None:
+             out = self.device.execute(self.cli_command)
+         else:
+             out = output
+ 
+         # initial return dictionary
+         ret_dict = {}
+         entry_list = []
+ 
+         # 1400  21400    2         0          Established
+         # 1401  21401    2         0          Established
+         # 1100  21100    0         0          No BGP, Incomplete
+         p1 = re.compile(r'^(?P<vlan>\d+)\s+(?P<vni>\d+)\s+'
+                        r'(?P<local_mac_cnt>\d+)\s+(?P<remote_mac_cnt>\d+)'
+                        r'\s+(?P<state>[\S,\s]+)$')
+ 
+         for line in out.splitlines():
+             line = line.strip()
+ 
+         # 1401  21401    2         0          Established
+         # 1100  21100    0         0          No BGP, Incomplete
+             m = p1.match(line)
+             if m:
+                 group = m.groupdict()
+                 ret_dict["esi_mlag_vlan"] = entry_list
+                 entry_list = ret_dict.setdefault("esi_mlag_vlan", {})
+                 entry_list.append({
+                     'vlan' : int(group['vlan']),
+                     'vni' : int(group['vni']),
+                     'local_mac_cnt' : int(group['local_mac_cnt']),
+                     'remote_mac_cnt' : int(group['remote_mac_cnt']),
+                     'state' : group['state']
+                 })
+                 ret_dict["esi_mlag_vlan"] = entry_list
+                 continue
+ 
+         return ret_dict
diff --git a/src/genie/libs/parser/iosxe/show_lisp.py b/src/genie/libs/parser/iosxe/show_lisp.py
index 83de8f3f15..167c127b5e 100644
--- a/src/genie/libs/parser/iosxe/show_lisp.py
+++ b/src/genie/libs/parser/iosxe/show_lisp.py
@@ -4040,8 +4040,7 @@ class ShowLispRegistrationHistory(ShowLispRegistrationHistorySchema):
                    'show lisp {lisp_id} instance-id {instance_id} {address_family} server registration-history',
                    'show lisp {lisp_id} instance-id {instance_id} {address_family} server {address_resolution} {eid} registration-history',
                    'show lisp {lisp_id} instance-id {instance_id} {address_family} server {address_resolution} registration-history',
-                   'show lisp instance-id {instance_id} ipv4 server registration-history',
-                   'show lisp instance-id {instance_id} ipv6 server registration-history',
+                   'show lisp instance-id {instance_id} {address_family} server registration-history',
                    'show lisp server registration-history']
 
     def cli(self, output=None, lisp_id=None, instance_id=None, address_family=None, eid=None, address_resolution=None):
diff --git a/src/genie/libs/parser/iosxe/show_lisp_super.py b/src/genie/libs/parser/iosxe/show_lisp_super.py
index 550d05ff6b..a0bcd4d2b8 100644
--- a/src/genie/libs/parser/iosxe/show_lisp_super.py
+++ b/src/genie/libs/parser/iosxe/show_lisp_super.py
@@ -1942,7 +1942,7 @@ class ShowLispIpMapCachePrefixSchema(MetaParser):
                         Optional('packets_out_bytes'): int,
                         Optional('action'): str,
                         Optional('counters_not_accurate'): bool,
-                        'locators': {
+                        Optional('locators'): {
                             Any(): {
                                 'uptime': str,
                                 'state': str,
diff --git a/src/genie/libs/parser/iosxe/show_meraki.py b/src/genie/libs/parser/iosxe/show_meraki.py
index 00073567c3..d1217e4b2f 100755
--- a/src/genie/libs/parser/iosxe/show_meraki.py
+++ b/src/genie/libs/parser/iosxe/show_meraki.py
@@ -41,7 +41,8 @@ class ShowMerakiSchema(MetaParser):
 
 
 class ShowMeraki(ShowMerakiSchema):
-    '''Parser for:
+    '''
+    Parser for:
         * 'show meraki'
         * 'show meraki switch {switch}'
     '''
@@ -65,10 +66,10 @@ def cli(self, switch = '', output=None):
         # 1   C9300-24UX         FCW2248D19Q    Q5TD-GJZW-GLBA  0029.c29a.8e00    Registered   C9K-C [Monitoring]
         p1 = re.compile(r'^(?P<switch_num>\d+)\s+(?P<pid>[\w-]+)\s+(?P<serial_number>[\w]+)\s+(?P<meraki_sn>[\w\/-]+)\s+(?P<mac_addr>[\w\.:]+)\s+(?P<conversion_status>[\w\s\/-]+)\s+(?P<current_mode>[\w\-]+(\s\[[\w\s]+\])?)$')
         
-        # 1   MS390-24U          Q3EC-CTH2-U    N/A             N/A               N/A          C9K-C
-        # 1   MS390-24U          Q3EC-CTH2-U    N/A             N/A               N/A          C9K-C [Monitoring]
-        p2 = re.compile(r'^(?P<switch_num>\d+)\s+(?P<pid>[\w-]+)\s+(?P<serial_number>[\w\/-]+)\s+(?P<meraki_sn>\w\/\w)\s+(?P<mac_addr>\w\/\w)\s+(?P<conversion_status>\w\/\w)\s+(?P<current_mode>[\w\-]+(\s\[[\w\s]+\])?)$')
-
+        # 1   MS390-24UX         Q3ED-6UWS-6TLX     N/A  N/A   N/A   C9K-C
+        # 1   MS390-24UX         Q3ED-6UWS-6TLX     N/A  N/A   N/A   C9K-C[Monitoring]
+        p2 = re.compile(r'^(?P<switch_num>\d+)\s+(?P<pid>[\w-]+)\s+(?P<serial_number>[\w\/-]+)\s+(?P<meraki_sn>[\w\/-]+)\s+(?P<mac_addr>[\w\/.:]+)\s+(?P<conversion_status>[\w\/-]+)\s+(?P<current_mode>[\w\-]+(\s\[[\w\s]+\])?)\s*$')
+        
         parsed_dict = {}
 
         for line in out.splitlines():
diff --git a/src/genie/libs/parser/iosxe/show_monitor.py b/src/genie/libs/parser/iosxe/show_monitor.py
index dda82cc00f..b192a69e7f 100644
--- a/src/genie/libs/parser/iosxe/show_monitor.py
+++ b/src/genie/libs/parser/iosxe/show_monitor.py
@@ -3,7 +3,6 @@
 IOSXE parsers for the following show commands:
     * show monitor
     * show monitor session {session}
-    * show monitor session all
     * show monitor capture
 
 '''
@@ -11,15 +10,10 @@
 
 # Python
 import re
-import xmltodict
-from netaddr import IPAddress, IPNetwork
 
 # Metaparser
 from genie.metaparser import MetaParser
-from genie.metaparser.util.schemaengine import Schema, Any, Or, Optional, And, Default, Use
-
-# import parser utils
-from genie.libs.parser.utils.common import Common
+from genie.metaparser.util.schemaengine import Any, Optional
 
 
 # =========================================
@@ -68,16 +62,13 @@ class ShowMonitor(ShowMonitorSchema):
     ''' Parser for
       "show monitor"
       "show monitor session {session}"
-      "show monitor session all"
     '''
 
-    cli_command = ['show monitor', 'show monitor session {session}', 'show monitor session all']
+    cli_command = ['show monitor', 'show monitor session {session}']
 
-    def cli(self, session="", all="", output=None):
+    def cli(self, session="", output=None):
         if output is None:
-            if all:
-                cmd = self.cli_command[2]
-            elif session:
+            if session:
                 cmd = self.cli_command[1].format(session=session)
             else:
                 cmd = self.cli_command[0]
diff --git a/src/genie/libs/parser/iosxe/show_nbar.py b/src/genie/libs/parser/iosxe/show_nbar.py
index be45803f72..035984760a 100644
--- a/src/genie/libs/parser/iosxe/show_nbar.py
+++ b/src/genie/libs/parser/iosxe/show_nbar.py
@@ -115,3 +115,89 @@ def cli(self, output=None):
         
 
         return result_dict
+
+# =================================================
+# Schema for 'show ip nbar protocol-pack active'
+# =================================================  
+class ShowIpNbarProtocolPackActiveSchema(MetaParser):
+    """
+        Schema for show ip nbar protocol-pack active
+    """
+    schema = {
+        'name': str,
+        'version': str,
+        'publisher': str,
+        'nbar_engine_version': int,
+        'state': str,
+    }
+
+# =================================================
+# Parser for 'show ip nbar protocol-pack active'
+# =================================================  
+class ShowIpNbarProtocolPackActive(ShowIpNbarProtocolPackActiveSchema):
+    """
+        Parser for show ip nbar protocol-pack active
+    """
+
+    cli_command = ["show ip nbar protocol-pack active"]
+
+    def cli(self, output = None):
+        if output is None:
+            output = self.device.execute(self.cli_command[0])
+
+        ret_dict = {}
+
+        # Name:                          Advanced Protocol Pack
+        p1 = re.compile(r'^Name:\s+(?P<name>(.+))$')
+
+        # Version:                       70.0
+        p2 = re.compile(r'^Version:\s+(?P<version>(\S+))$')
+
+        # Publisher:                     Cisco Systems Inc.
+        p3 = re.compile(r'^Publisher:\s+(?P<publisher>(.+))$')
+        
+        # NBAR Engine Version:           52
+        p4 = re.compile(r'^NBAR Engine Version:\s+(?P<nbar_engine_version>(\d+))$')
+
+        # State:                         Active
+        p5 = re.compile(r'^State:\s+(?P<state>(.+))$')
+
+        for line in output.splitlines():
+            line = line.strip()
+            
+            # Name:                          Advanced Protocol Pack
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['name'] = group['name']
+                continue
+            
+            # Version:                       70.0
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['version'] = group['version']
+                continue  
+
+            # Publisher:                     Cisco Systems Inc.
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['publisher'] = group['publisher']
+                continue
+        
+            # NBAR Engine Version:           52
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['nbar_engine_version'] = int(group['nbar_engine_version'])
+                continue
+
+            # State:                         Active
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['state'] = group['state']
+                continue
+
+        return ret_dict
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/show_platform.py b/src/genie/libs/parser/iosxe/show_platform.py
index cd8cdf7c51..7410c9eb93 100755
--- a/src/genie/libs/parser/iosxe/show_platform.py
+++ b/src/genie/libs/parser/iosxe/show_platform.py
@@ -35,6 +35,7 @@
     * 'show diagnostics status'
     * 'test platform software database get-n all ios_oper/platform_component'
     * 'test platform software database get-n all ios_oper/transceiver'
+    * 'show rep topology detail'
     '''
 
 # Python
@@ -1802,7 +1803,7 @@ class ShowRedundancyStatesSchema(MetaParser):
         Optional('communications_reason'): str,
         'client_count': int,
         'client_notification_tmr_msec': int,
-        'rf_debug_mask': str,
+        Optional('rf_debug_mask'): str,
     }
 
 
@@ -5123,7 +5124,7 @@ class ShowProcessesMemorySortedSchema(MetaParser):
             'used': int,
             'free': int,
         },
-        'reserve_p_pool': {
+        Optional('reserve_p_pool'): {
             'total': int,
             'used': int,
             'free': int,
@@ -9413,3 +9414,132 @@ def cli(self, switch_num, output=None, acl_name = ''):
 
         return ret_dict
 
+
+# ====================================================
+#  Schema for :
+#  * 'show rep topology detail'
+# ====================================================
+
+class ShowRepTopologyDetailSchema(MetaParser):
+    """Schema for show rep topology detail"""
+    schema = {
+        'rep_segment_no' : int,
+        'rep_segment': {
+            Any() : {
+                'interfaces': {
+                    Any() : {
+                        'edge' : str,
+                        'role' : str,
+                        'vlan_status' : str,
+                        'bridge_mac' : str,
+                        'port_number': str,
+                        'port_priority': str,
+                        'neighbor_number': str
+                    }
+                }
+            }
+        }
+    }
+
+# ====================================================
+#  Parser for :
+#  * 'show rep topology detail'
+# ====================================================
+
+class ShowRepTopologyDetail(ShowRepTopologyDetailSchema):
+
+    """Parser for show rep topology detail"""
+
+    cli_command = 'show rep topology detail'
+
+    def cli(self, output=None):
+
+        if output is None:
+            output = self.device.execute(self.cli_command)
+
+        ret_dict = {}
+
+        # REP Segment 50
+        p1 = re.compile(r'^REP Segment (?P<rep_segment_no>\d+)$')
+
+        # BOIS168ZW2001, Te0/2 (Primary Edge No-Neighbor)
+        # BOIS168ZW2001, Te0/1 (Intermediate)
+        p2 = re.compile(r'^(?P<bridge>[\w\d]+), (?P<interface>[a-z|A-Z]+\d+\/\d+(\/\d+)?) \((?P<edge>.+)\)$')
+
+        # Open Port, all vlans forwarding
+        # Alternate Port, some vlans blocked
+        p3 = re.compile(r'^(?P<role>(Open|Alternate)) Port, (?P<vlan_status>.+)$')
+
+        # Bridge MAC: f80b.cb8f.7bbf
+        p4 = re.compile(r'^Bridge MAC: (?P<bridge_mac>[\w\d\.]+)$')
+
+        # Port Number: 022
+        p5 = re.compile(r'^Port Number: (?P<port_number>[\w\d]+)$')
+
+        # Port Priority: 000
+        p6 = re.compile(r'^Port Priority: (?P<port_priority>\d+)$')
+
+        # Neighbor Number: 35 / [-26]
+        p7 = re.compile(r'^Neighbor Number: (?P<neighbor_number>.+)$')
+
+        for line in output.splitlines():
+
+            line = line.strip()
+
+            # REP Segment 50
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['rep_segment_no'] = int(group['rep_segment_no'])
+                continue
+
+            # BOIS168ZW2001, Te0/2 (Primary Edge No-Neighbor)
+            # BOIS168ZW2001, Te0/1 (Intermediate)
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                intf = Common.convert_intf_name(group['interface'])
+
+                bridge_dict = ret_dict.setdefault('rep_segment', {}).setdefault(group['bridge'], {})
+                intf_dict = bridge_dict.setdefault('interfaces', {}).setdefault(intf, {})
+                intf_dict['edge'] = group['edge']
+                continue
+
+            # Open Port, all vlans forwarding
+            # Alternate Port, some vlans blocked
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                intf_dict['role'] = group['role']
+                intf_dict['vlan_status'] = group['vlan_status']
+                continue
+
+            # Bridge MAC: f80b.cb8f.7bbf
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                intf_dict['bridge_mac'] = group['bridge_mac']
+                continue
+
+            # Port Number: 022
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                intf_dict['port_number'] = group['port_number']
+                continue
+
+            # Port Priority: 000
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                intf_dict['port_priority'] = group['port_priority']
+                continue
+
+            # Neighbor Number: 35 / [-26]
+            m = p7.match(line)
+            if m:
+                group = m.groupdict()
+                intf_dict['neighbor_number'] = group['neighbor_number']
+                continue
+
+        return ret_dict
diff --git a/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py b/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py
index 8779a2af3e..ec8d508b52 100644
--- a/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py
+++ b/src/genie/libs/parser/iosxe/show_platform_hardware_fed.py
@@ -25,7 +25,12 @@
     * 'show platform hardware fed active fwd-asic traps tm-traps asic 0'
     * 'show platform hardware fed active fwd-asic drops asic 0 slice 0'
     * 'show platform hardware fed switch active fwd-asic drops asic 0 slice 0'
+    * 'show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}'
     * 'show platform hardware fed switch {switch} fwd-asic drops asic {asic}'
+    * 'show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}'
+    * 'show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}'
+    * 'show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}'
+
 """
 # Python
 import re
@@ -37,7 +42,7 @@
 
 # Metaparser
 from genie.metaparser import MetaParser
-from genie.metaparser.util.schemaengine import Schema, Any, Or, Optional, Use, And
+from genie.metaparser.util.schemaengine import Schema, Any, Or, Optional, Use, And, ListOf
 from genie.libs.parser.utils.common import Common
 from genie.parsergen import oper_fill_tabular
 
@@ -4416,6 +4421,59 @@ def cli(self, mode, port_num, num, switch=None, output=None):
         return ret_dict
                 
 
+class ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiffSchema(MetaParser):
+    """
+    Schema for show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}
+    show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}
+    """
+    schema = {
+            'table_name':{
+                  Any(): {
+                    'length_subtables_f1': int,
+                    'length_subtables_f2': int,
+                    'nb_subtables_f1': int,
+                    'nb_subtables_f2': int
+              }
+            }
+        }
+
+class ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff(ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiffSchema):
+    """ Parser for show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}     """
+
+    cli_command = 'show platform hardware fed switch {type} fwd-asic insight npl_summary_diff{files_compare}'
+
+    def cli(self, type,files_compare, output=None): 
+
+        if output is None:
+            output = self.device.execute(self.cli_command.format(type=type,files_compare=files_compare))
+               
+        ret_dict = {}
+        
+        # table_name                               length_subtables_f1            length_subtables_f2            nb_subtables_f1                nb_subtables_f2
+        # mac_forwarding_table                     (3,)                           (4,)                           1                              1                              nb_subtables_f2
+        p1 = re.compile(r"^(?P<table_name>\S+)\s+.(?P<length_subtables_f1>\d+)\S+\s+.(?P<length_subtables_f2>\d+)\S+\s+.(?P<nb_subtables_f1>\d+)\s+(?P<nb_subtables_f2>\d+)$")
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # table_name                               length_subtables_f1            length_subtables_f2            nb_subtables_f1                nb_subtables_f2
+            # mac_forwarding_table                     (3,)                           (4,)                           1                              1                              nb_subtables_f2
+            m = p1.match(line)
+            if m:
+                group=m.groupdict()
+                result_dict=ret_dict.setdefault('table_name', {}).setdefault(group['table_name'], {})
+                result_dict.update({
+                    'length_subtables_f1': int(group['length_subtables_f1']),
+                    'length_subtables_f2': int(group['length_subtables_f2']),
+                    'nb_subtables_f1': int(group['nb_subtables_f1']),
+                    'nb_subtables_f2': int(group['nb_subtables_f2'])
+                })
+                continue
+        
+        return ret_dict    
+
+
+
 
 
 # ======================================================================
@@ -4495,3 +4553,142 @@ def cli(self, switch, asic, output=None):
 
         return ret_dict
 
+# ======================================================
+# Schema for 'show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}'
+# ======================================================
+
+class ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueIncludeSchema(MetaParser):
+    schema = {
+        'q_limit_blocks':  int,
+    }
+
+# ======================================================
+# Parser for 'show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}'
+# ======================================================
+
+class ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude(ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueIncludeSchema):
+    """Parser for show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}"""
+    cli_command = ['show platform hardware fed switch {sw_number} qos queue config interface {interface} queue {queue_id} | include {match}']
+    
+
+    def cli(self,interface,queue_id,match, sw_number,output=None):
+        if output is None:
+            cmd = self.cli_command[0].format(sw_number=sw_number,interface=interface,queue_id=queue_id,match=match)
+            out = self.device.execute(cmd)
+        else:
+            out = output
+
+        # Initialize the dictionary for the parsed output.
+        result_dict = {}
+
+        # Q-Limit(Blocks    )    : 100000
+        p1 = re.compile(r'^Q-Limit\(Blocks\s+\)\s+:\s+(?P<q_limit_blocks>\d+)$')
+
+        for line in out.splitlines():
+            line = line.strip()
+
+            # Q-Limit(Blocks    )    : 100000
+            m = p1.match(line)
+            if m:
+                result_dict['q_limit_blocks'] = int(m.groupdict()['q_limit_blocks'])
+                continue
+        return result_dict
+ 
+# ======================================================
+# Schema for 'show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}'
+# ======================================================
+class ShowPlatformHardwareFedSwitchQosSchedulerInterfaceIncludeSchema(MetaParser):
+    schema = {
+        'voq_offset': ListOf(int),
+    }
+
+# ======================================================
+# Parser for 'show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match} '
+# ======================================================
+
+class ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude(ShowPlatformHardwareFedSwitchQosSchedulerInterfaceIncludeSchema):
+    """Parser for show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}"""
+    cli_command = ['show platform hardware fed switch {sw_number} qos scheduler interface {interface} | include {match}']
+
+    def cli(self, sw_number,interface,match,output=None):
+        if output is None:
+            cmd = self.cli_command[0].format(sw_number=sw_number,interface=interface,match=match)
+            out = self.device.execute(cmd)
+        else:
+            out = output
+
+        # Initialize the dictionary for the parsed output.
+        result_dict = {}
+
+        # |                       : VOQ Offset :   0 |   0 |   0 |   0 |   0 |   5 |   6 |   7 
+        p1 = re.compile(r'^\|\s+:\s+VOQ\s+Offset\s+:\s+(?P<voq_offset>\d+\s+\|\s+\d+\s+\|\s+\d+\s+\|\s+\d+\s+\|\s+\d+\s+\|\s+\d+\s+\|\s+\d+\s+\|\s+\d+)')
+
+        for line in out.splitlines():
+            line = line.strip()
+
+            # |                       : VOQ Offset :   0 |   0 |   0 |   0 |   0 |   5 |   6 |   7 
+            m = p1.match(line)
+            if m:
+                voq_offset = m.groupdict()['voq_offset'].split('|')
+                result_dict['voq_offset'] = [int(i.strip()) for i in voq_offset]
+                continue
+        return result_dict
+
+# ======================================================
+# Schema for 'show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}'
+# ======================================================
+class ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedIncludeSchema(MetaParser):
+    schema = {
+        'interface': str,
+        'location': str,
+        'direction': str,
+        'cgid': str,
+        'no_of_classes': int
+    }
+
+# ======================================================
+# Parser for 'show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}'
+# ======================================================
+
+class ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude(ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedIncludeSchema):
+    """Parser for show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}"""
+    cli_command = ['show platform software fed switch {sw_number} qos interface {interface} ingress npd detailed | include {match}']
+
+    def cli(self, sw_number,interface,match, output=None):
+        if output is None:
+            cmd = self.cli_command[0].format(sw_number=sw_number,interface=interface,match=match)
+            out = self.device.execute(cmd)
+        else:
+            out = output
+
+        # Initialize the dictionary for the parsed output.
+        ret_dict = {}
+
+        # [GigabitEthernet1/0/2, pm-dc1-tc6, Ingress]: CGID = 0x634E00  
+        p1 = re.compile(r'^\[(?P<interface>\S+),\s+(?P<location>\S+),\s+(?P<direction>\S+)]:\s+CGID\s+=\s+(?P<cgid>\S+)$')
+        
+        #  No of classes: 1
+        p2 = re.compile(r'^\s*No of classes:\s+(?P<no_of_classes>\d+)$')
+
+        for line in out.splitlines():
+            line = line.strip()
+            
+            # [GigabitEthernet1/0/2, pm-dc1-tc6, Ingress]: CGID = 0x634E00  
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['interface'] = group['interface']
+                ret_dict['location'] = group['location']
+                ret_dict['direction'] = group['direction']
+                ret_dict['cgid'] = group['cgid']
+                continue
+
+            #  No of classes: 1
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict['no_of_classes'] = int(group['no_of_classes'])
+                continue
+
+        return ret_dict
+        
diff --git a/src/genie/libs/parser/iosxe/show_platform_software.py b/src/genie/libs/parser/iosxe/show_platform_software.py
index 364438f6a7..a53165d858 100644
--- a/src/genie/libs/parser/iosxe/show_platform_software.py
+++ b/src/genie/libs/parser/iosxe/show_platform_software.py
@@ -30,6 +30,7 @@
     * 'show platform software memory database fed {switch} {switch_var} callsite'
     * 'show platform software memory database fed {switch_var} callsite'
     * 'show platform soft infra bipc | inc buffer'
+    * 'show platform software infractructure inject'
 """
 
 # Python
@@ -8406,4 +8407,461 @@ def cli(self, iif_id, state, switch=None, output=None):
                 ret_dict.update({scrubbed.lower(): group["value"]})
                 continue
 
-        return ret_dict
\ No newline at end of file
+        return ret_dict
+        
+class ShowPlatformSoftwareInterfaceF0NameSchema(MetaParser):
+    """
+    Schema for show platform software interface f0 name {intf}
+    """
+
+    schema = {
+            "name": str,
+            "id": int,
+            "qfp_id": int,
+            Optional("schedules"): int,
+            Optional("type"): str,
+            Optional("state"): str,
+            Optional("snmp_id"): int,
+            Optional("mtu"): int,
+            "tx_channel_id": int,
+            "rx_channel_id": int,
+            "aom_state": str,
+            "flow_control_id": int,
+            "bandwidth": int,
+            "encap": str,
+            "ip_address": str,
+            "ipv6_address": str,
+            Optional("icmp_flags"): list,
+            Optional("icmp6_flags"): list,
+            Optional("smi_protocols"): list,
+            "auth_user": str,
+            "frr_linkdown_id": int,
+            "vnet_name": str,
+            "vnet_tag": int,
+            "vnet_extra_info": int,
+            "dirty_status": str,
+            "aom_sanity_check": str,
+            "aom_obj_id": int,
+            "qos_trust_type": str,
+            Optional("flags"): str
+          }
+
+class ShowPlatformSoftwareInterfaceF0Name(ShowPlatformSoftwareInterfaceF0NameSchema):
+    """Parser for show platform software interface f0 name {intf}"""
+
+    cli_command = "show platform software interface f0 name {intf}"
+
+    def cli(self, intf=None, output=None):
+        if output is None:
+            # excute command to get output
+            output = self.device.execute(self.cli_command.format(intf=intf))
+
+        # initial variables
+        ret_dict = {}
+        # Name: HundredGigE2/0/22, ID: 1275, QFP ID: 1275, Schedules: 4096
+        p0 = re.compile(r"^Name: +(?P<name>\S+),\s+ID: +(?P<id>\d+),\s+QFP ID: +(?P<qfp_id>\d+),\s+Schedules: +(?P<schedules>\d+)$")
+        
+        # Type: PORT, State: enabled, SNMP ID: 98, MTU: 1500
+        p1 = re.compile(r"^Type: +(?P<type>\w+),\s+State: +(?P<state>\w+),\s+SNMP ID: +(?P<snmp_id>\d+),\s+MTU: +(?P<mtu>\d+)$")
+        
+        # TX channel ID: 0, RX channel ID: 0, AOM state: created
+        p2 = re.compile(r"^TX channel ID: +(?P<tx_channel_id>\d+),\s+RX channel ID: +(?P<rx_channel_id>\d+),\s+AOM state: +(?P<aom_state>\w+)$")
+        
+        # Flow control ID: 49175
+        p3 = re.compile(r"^Flow control ID: +(?P<flow_control_id>\d+)$")
+        
+        # bandwidth: 100000000, encap: ARPA
+        p4 = re.compile(r"^bandwidth: +(?P<bandwidth>\d+),\s+encap: +(?P<encap>\w+)$")
+        
+        # IP Address: 10.10.10.96
+        p5 = re.compile(r"^IP Address: +(?P<ip_address>(\d{1,3}\.){3}\d{1,3})$")
+        
+        # IPV6 Address: ::
+        p6 = re.compile(r"^IPV6 Address: +(?P<ipv6_address>[\da-fA-F:]+)$")
+        
+        # Flags: ipv4
+        p7 = re.compile(r"^Flags: +(?P<flags>[\w\s]+)$")
+        
+        # ICMP Flags: unreachables, redirects, no-info-reply, no-mask-reply
+        p8 = re.compile(r"^ICMP Flags: +(?P<icmp_flags>[\w\s,-]+)$")
+        
+        # ICMP6 Flags: unreachables, redirects
+        p9 = re.compile(r"^ICMP6 Flags: +(?P<icmp6_flags>[\w\s,-]+)$")
+        
+        # SMI enabled on protocol(s): UNKNOWN
+        p10 = re.compile(r"^SMI enabled on protocol\(s\): +(?P<smi_protocols>[\w\s,-]+)$")
+        
+        # Authenticated-user:
+        p11 = re.compile(r"^Authenticated-user: *(?P<auth_user>.*)$")
+        
+        # FRR linkdown ID: 65535
+        p12 = re.compile(r"^FRR linkdown ID: +(?P<frr_linkdown_id>\d+)$")
+        
+        # vNet Name: , vNet Tag: 0, vNet Extra Information: 0
+        p13 = re.compile(r"^vNet Name: *(?P<vnet_name>.*),\s+vNet Tag: +(?P<vnet_tag>\d+),\s+vNet Extra Information: +(?P<vnet_extra_info>\d+)$")
+        
+        # Dirty: unknown
+        p14 = re.compile(r"^Dirty: +(?P<dirty_status>\w+)$")
+        
+        # AOM dependency sanity check: PASS
+        p15 = re.compile(r"^AOM dependency sanity check: +(?P<aom_sanity_check>\w+)$")
+        
+        # AOM Obj ID: 2071
+        p16 = re.compile(r"^AOM Obj ID: +(?P<aom_obj_id>\d+)$")
+        
+        # QOS trust type: Trust DSCP
+        p17 = re.compile(r"^QOS trust type: +(?P<qos_trust_type>[\w\s]+)$")
+        
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Name: HundredGigE2/0/22, ID: 1275, QFP ID: 1275, Schedules: 4096
+            m = p0.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["name"] = group["name"]
+                ret_dict["id"] = int(group["id"])
+                ret_dict["qfp_id"] = int(group["qfp_id"])
+                ret_dict["schedules"] = int(group["schedules"])
+                continue
+            
+            # Type: PORT, State: enabled, SNMP ID: 98, MTU: 1500    
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["type"] = group["type"]
+                ret_dict["state"] = group["state"]
+                ret_dict["snmp_id"] = int(group["snmp_id"])
+                ret_dict["mtu"] = int(group["mtu"])
+                continue
+                
+            # TX channel ID: 0, RX channel ID: 0, AOM state: created
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["tx_channel_id"] = int(group["tx_channel_id"])
+                ret_dict["rx_channel_id"] = int(group["rx_channel_id"])
+                ret_dict["aom_state"] = group["aom_state"]
+                continue
+            
+            # Flow control ID: 49175
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["flow_control_id"] = int(group["flow_control_id"])
+                continue
+            
+            # bandwidth: 100000000, encap: ARPA
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["bandwidth"] = int(group["bandwidth"])
+                ret_dict["encap"] = group["encap"]
+                continue
+            
+            # IP Address: 10.10.10.96
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["ip_address"] = group["ip_address"]
+                continue
+            
+            # IPV6 Address: ::
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["ipv6_address"] = group["ipv6_address"]
+                continue
+            
+            # Flags: ipv4
+            m = p7.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["flags"] = group["flags"]
+                continue
+            
+            # ICMP Flags: unreachables, redirects, no-info-reply, no-mask-reply
+            m = p8.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["icmp_flags"] = group["icmp_flags"].split(", ")
+                continue
+            
+            # ICMP6 Flags: unreachables, redirects
+            m = p9.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["icmp6_flags"] = group["icmp6_flags"].split(", ")
+                continue
+            
+            # SMI enabled on protocol(s): UNKNOWN
+            m = p10.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["smi_protocols"] = group["smi_protocols"].split(", ")
+                continue
+            
+            # Authenticated-user:
+            m = p11.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["auth_user"] = group["auth_user"]
+                continue
+            
+            # FRR linkdown ID: 65535
+            m = p12.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["frr_linkdown_id"] = int(group["frr_linkdown_id"])
+                continue
+            
+            # vNet Name: , vNet Tag: 0, vNet Extra Information: 0
+            m = p13.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["vnet_name"] = group["vnet_name"]
+                ret_dict["vnet_tag"] = int(group["vnet_tag"])
+                ret_dict["vnet_extra_info"] = int(group["vnet_extra_info"])
+                continue
+            
+            # Dirty: unknown
+            m = p14.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["dirty_status"] = group["dirty_status"]
+                continue
+            
+            # AOM dependency sanity check: PASS
+            m = p15.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["aom_sanity_check"] = group["aom_sanity_check"]
+                continue
+            
+            # AOM Obj ID: 2071
+            m = p16.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["aom_obj_id"] = int(group["aom_obj_id"])
+                continue
+            # QOS trust type: Trust DSCP
+            m = p17.match(line)
+            if m:
+                group = m.groupdict()
+                ret_dict["qos_trust_type"] = group["qos_trust_type"]
+                continue
+
+        return ret_dict
+
+class ShowPlatformSoftwareObjectManagerF0ObjectIdentifierSchema(MetaParser):
+    """Schema for show platform software object-manager f0 object {object} {object_identifier}"""
+
+    schema = {
+        "object_identifier": {
+            Any(): {
+                Optional("object_identifier"): int,
+                Optional("status"): str,
+                Optional("description"): str,
+            }
+        },
+    }
+
+class ShowPlatformSoftwareObjectManagerF0ObjectIdentifier(
+    ShowPlatformSoftwareObjectManagerF0ObjectIdentifierSchema
+):
+    """Parser for show platform software object-manager f0 object {object} {object_identifier}"""
+    
+    cli_command = "show platform software object-manager f0 object {object} {object_identifier}"
+    
+    def cli(self, object=None, object_identifier=None, output=None):
+        if output is None:
+            if object and object_identifier:
+                # excute command to get output
+                output = self.device.execute(self.cli_command.format(object=object,object_identifier=object_identifier))
+
+        # Init vars
+        ret_dict = {}
+        
+        # Object identifier: 2072
+        p0 = re.compile(r"^Object identifier\:\s+(?P<object_identifier>\d+)$")
+        
+        # Description: Tx Channel HundredGigE2/0/22, handle 1275, hw handle 1275, flag 0x0, dirty hw: NONE dirty aom NONE
+        p1 = re.compile(r"^Description\:\s+(?P<description>.+)$")
+
+        # Status: Done
+        p2 = re.compile(r"Status\:\s+(?P<status>\w+)$")
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Object identifier: 2072
+            m = p0.match(line)
+            if m:
+                group = m.groupdict()
+                object_identifier = group.pop("object_identifier")
+                identifier_dict = ret_dict.setdefault("object_identifier", {})
+                obj_identifier_dict = identifier_dict.setdefault(int(object_identifier), {})
+                obj_identifier_dict.update(
+                    {
+                        "object_identifier": int(object_identifier),
+                    }
+                )
+                continue
+
+            # Description: Tx Channel HundredGigE2/0/22, handle 1275, hw handle 1275, flag 0x0, dirty hw: NONE dirty aom NONE
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                obj_identifier_dict.update({"description": group["description"]})
+                continue
+
+            # Status: Done
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                obj_identifier_dict.update({"status": group["status"]})
+                continue
+                
+        return ret_dict
+
+class ShowPlatformSoftwareInfrastructureInjectSchema(MetaParser):
+    schema = {
+        'l3_injected_packets': {
+            Optional('total_inject'): int,
+            Optional('failed_inject'): int,
+            Optional('sent'): int,
+            Optional('prerouted'): int,
+            Optional('non_cef_capable'): int,
+            Optional('non_unicast'): int,
+            Optional('ip'): int,
+            Optional('ipv6'): int,
+            Optional('mpls'): int,
+            Optional('non_ip_tunnel'): int,
+            Optional('udlr_tunnel'): int,
+            Optional('p2mp_replicated_mcast'): int,
+            Optional('non_ip_fastswitched_over_tunnel'): int,
+            Optional('legacy_pak_path'): int,
+            Optional('other_packet'): int,
+            Optional('ip_fragmented'): int,
+            Optional('normal'): int,
+            Optional('nexthop'): int,
+            Optional('adjacency'): int,
+            Optional('feature'): int,
+            Optional('undefined'): int,
+            Optional('pak_find_no_adj'): int,
+            Optional('no_adj_id'): int,
+            Optional('sb_alloc'): int,
+            Optional('sb_local'): int,
+            Optional('p2mcast_failed_count_0_p2mcast_enqueue_fail'): int,
+            Optional('unicast_dhc'): int,
+            Optional('mobile_ip'): int,
+            Optional('ipv6_na'): int,
+            Optional('ipv6_ns'): int,
+            Optional('transport_failed_cases'): int,
+            Optional('grow_packet_buffer'): int,
+            Optional('cant_l3_inject_pkts'): int,
+        },
+        'per_feature_packet_inject_statistics': {
+            Optional('feature_multicast'): int,
+            Optional('feature_edge_switching_service'): int,
+            Optional('feature_session_border_controller'): int,
+            Optional('feature_interrupt_level'): int,
+            Optional('feature_use_outbound_interface'): int,
+            Optional('feature_interrupt_level_with_oce'): int,
+            Optional('feature_icmpv6_error_message'): int,
+            Optional('feature_session_border_controller_media_packet_injection'): int,
+            Optional('feature_tunnel_ethernet_over_gre'): int,
+            Optional('feature_secure_socket_layer_virtual_private_network'): int,
+            Optional('feature_epc_wireshark_injecting_packets'): int,
+            Optional('feature_multicast_overlay_replication'): int,
+        },
+        'l2_injected_packets': {
+            Optional('total_l2_inject'): int,
+            Optional('total_bd__inject'): int,
+            Optional('total_bd_local__inject'): int,
+            Optional('total_efp_inject'): int,
+            Optional('total_vlan_inject'): int,
+            Optional('failed_l2_inject'): int,
+            Optional('failed_bd_local__inject'): int,
+            Optional('failed_bd__inject'): int,
+            Optional('failed_vlan_inject'): int,
+            Optional('failed_efp_inject'): int,
+        }
+    }
+
+class ShowPlatformSoftwareInfrastructureInject(ShowPlatformSoftwareInfrastructureInjectSchema):
+    cli_command = 'show platform software infrastructure inject'
+
+    def cli(self, output=None):
+        if output is None:
+            output = self.device.execute(self.cli_command)
+        
+        # Initialize the result dictionary as empty
+        parsed_dict = {}
+
+        # 3524142 total inject pak, 0 failed 
+        p1 = re.compile(r'^(?P<total>\d+) total (?P<type>[\w\s\-]+) pak, (?P<failed>\d+) failed$')
+
+        #  0 Feature multicast overlay replication
+        p2 = re.compile(r'^(?P<value>\d+) (?P<key>[\w\s\-]+)$')
+
+        #  0 MPLS, 0 Non-IP Tunnel 
+        p3 = re.compile(r'^(?P<value1>\d+) (?P<key1>[\w\s\-]+), (?P<value2>\d+) (?P<key2>[\w\s\-]+)$')
+
+        # Statistics for L2 injected packets:
+        p4 = re.compile(r'^(?P<key>[\w\s\-]+):$')
+
+        # Track sections
+        current_section = None
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Statistics for L2 injected packets:
+            if 'Statistics for L3 injected packets' in line:
+                current_section = 'l3_injected_packets'
+                parsed_dict[current_section] = {}
+                continue
+            elif 'per feature packet inject statistics' in line:
+                current_section = 'per_feature_packet_inject_statistics'
+                parsed_dict[current_section] = {}
+                continue
+            elif 'Statistics for L2 injected packets' in line:
+                current_section = 'l2_injected_packets'
+                parsed_dict[current_section] = {}
+                continue
+
+            if current_section is None:
+                continue
+
+            # 28324 total L2 inject pak, 0 failed
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                key = group['type'].strip().lower().replace(' ', '_').replace('-', '_')
+                parsed_dict[current_section][f'total_{key}'] = int(group['total'])
+                parsed_dict[current_section][f'failed_{key}'] = int(group['failed'])
+                continue
+
+            # 0 Feature multicast overlay replication
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                key = group['key'].strip().lower().replace(' ', '_').replace('-', '_')
+                value = int(group['value'])
+                parsed_dict[current_section][key] = value
+                continue
+
+            #  1023352 sb alloc, 135 sb local 
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                key1 = group['key1'].strip().lower().replace(' ', '_').replace('-', '_')
+                key2 = group['key2'].strip().lower().replace(' ', '_').replace('-', '_')
+                value1 = int(group['value1'])
+                value2 = int(group['value2'])
+                parsed_dict[current_section][key1] = value1
+                parsed_dict[current_section][key2] = value2
+                continue
+        
+        return parsed_dict
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/show_platform_software_fed.py b/src/genie/libs/parser/iosxe/show_platform_software_fed.py
index 886281aa34..3f75385c80 100644
--- a/src/genie/libs/parser/iosxe/show_platform_software_fed.py
+++ b/src/genie/libs/parser/iosxe/show_platform_software_fed.py
@@ -4264,15 +4264,22 @@ class ShowPlatformSoftwareFedSwitchActiveVtAllSchema(MetaParser):
 
 
 class ShowPlatformSoftwareFedSwitchActiveVtAll(
-    ShowPlatformSoftwareFedSwitchActiveVtAllSchema
-):
+    ShowPlatformSoftwareFedSwitchActiveVtAllSchema):
     """Parser for show platform software fed switch active vt all"""
 
-    cli_command = "show platform software fed switch active vt all"
+    cli_command = [
+        "show platform software fed switch {switch} vt all",
+        "show platform software fed active vt all",
+    ]
 
-    def cli(self, output=None):
+    def cli(self, output=None, switch=""):
         if output is None:
-            output = self.device.execute(self.cli_command)
+            if switch:
+                cmd = self.cli_command[0].format(switch=switch)
+            else:
+                cmd = self.cli_command[1]
+
+            output = self.device.execute(cmd)
 
         # interface_id  cvlan_id      svlan-id              action
         # 183           20            30                    1
@@ -6164,12 +6171,12 @@ def cli(self, switch, asic, index, flow, output=None):
 
 
 # ======================================================
-# Parser for 'show platform software fed switch active acl info db summary '
+# Parser for 'show platform software fed {switch} {mode} acl info db summary '
 # ======================================================
 
 
 class ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummarySchema(MetaParser):
-    """Schema for show platform software fed switch active acl info db summary"""
+    """Schema for show platform software fed {switch} {mode} acl info db summary"""
 
     schema = {
         "acl_summary": {
@@ -6188,13 +6195,21 @@ class ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummarySchema(MetaParser):
 class ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummary(
     ShowPlatformSoftwareFedSwitchActiveAclInfoDbSummarySchema
 ):
-    """Parser for show platform software fed switch active acl info db summary"""
+    """Parser for show platform software fed {switch} {mode} acl info db summary"""
 
-    cli_command = "show platform software fed switch active acl info db summary"
+    cli_command = ["show platform software fed switch active acl info db summary",
+                   "show platform software fed {switch} {mode} acl info db summary",
+                    "show platform software fed {mode} acl info db summary"]
 
-    def cli(self, output=None):
+    def cli(self, switch=None, mode=None, output=None):
         if output is None:
-            output = self.device.execute(self.cli_command)
+            if switch and mode:
+                cmd = self.cli_command[1].format(switch=switch, mode=mode)
+            elif mode:
+                cmd = self.cli_command[2].format(mode=mode)
+            else:
+                cmd = self.cli_command[0]
+            output = self.device.execute(cmd)
 
         # CG id     ACL name                                    Feature    No of ACEs     Protocol    Ingress    Egress
         # --------------------------------------------------------------------------------------------------------------
@@ -6444,20 +6459,28 @@ class ShowPlatformSoftwareFedActiveAclInfoDbDetailSchema(MetaParser):
 
 # ============================================================================
 #  Parser for
-#  * 'show platform software fed switch active acl info db detail'
+#  * 'show platform software fed {switch} {mode} acl info db detail'
 # ============================================================================
 class ShowPlatformSoftwareFedActiveAclInfoDbDetail(
     ShowPlatformSoftwareFedActiveAclInfoDbDetailSchema
 ):
     """Parser for:
-    * 'show platform software fed switch active acl info db detail'
+    * 'show platform software fed {switch} {mode} acl info db detail'
     """
 
-    cli_command = "show platform software fed switch active acl info db detail"
+    cli_command = ["show platform software fed switch active acl info db detail", 
+                   "show platform software fed {switch} {mode} acl info db detail",
+                   "show platform software fed {mode} acl info db detail"]
 
-    def cli(self, output=None):
+    def cli(self, switch=None, mode=None, output=None):
         if not output:
-            output = self.device.execute(self.cli_command)
+            if switch and mode:
+                cmd = self.cli_command[1].format(switch=switch, mode=mode)
+            elif mode:
+                cmd = self.cli_command[2].format(mode=mode)
+            else:
+                cmd = self.cli_command[0]
+            output = self.device.execute(cmd)
 
         proto_flag = False
         tos_flag = False
@@ -7112,11 +7135,19 @@ class ShowPlatformSoftwareFedSwitchActiveAclStatisticsEventsSchema(MetaParser):
 class ShowPlatformSoftwareFedSwitchActiveAclStatisticsEvents(
     ShowPlatformSoftwareFedSwitchActiveAclStatisticsEventsSchema
 ):
-    cli_command = "show platform software fed switch active acl statistics events"
+    cli_command = ["show platform software fed switch active acl statistics events",
+                   "show platform software fed {switch} {mode} acl statistics events",
+                   "show platform software fed {mode} acl statistics events"]
 
-    def cli(self, output=None):
+    def cli(self, switch=None, mode=None, output=None):
         if output is None:
-            output = self.device.execute(self.cli_command)
+            if switch and mode:
+                cmd = self.cli_command[1].format(switch=switch, mode=mode)
+            elif mode:
+                cmd = self.cli_command[2].format(mode=mode)
+            else:
+                cmd = self.cli_command[0]
+            output = self.device.execute(cmd)
 
         # ACL Binds:                           13
         # ACL Bind Errors:                     1
@@ -10571,3 +10602,416 @@ def cli(self, vlan, output=None):
                 continue
 
         return ret_dict
+
+
+class ShowPlatSoftFedSwAccessSecuritySecMacLrnTableSchema(MetaParser):
+    """Schema for 
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary'
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}'
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'
+    """
+    schema = {
+        'mac_entries': {
+            Any(): {
+                'interface': str,
+                'vlan': int,
+                'mac': str,
+                'logical_id': int,
+                'position': int,
+                'asic_number': int,
+                'auth_act': str,
+                'restore_auth_act': str,
+                'flag': str,
+                'drop': str,
+                'policy': str,
+                'policy_oid': int,
+                'packets': int,
+            }
+        }
+    }
+
+class ShowPlatSoftFedSwAccessSecuritySecMacLrnTable(ShowPlatSoftFedSwAccessSecuritySecMacLrnTableSchema):
+    """
+    Parser for 
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary'
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}'
+    * 'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'
+    """
+    cli_command = [
+        'show plat soft fed sw {switch} access-security sec-mac-lrn-table summary',
+        'show plat soft fed sw {switch} access-security sec-mac-lrn-table mac {client_mac}',
+        'show plat soft fed sw {switch} access-security sec-mac-lrn-table interface if-id {if_id}'
+    ]
+    
+    def cli(self, switch, client_mac=None, if_id=None, output=None):
+        if output is None:
+            if client_mac:
+                cmd = self.cli_command[1].format(switch=switch, client_mac=client_mac)
+            elif if_id:
+                cmd = self.cli_command[2].format(switch=switch, if_id=if_id)
+            else:
+                cmd = self.cli_command[0].format(switch=switch)
+            output = self.device.execute(cmd)
+
+        # Initialize the parsed dictionary
+        parsed_data = {}
+
+        # 1 Gi3/0/10     50         0000.0033.3333   0          12288      0     FWD_ALL_LRN_DATA   None               NONE         No     NONE     551        0         
+        p1 = re.compile(
+            r'(?P<se_no>\d+)\s+(?P<interface>\S+)\s+(?P<vlan>\d+)\s+(?P<mac>[0-9A-Fa-f.]+)\s+(?P<logical_id>\d+)\s+'
+            r'(?P<position>\d+)\s+(?P<asic_number>\d+)\s+(?P<auth_act>\S+)\s+(?P<restore_auth_act>\S+)\s+(?P<flag>\S+)\s+'
+            r'(?P<drop>\S+)\s+(?P<policy>\S+)\s+(?P<policy_oid>\S+)\s+(?P<packets>\d+)'
+        )
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Match the line with the regular expression
+            m = p1.match(line)
+            if m:
+                if 'mac_entries' not in parsed_data:
+                    parsed_data['mac_entries'] = {}
+                
+                key = int(m.group('se_no'))
+                parsed_data['mac_entries'][key] = {
+                    'interface': m.group('interface'),
+                    'vlan': int(m.group('vlan')),
+                    'mac': m.group('mac'),
+                    'logical_id': int(m.group('logical_id')),
+                    'position': int(m.group('position')),
+                    'asic_number': int(m.group('asic_number')),
+                    'auth_act': m.group('auth_act'),
+                    'restore_auth_act': m.group('restore_auth_act'),
+                    'flag': m.group('flag'),
+                    'drop': m.group('drop'),
+                    'policy': m.group('policy'),
+                    'policy_oid': int(m.group('policy_oid')),
+                    'packets': int(m.group('packets'))
+                }
+                continue
+                
+        return parsed_data
+
+
+class ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetailSchema(MetaParser):
+    """Schema for 
+        * 'show platform software fed switch {switch_var} acl info sdk detail'
+        * 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail' 
+        * 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'
+    """
+    schema = {
+        'class_group_name': {
+            Any(): {
+                'direction': str,
+                'feature': str,
+                'protocol': str,
+                'cg_id': int,
+                'pol_hdl': str,
+                'oid': str,
+                'no_of_ace': int,
+                Any(): {
+                    Optional("ipv4_src_value"): str,
+                    Optional("ipv4_src_mask"): str,
+                    Optional("ipv4_dst_value"): str,
+                    Optional("ipv4_dst_mask"): str,
+                    Optional("ipv6_src_mac_value"): str,
+                    Optional("ipv6_src_mac_mask"): str,
+                    Optional("ipv6_dst_mac_value"): str,
+                    Optional("ipv6_dst_mac_mask"): str,
+                    Any(): {
+                        Optional('proto'): str,
+                        Optional('ext_h'): str,
+                        Optional('tos'): str,
+                        Optional('tcp_flg'): str,
+                        Optional('ttl'): str,
+                        Optional('ipv4_flags'): str,
+                        Optional('src_port'): str,
+                        Optional('dst_port'): str,
+                    },
+                    'result_actions': {
+                        'punt': str,
+                        'drop': str,
+                        'mirror': str,
+                        'counter': str,
+                        'counter_value': int,
+                    }
+                }
+            }
+        }
+    }
+    
+class ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail(ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetailSchema):
+    """Parser for 
+		* 'show platform software fed switch {switch_var} acl info sdk detail'
+		* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail' 
+		* 'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'
+    """
+
+    cli_command = [
+        'show platform software fed switch {switch_var} acl info sdk detail',
+        'show platform software fed switch {switch_var} acl info sdk feature {feature_name} detail',
+        'show platform software fed switch {switch_var} acl info sdk feature {feature_name} dir {in_out} cgid {cg_id} detail'
+    ]
+    
+    def cli(self, switch_var, feature_name=None, in_out=None, cg_id=None, output=None):
+        if output is None:
+            if switch_var and in_out and cg_id:
+                cmd = self.cli_command[2].format(switch_var=switch_var, feature_name=feature_name, in_out=in_out, cg_id=cg_id)
+            elif switch_var and feature_name:
+                cmd = self.cli_command[1].format(switch_var=switch_var, feature_name=feature_name)
+            else:
+                cmd = self.cli_command[0].format(switch_var=switch_var)
+
+            output = self.device.execute(cmd)
+
+        parsed_dict = {}
+
+        # Class Group Name: V4SGACL;000 
+        p1 = re.compile(r'^Class Group Name:\s+(?P<class_group_name>\S+)$')
+
+        # Direction: Egress 
+        p2 = re.compile(r'^Direction:\s+(?P<direction>\S+)$')
+
+        # Feature         : Sgacl
+        p3 = re.compile(r'^Feature\s+:\s+(?P<feature>\S+)$')
+
+        # Protocol        : IPv4
+        p4 = re.compile(r'^Protocol\s+:\s+(?P<protocol>\S+)$')
+
+        # CG ID           : 273
+        p5 = re.compile(r'^CG ID\s+:\s+(?P<cg_id>\d+)$')
+
+        # Pol Hdl         : 0x5405cf68
+        p6 = re.compile(r'^Pol Hdl\s+:\s+(?P<pol_hdl>\S+)$')
+
+        # ACL (OID: 0x81E, No of ACEs: 1) 
+        p7 = re.compile(r'^ACL\s+\(OID:\s+(?P<oid>\S+),\s+No\s+of\s+ACEs:\s+(?P<no_of_ace>\d+)\)$')
+
+        # IPV4 ACE Key/Mask
+        p8 = re.compile(r'^IPV4 ACE Key/Mask$')
+
+        # ipv4_src: value = 0.0.0.0       mask = 0.0.0.0
+        p9 = re.compile(r'^ipv4_src:\s+value\s+=\s+(?P<ipv4_src_value>\S+)\s+mask\s+=\s+(?P<ipv4_src_mask>\S+)$')
+
+        # ipv4_dst: value = 0.0.0.0       mask = 0.0.0.0 
+        p10 = re.compile(r'^ipv4_dst:\s+value\s+=\s+(?P<ipv4_dst_value>\S+)\s+mask\s+=\s+(?P<ipv4_dst_mask>\S+)$')
+
+        # IPV6 ACE Key/Mask
+        p8_1 = re.compile(r'^IPV6 ACE Key/Mask$')
+
+        # src_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+        p9_1 = re.compile(r'^src_mac:\s+value\s+=\s+(?P<ipv6_src_mac_value>[\S]+)$')
+
+        # mask = 0x0.0x0.0x0.0x0.0x0.0x0
+        p9_1_1 = re.compile(r'^mask\s+=\s+(?P<ipv6_src_mac_mask>[\S]+)$')
+
+        # dst_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0
+        p10_1 = re.compile(r'^dst_mac:\s+value\s+=\s+(?P<ipv6_dst_mac_value>[\S]+)$')
+
+        # mask = 0x0.0x0.0x0.0x0.0x0.0x0
+        p10_1_1 = re.compile(r'^mask\s+=\s+(?P<ipv6_dst_mac_mask>[\S]+)$')
+
+        # V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+        p11 = re.compile(r'^(?P<pro_type>[VM])\s*:\s+(?P<proto>\S+)\s+(?P<tos>\S+)\s+(?P<tcp_flg>\S+)\s+(?P<ttl>\S+)\s+(?P<ipv4_flags>\S+)\s+(?P<src_port>\S+)\s+(?P<dst_port>\S+)$')
+
+        # V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+        p12 = re.compile(r'^(?P<pro_type>[VM])\s*:\s+(?P<ext_h>\S+)\s+(?P<tos>\S+)\s+(?P<tcp_flg>\S+)\s+(?P<ttl>\S+)\s+(?P<ipv4_flags>\S+)\s+(?P<src_port>\S+)\s+(?P<dst_port>\S+)$')
+
+        # Result Action
+        p13 = re.compile(r'^Result Action$')
+
+        # Punt : N    Drop : N    Mirror: N    Counter: 0x0 (0)
+        p14 = re.compile(r'^Punt\s*:\s*(?P<punt>\S+)\s+Drop\s*:\s*(?P<drop>\S+)\s+Mirror\s*:\s*(?P<mirror>\S+)\s+Counter:\s*(?P<counter>\S+)\s*\((?P<counter_value>\d+)\)$')
+
+        current_protocol = None  
+        current_key_mask = None 
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Class Group Name: V4SGACL;000 
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict = parsed_dict.setdefault('class_group_name', {}).setdefault(group["class_group_name"], {})
+                continue
+
+            # Direction: Egress
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["direction"] = group["direction"]
+                continue
+
+            # Feature         : Sgacl
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["feature"] = group["feature"]
+                continue
+
+            # Protocol        : IPv4
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["protocol"] = group["protocol"]
+                current_protocol = group["protocol"]
+                continue
+            
+            # CG ID           : 273
+            m = p5.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["cg_id"] = int(group["cg_id"])
+                continue
+            
+            # Pol Hdl         : 0x5405cf68
+            m = p6.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["pol_hdl"] = group["pol_hdl"]
+                continue
+
+            # ACL (OID: 0x81E, No of ACEs: 1) 
+            m = p7.match(line)
+            if m:
+                group = m.groupdict()
+                class_dict["oid"] = group["oid"]
+                class_dict["no_of_ace"] = int(group["no_of_ace"])
+                continue
+
+            # IPV4 ACE Key/Mask
+            m = p8.match(line)
+            if m:
+                key_base = 'ipv4_ace_key_mask'
+                seq_key = key_base
+
+                if seq_key in class_dict:
+                    counter = 1
+                    while f"{seq_key}_{counter}" in class_dict:
+                        counter += 1
+                    seq_key = f"{seq_key}_{counter}"
+
+                ipv4_dict = class_dict.setdefault(seq_key, {})
+                current_key_mask = ipv4_dict
+                continue
+
+            # ipv4_src: value = 0.0.0.0       mask = 0.0.0.0
+            m = p9.match(line)
+            if m:
+                group = m.groupdict()
+                ipv4_dict["ipv4_src_value"] = group["ipv4_src_value"]
+                ipv4_dict["ipv4_src_mask"] = group["ipv4_src_mask"]
+                continue
+
+            # ipv4_dst: value = 0.0.0.0       mask = 0.0.0.0 
+            m = p10.match(line)
+            if m:
+                group = m.groupdict()
+                ipv4_dict["ipv4_dst_value"] = group["ipv4_dst_value"]
+                ipv4_dict["ipv4_dst_mask"] = group["ipv4_dst_mask"]
+                continue
+
+            # IPV6 ACE Key/Mask
+            m = p8_1.match(line)
+            if m:
+                key_base = 'ipv6_ace_key_mask'
+                seq_key = key_base
+
+                if seq_key in class_dict:
+                    counter = 1
+                    while f"{seq_key}_{counter}" in class_dict:
+                        counter += 1
+                    seq_key = f"{seq_key}_{counter}"
+
+                ipv6_dict = class_dict.setdefault(seq_key, {})
+                current_key_mask = ipv6_dict
+                continue
+
+            # src_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+            m = p9_1.match(line)
+            if m:
+                group = m.groupdict()
+                ipv6_dict["ipv6_src_mac_value"] = group["ipv6_src_mac_value"]
+                current_mac = 'src_mac'
+                continue
+            
+            # mask = 0x0.0x0.0x0.0x0.0x0.0x0
+            m = p9_1_1.match(line)
+            if m and current_mac == 'src_mac':
+                group = m.groupdict()
+                ipv6_dict["ipv6_src_mac_mask"] = group["ipv6_src_mac_mask"]
+                current_mac = None
+                continue
+
+            # dst_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0
+            m = p10_1.match(line)
+            if m:
+                group = m.groupdict()
+                ipv6_dict["ipv6_dst_mac_value"] = group["ipv6_dst_mac_value"]
+                current_mac = 'dst_mac'
+                continue
+
+            # mask = 0x0.0x0.0x0.0x0.0x0.0x0
+            m = p10_1_1.match(line)
+            if m and current_mac == 'dst_mac':
+                group = m.groupdict()
+                ipv6_dict["ipv6_dst_mac_value"] = group["ipv6_dst_mac_mask"]
+                current_mac = None
+                continue
+
+            # V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+            m = p11.match(line)
+            if m:
+                group = m.groupdict()
+                if current_protocol == 'IPv4':
+                    pro_type_dict = ipv4_dict.setdefault(group["pro_type"], {})
+                else:
+                    pro_type_dict = ipv6_dict.setdefault(group["pro_type"], {})
+                pro_type_dict['proto'] = group["proto"]
+                pro_type_dict['tos'] = group["tos"]
+                pro_type_dict['tcp_flg'] = group["tcp_flg"]
+                pro_type_dict['ttl'] = group["ttl"]
+                pro_type_dict['ipv4_flags'] = group["ipv4_flags"]
+                pro_type_dict['src_port'] = group["src_port"]
+                pro_type_dict['dst_port'] = group["dst_port"]
+                continue
+
+            # V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+            m = p12.match(line)
+            if m:
+                group = m.groupdict()
+                if current_protocol == 'IPv6':
+                    pro_type_dict = ipv6_dict.setdefault(group["pro_type"], {})
+                else:
+                    pro_type_dict = ipv4_dict.setdefault(group["pro_type"], {})
+                pro_type_dict['ext_h'] = group["ext_h"]
+                pro_type_dict['tos'] = group["tos"]
+                pro_type_dict['tcp_flg'] = group["tcp_flg"]
+                pro_type_dict['ttl'] = group["ttl"]
+                pro_type_dict['ipv4_flags'] = group["ipv4_flags"]
+                pro_type_dict['src_port'] = group["src_port"]
+                pro_type_dict['dst_port'] = group["dst_port"]
+                continue
+
+            # Result Action
+            m = p13.match(line)
+            if m:
+                # No action needed, just sets context for p14 to follow
+                continue
+
+            # Punt : N    Drop : N    Mirror: N    Counter: 0x0 (0)
+            m = p14.match(line)
+            if m:
+                group = m.groupdict()
+                if current_key_mask is not None:
+                    current_key_mask['result_actions'] = {
+                        'punt': group["punt"],
+                        'drop': group["drop"],
+                        'mirror': group["mirror"],
+                        'counter': group["counter"],
+                        'counter_value': int(group["counter_value"])
+                    }
+                continue
+                
+        return parsed_dict
diff --git a/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py b/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py
index e20ccb29f9..8376371710 100644
--- a/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py
+++ b/src/genie/libs/parser/iosxe/show_platform_software_fed_ip.py
@@ -16,6 +16,11 @@
     * 'show platform software fed {state} ipv6 mfib summary'
     * 'show platform software fed {switch_var} {state} ipv6 mld snooping summary'
     * 'show platform software fed {state} ipv6 mld snooping summary'
+    * 'show platform software fed {switch_var} {state} ip mfib vrf {vrf_name} count'
+    * 'show platform software fed {state} ip mfib vrf {vrf_name} count'
+    * 'show platform software fed {switch_var} {state} ip igmp snooping summary'
+    * 'show platform software fed {state} ip igmp snooping summary'
+    * 'show ipv6 mld snooping address vlan {vlan} {group} summary'
     * 'show platform software fed {switch} {state} ip mfib count'
     * 'show platform software fed {state} ip mfib count'
     * 'show platform software fed {switch} {state} ip mfib summary'
@@ -1291,7 +1296,6 @@ def cli(self, state="", vlan="", switch_var=None, output=None):
     
         return platform_dict
 
-
 # ===================================================================
 # Parser for show platform software fed switch active ipv6 mfib count'
 # ===================================================================
@@ -1563,7 +1567,6 @@ def cli(self, state='', switch_var=None, output=None):
     
         return ret_dict
 
-
 # ===================================================================
 # Parser for show platform software fed switch active ip mfib count'
 # ===================================================================
@@ -1575,7 +1578,6 @@ class ShowPlatformSoftwareFedIpMfibCountSchema(MetaParser):
         }
     }
 
-
 class ShowPlatformSoftwareFedIpMfibCount(ShowPlatformSoftwareFedIpMfibCountSchema):
     """Parser for show platform software fed switch active ip mfib count"""
 
@@ -1803,3 +1805,200 @@ def cli(self, state, switch=None, output=None):
                 continue
 
         return ret_dict
+
+# ================================================================================
+# Parser for show platform software fed switch active ip mfib vrf {vrf_name} count'
+# ================================================================================
+class ShowPlatformSoftwareFedIpMfibVrfCountSchema(MetaParser):
+    """Schema for show platform software fed switch active ipv6 mfib count"""
+    schema = {
+        'mfib_count': {
+            'number_of_entries': int
+            }
+        }
+
+class ShowPlatformSoftwareFedIpMfibVrfCount(ShowPlatformSoftwareFedIpMfibVrfCountSchema):
+    """Parser for show platform software fed switch active ip mfib vrf {vrf_name} count"""
+
+    cli_command = ['show platform software fed {switch_var} {state} ip mfib vrf {vrf_name} count',
+        'show platform software fed {state} ip mfib vrf {vrf_name} count']
+
+    def cli(self, state='', vrf_name='',switch_var=None, output=None):
+        if output is None:
+            if switch_var:
+                cmd = self.cli_command[0].format(state=state, vrf_name=vrf_name, switch_var=switch_var)
+            else:
+                cmd = self.cli_command[1].format(state=state, vrf_name=vrf_name)
+            output = self.device.execute(cmd)
+        ret_dict = {}
+
+        # Number of entries = 32001
+        p0 = re.compile(r'(Number of entries +\= +(?P<number_of_entries>\d+))')
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Number of entries = 32001
+            m = p0.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict = ret_dict.setdefault('mfib_count', {})
+                id_dict['number_of_entries'] = int(group['number_of_entries'])
+                continue
+
+        return ret_dict
+
+# ===================================================================
+# Parser for show platform software fed switch active ip igmp snooping summary'
+# ===================================================================
+class ShowPlatformSoftwareFedIpIgmpSnoopingSummarySchema(MetaParser):
+    """Schema for show platform software fed switch active ip igmp snooping summary"""
+    schema = {
+        'igmp_snooping_summary': {
+            'group_current_count': int,
+            'group_max_count': int,
+            'last_used_group_urid': str,
+            'last_used_vlan_urid': str,
+            'port_current_count': int,
+            'port_max_count': int,
+            'vlan_current_count': int,
+            'vlan_max_count': int
+        }
+    }
+
+class ShowPlatformSoftwareFedIpIgmpSnoopingSummary(ShowPlatformSoftwareFedIpIgmpSnoopingSummarySchema):
+    """Parser for show platform software fed switch active ip igmp snooping summary"""
+
+    cli_command = ['show platform software fed {switch_var} {state} ip igmp snooping summary',
+        'show platform software fed {state} ip igmp snooping summary']
+
+    def cli(self, state='', switch_var=None, output=None):
+        if output is None:
+            if switch_var:
+                cmd = self.cli_command[0].format(state=state, switch_var=switch_var)
+            else:
+                cmd = self.cli_command[1].format(state=state)
+            output = self.device.execute(cmd)
+
+        ret_dict = {}
+
+        # Vlan Current Count/Max Reached    : 3/3 
+        p0 = re.compile(r'(Vlan Current Count/Max Reached +\: +(?P<vlan_current_count>\d+)\/+(?P<vlan_max_count>\d+))')
+
+        # Group Current Count/Max Reached   : 0/0
+        p1 = re.compile(r'(Group Current Count/Max Reached +\: +(?P<group_current_count>\d+)\/+(?P<group_max_count>\d+))')
+
+        # Port Current Count/Max Reached    : 2001/2057
+        p2 = re.compile(r'(Port Current Count/Max Reached +\: +(?P<port_current_count>\d+)\/+(?P<port_max_count>\d+))')  
+
+        # Last used Vlan Urid               : 0x4000000000000006
+        p3 = re.compile(r'(Last used Vlan Urid +\: +(?P<last_used_vlan_urid>\S+))') 
+
+        # Last Used Group Urid              : 0x600000000000575c
+        p4 = re.compile(r'(Last Used Group Urid  +\: +(?P<last_used_group_urid>\S+))') 
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Vlan Current Count/Max Reached    : 3/3             : 2
+            m = p0.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict = ret_dict.setdefault('igmp_snooping_summary', {})
+                id_dict['vlan_current_count'] = int(group['vlan_current_count'])
+                id_dict['vlan_max_count'] = int(group['vlan_max_count'])
+                continue
+
+            # Group Current Count/Max Reached   : 0/0
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict['group_current_count'] = int(group['group_current_count'])
+                id_dict['group_max_count'] = int(group['group_max_count'])
+                continue
+
+            # Port Current Count/Max Reached    : 2001/2057
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict['port_current_count'] = int(group['port_current_count'])
+                id_dict['port_max_count'] = int(group['port_max_count'])
+                continue
+
+            # Last used Vlan Urid               : 0x4000000000000006    
+            m = p3.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict['last_used_vlan_urid'] = group['last_used_vlan_urid']
+                continue
+
+            # Last Used Group Urid              : 0x600000000000575c                    : 0 
+            m = p4.match(line)
+            if m:
+                group = m.groupdict()
+                id_dict['last_used_group_urid'] = group['last_used_group_urid']
+                continue
+
+        return ret_dict
+
+# ===================================================================
+# Parser for show ipv6 mld snooping address vlan {vlan} {group} summary
+# ===================================================================
+class ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCountSchema(MetaParser):
+    """Schema for show ipv6 mld snooping address vlan {vlan} {group} summary """
+    schema = {
+    'mld_snooping_summary': 
+        {
+            Optional('group_address'): str,
+            Optional('interface'): str, 
+            Optional('host_type'): str,
+            Optional('member_ports'): str
+        }
+    }
+
+class ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount(ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCountSchema):
+    """Parser for show Platform Software fed ipv6 mld snooping groups count"""
+
+    cli_command = ['show ipv6 mld snooping address vlan {vlan} {group} summary']
+
+    def cli(self, vlan='', group='', output=None):
+        if output is None:
+            cmd = self.cli_command[0].format(vlan=vlan,group=group)
+            output = self.device.execute(cmd)
+        ret_dict = {}
+
+        # Group Address (Vlan 11)        : FF13::1
+        p0 = re.compile(r'(Group\s+Address\s+\(+(?P<interface>.*)\) +\: +(?P<group_address>[\w\:\.\/]+))')
+        # Host type                      : v1
+        p1 = re.compile(r'(Host\s+type\s+\:\s+(?P<host_type>\S+))')
+
+        # Member Ports                   : Po92
+        p2 = re.compile(r'(Member\s+Ports  +\: +(?P<member_ports>\S+))') 
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Group Address (Vlan 11)        : FF13::1
+            m = p0.match(line)
+            if m:
+                group = m.groupdict()
+                mld_dict = ret_dict.setdefault('mld_snooping_summary', {})
+                mld_dict['group_address'] = group['group_address']
+                mld_dict['interface'] = group['interface']
+                continue
+
+            # Host type                      : v1  
+            m = p1.match(line)
+            if m:
+                group = m.groupdict()
+                mld_dict['host_type'] = group['host_type']
+                continue
+
+            # Member Ports                   : Po92
+            m = p2.match(line)
+            if m:
+                group = m.groupdict()
+                mld_dict['member_ports'] = group['member_ports']
+                continue
+
+        return ret_dict
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/show_platform_software_fed_switch_num.py b/src/genie/libs/parser/iosxe/show_platform_software_fed_switch_num.py
new file mode 100644
index 0000000000..8c2d7112c4
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/show_platform_software_fed_switch_num.py
@@ -0,0 +1,90 @@
+"""show_platform_software_fed.py
+
+    * "show platform software fed switch active ifm mappings lpn",
+    * "sh platform software fed switch {switch_num} ifm mappings lpn"
+"""
+# Python
+import re
+
+# Metaparser
+from genie.metaparser import MetaParser
+from genie.metaparser.util.schemaengine import Schema, Any
+
+# =============================================================================
+#  Schema for
+#  * 'show platform software fed switch active ifm mappings lpn'
+#  * 'show platform software fed switch {switch_num} ifm mappings lpn'
+# ==============================================================================
+class ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpnSchema(MetaParser):
+    """Schema for 'show platform software fed switch active ifm mappings lpn'"""
+
+    schema = {
+        "interfaces": {
+            Any(): {
+                "lpn": int,
+                "asic": int,
+                "port": int,
+                "if_id": str,
+                "active": str
+            }
+        }
+    }
+        
+
+
+# ===============================================================================
+#  Parser for
+#  * 'show platform software fed switch active ifm mappings lpn'
+#  * 'sh platform software fed switch {switch_num} ifm mappings lpn'
+# ================================================================================
+class ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn(
+    ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpnSchema
+):
+    """
+    Parser for :
+        * show platform software fed switch active ifm mappings lpn
+        * "show platform software fed switch {switch_num} ifm mappings lpn"
+    """
+
+    cli_command = [
+        "show platform software fed switch active ifm mappings lpn",
+        "show platform software fed switch {switch_num} ifm mappings lpn",
+    ]
+
+    def cli(self, switch_num="", output=None):
+        if output is None:
+            if switch_num:
+                cmd = self.cli_command[1].format(switch_num=switch_num)
+            else:
+                cmd = self.cli_command[0]
+            output = self.device.execute(cmd)
+        
+        # 19   1     18    TenGigabitEthernet1/0/19   0x0000001b  y
+        # 61   1     60    FortyGigabitEthernet2/1/1  0x00000087  Y
+        p = re.compile(
+            r"^(?P<lpn>\d+)\s+(?P<asic>\d+)\s+(?P<port>\d+)\s+(?P<interfaces>\S+)\s+(?P<if_id>(0x([\da-fA-F]){8}))\s+(?P<active>\S+)$"
+        )
+
+        # initial return dictionary
+        ret_dict = {}
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # 61   1     60    FortyGigabitEthernet2/1/1  0x00000087  Y
+            m = p.match(line)
+            if m:
+                group = m.groupdict()
+                interfaces = group["interfaces"]
+                sub_dict = ret_dict.setdefault("interfaces", {}).setdefault(
+                    interfaces, {}
+                )
+
+                sub_dict.setdefault("lpn", int(group["lpn"]))
+                sub_dict.setdefault("asic", int(group["asic"]))
+                sub_dict.setdefault("port", int(group["port"]))
+                sub_dict.setdefault("if_id", group["if_id"])
+                sub_dict.setdefault("active", group["active"])
+                continue
+        return ret_dict
+
diff --git a/src/genie/libs/parser/iosxe/show_policy_map.py b/src/genie/libs/parser/iosxe/show_policy_map.py
index ee26605d59..6d043a1fc2 100755
--- a/src/genie/libs/parser/iosxe/show_policy_map.py
+++ b/src/genie/libs/parser/iosxe/show_policy_map.py
@@ -1976,6 +1976,8 @@ class ShowPolicyMapControlPlaneClassMapSchema(MetaParser):
                     Optional('police_bps'): int,
                     Optional('police_limit'): int,
                     Optional('extended_limit'): int,
+                    Optional('rate_pps'): int,
+                    Optional('burst_pkt'): int,
                     Optional('conformed'): {
                         Optional('packets'): int,
                         Optional('bytes'): int,
@@ -2100,6 +2102,9 @@ def cli(self, class_map='', output=None):
 
         # Marker statistics: Disabled
         p11_2 = re.compile(r'^Marker +statistics: +(?P<marker_statistics>(\w+))$')
+        
+        #rate 2000 pps, burst 11264 packets
+        p13 = re.compile(r'^rate +(?P<rate_pps>(\d+)) pps, +burst +(?P<burst_pkt>(\d+)) packets$')
 
         for line in output.splitlines():
             line = line.strip()
@@ -2282,7 +2287,13 @@ def cli(self, class_map='', output=None):
                     value = m.groupdict()['value']
                 target_dict.update({action: value})
                 continue
-
+            # rate 2000 pps, burst 11264 packets
+            m = p13.match(line)
+            if m:
+                police_dict = class_dict.setdefault('police', {})
+                police_dict['rate_pps'] = int(m.groupdict()['rate_pps'])
+                police_dict['burst_pkt'] = int(m.groupdict()['burst_pkt'])
+                continue
         return ret_dict
 
 
diff --git a/src/genie/libs/parser/iosxe/show_power.py b/src/genie/libs/parser/iosxe/show_power.py
index ac365a9855..56f3e61ccc 100755
--- a/src/genie/libs/parser/iosxe/show_power.py
+++ b/src/genie/libs/parser/iosxe/show_power.py
@@ -49,7 +49,9 @@ class ShowStackPowerSchema(MetaParser):
                 Optional('power_stack_detail'):{  
                     'stack_mode': str,
                     'stack_topology': str,
-                    Optional('stack_ecomode'): str,
+                    Optional('Stack_total_input_power'): int,
+                    Optional('stack_auto_off'): str,
+                    Optional('power_supply_auto_off'): str,
                     'switch': {
                         Any(): {
                             'power_budget': int,
@@ -61,7 +63,7 @@ class ShowStackPowerSchema(MetaParser):
                             'port_2_status': str,
                             'neighbor_on_port_1': str,
                             'neighbor_on_port_2': str,
-                            Optional('ecomode'): str,
+                            Optional('auto_off'): str,
                             Optional('capacity'): str,
                         },
                     },
@@ -88,6 +90,7 @@ class ShowStackPowerSchema(MetaParser):
     }
 
 
+
 class ShowStackPower(ShowStackPowerSchema):
     """Parser for 
         * show stack-power
@@ -500,7 +503,7 @@ def cli(self,output=None):
                 r'(?P<switch_num>\d+) +'
                 r'(?P<power_supply_num>\d+)$')
 
-        #Power stack name: Powerstack-1
+        # Power stack name: Powerstack-1
         p2 = re.compile(r"^Power+\s+stack+\s+name:+\s+(?P<name>[\w\-]+)$")
 
         # Stack mode: Power sharing 
@@ -539,10 +542,13 @@ def cli(self,output=None):
         # Neighbor on port 2: 0000.0000.0000
         p14 = re.compile(r"^Neighbor+\s+on+\s+port+\s+2:+\s+(?P<neighbor_on_port_2>.*)$")
 
-        # Stack Ecomode: Disable
-        p15 = re.compile(r"^Stack Ecomode:+\s+(?P<stack_ecomode>\w+)$")
-        #Ecomode: FEP B auto offlined, capacity: 350 
-        p16 = re.compile(r"^Ecomode:\s+(?P<ecomode>.*),\s+capacity:\s+(?P<capacity>\w+)$")
+        # Stack Auto-off: Disable
+        p15 = re.compile(r"^Power+\s+Supply+\s+auto-off:+\s+(?P<power_supply_auto_off>\w+)$")
+
+        # Auto-off: FEP B auto offlined, capacity: 350 
+        p16 = re.compile(r"^Auto+\s+off:+\s+(?P<auto_off>.*),+\s+capacity:+\s+(?P<capacity>\w+)$")
+        
+        p17 = re.compile(r"^Stack+\s+total+\s+input+\s+power:+\s+(?P<Stack_total_input_power>\d+)$")
 
         for line in out.splitlines():
             line = line.strip()    
@@ -645,21 +651,27 @@ def cli(self,output=None):
                 stack_dict_5['neighbor_on_port_2'] = match.group('neighbor_on_port_2')
                 continue
             
-            # Stack Ecomode: Disable            
+            # Power Supply auto-off: Disable            
             if p15.match(line):
                 match = p15.match(line)
-                stack_dict_3['stack_ecomode'] = match.group('stack_ecomode')
+                stack_dict_3['power_supply_auto_off'] = match.group('power_supply_auto_off')
                 continue
             
-            # Ecomode: FEP B auto offlined, capacity: 350 
+            # Auto off: FEP B auto offlined, capacity: 350 
             if p16.match(line):
                 match = p16.match(line)
-                stack_dict_5['ecomode'] = match.group('ecomode')
+                stack_dict_5['auto_off'] = match.group('auto_off')
                 stack_dict_5['capacity'] = match.group('capacity')
                 continue
+            
+            if p17.match(line):
+                match = p17.match(line)
+                stack_dict_3['Stack_total_input_power'] = int(match.group('Stack_total_input_power'))
+                continue
         
         return ret_dict
 
+
 class ShowPowerInlineConsumptionSchema(MetaParser):
     """
     Schema for 
diff --git a/src/genie/libs/parser/iosxe/show_prp.py b/src/genie/libs/parser/iosxe/show_prp.py
new file mode 100644
index 0000000000..84c6bba7cf
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/show_prp.py
@@ -0,0 +1,123 @@
+'''   show_prp_channel_detail.py
+
+IOSXE parsers for the following show commands:
+
+    * 'show prp channel detail'
+
+'''
+# Python
+import re
+
+# Metaparser
+from genie.metaparser import MetaParser
+from genie.metaparser.util.schemaengine import Any, Optional
+
+
+class ShowPrpChannelDetailsSchema(MetaParser):
+    """ Schema for show prp channel detail """
+    schema = {
+        'prp_channel': {
+            Any(): {
+                'layer_type': str,
+                'ports': str,
+                'maxports': str,
+                'port_state': str,
+                'protocol': str,
+                Any(): {
+                    Optional('slot_port'): str,
+                    Optional('port_state'): str,
+                    Optional('protocol'): str,
+                }
+            }
+        }
+    }
+
+class ShowPrpChannelDetails(ShowPrpChannelDetailsSchema):
+    
+    """ Parser for show prp channel detail
+    """
+    cli_command = ['show prp channel detail']
+
+    def cli(self, output=None):
+
+        if output is None:
+            out = self.device.execute(self.cli_command[0])
+        else:
+            out = output
+
+        parsed_dict = {}
+        port_dict = {}
+    
+        # PRP-channel: PR1
+        p1 = re.compile(r'PRP-channel:\s(?P<prp_channel_id>PR\d+)')
+
+        # Layer type = L2 
+        p2 = re.compile(r'Layer\s*type\s*=\s*(?P<prp_layer_type>\w+)')
+
+        # Ports: 2	Maxports = 2
+        p3 = re.compile(r'Ports:\s*(?P<prp_ports>\d+)\s*Maxports = (?P<prp_max_ports>\d+)')
+
+        # Port state = prp-channel is Inuse
+        p4 = re.compile(r'Port\s*state\s*=\s*prp-channel\s*is\s*(?P<prp_port_state>\w+)')
+
+        # Logical slot/port = 1/1	Port state = Inuse 
+        p5 = re.compile(r'Logical\s*[a-zA-z\/]+\s*=\s*(?P<prp_slot_port>[\d\/]+)*\s*Port\s*state\s*=\s*(?P<prp_port_state>\S+)')
+
+        # Protocol = Enabled 
+        p6 = re.compile(r'\s*Protocol\s*=\s*(?P<prp_protocol>\w+)')
+
+        for line in out.splitlines():
+            line = line.strip()
+            
+            # PRP-channel: PR1
+            m = p1.match(line)
+
+            if m:
+                prpchannel_id = m.group('prp_channel_id')
+                devices_dict = parsed_dict.setdefault('prp_channel', {}).setdefault(prpchannel_id, {})
+                continue
+            
+            # Layer type = L2 
+            m = p2.match(line)
+            if m:
+                devices_dict['layer_type'] = m.group('prp_layer_type')
+                continue
+            
+            # Ports: 2	Maxports = 2
+            m = p3.match(line)
+            if m:
+                devices_dict['ports'] = m.group('prp_ports')
+                devices_dict['maxports'] = m.group('prp_max_ports')
+                continue
+            
+            # Port state = prp-channel is Inuse
+            m = p4.match(line)
+            if m:
+                devices_dict['port_state'] = m.group('prp_port_state')
+                continue
+            
+            # Port:
+            if 'Port:' in line:
+                port = line.split(':')[-1].strip()
+                port_dict = devices_dict.setdefault(port, {})
+                continue
+        
+            # Logical slot/port = 1/1	Port state = Inuse 
+            m = p5.match(line)
+            if m:
+                slot_port_state_dict = m.groupdict()
+                if slot_port_state_dict:
+                    port_dict['slot_port'] = slot_port_state_dict['prp_slot_port']
+                    port_dict['port_state'] = slot_port_state_dict['prp_port_state']
+                continue
+            
+            # Protocol = Enabled 
+            m = p6.match(line)
+            if m:
+                if 'protocol' not in devices_dict.keys():
+                    devices_dict['protocol'] = m.group('prp_protocol')
+                else:
+                    port_dict['protocol'] = m.group('prp_protocol')
+                continue
+            
+        return parsed_dict
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/show_routing.py b/src/genie/libs/parser/iosxe/show_routing.py
index ae796b365e..45e6d21f42 100755
--- a/src/genie/libs/parser/iosxe/show_routing.py
+++ b/src/genie/libs/parser/iosxe/show_routing.py
@@ -1362,10 +1362,10 @@ class ShowIpRouteWord(ShowIpRouteWordSchema):
        show ip route <Hostname or A.B.C.D>
        show ip route vrf <vrf> <Hostname or A.B.C.D>"""
     parser_command = ['show ip route vrf {vrf}',
-                'show ip route vrf {vrf} {route}',
-                'show ip route', 
-                'show ip route {route}',
-                'show ip route interface {interface}']
+                      'show ip route vrf {vrf} {route}',
+                      'show ip route',
+                      'show ip route {route}',
+                      'show ip route interface {interface}']
     IP_VER = 'ip'
 
     def cli(self, route=None, vrf=None, interface=None, output=None):
@@ -1388,10 +1388,6 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
         if not vrf:
             vrf = 'default'
 
-        # Routing Table: Mgmt-intf
-        # Routing Table: test_vrf1
-        p0 = re.compile(r'^Routing +Table: +(?P<routing_table>\S+)$')
-
         # initial regexp pattern
         # Routing entry for 10.151.0.0/24, 1 known subnets
         # Routing entry for 0.0.0.0/0, supernet
@@ -1402,7 +1398,8 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
         # Known via "connected", distance 0, metric 0 (connected)
         # Known via "eigrp 1", distance 130, metric 10880, type internal
         # Known via "bgp 65161", distance 20, metric 0, candidate default path
-        p2 = re.compile(r'^Known +via +\"(?P<known_via>[\w\s]+)\", '
+        # Known via "bgp 100.1", distance 20, metric 0, candidate default path
+        p2 = re.compile(r'^Known +via +\"(?P<known_via>[\w\s\.]+)\", '
                         r'+distance +(?P<distance>\d+), +metric '
                         r'+(?P<metric>\d+),? *(?:\S+ (?P<type>[\w\- '
                         r']+))?,? *.*$')
@@ -1432,7 +1429,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
         # * directly connected, via GigabitEthernet1.120
         # directly connected via LISP0
         p5_1 = re.compile(r'^\*? *directly +connected,? via +(?P<interface>\S+)$')
-        
+
         # Route metric is 10880, traffic share count is 1
         p6 = re.compile(r'^Route +metric +is +(?P<metric>\d+), +'
                         r'traffic +share +count +is +(?P<share_count>\d+)$')
@@ -1445,11 +1442,11 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
         # FE80::EEBD:1DFF:FE09:56C2
         p8 = re.compile(r'^(?P<fwd_ip>[\w\:]+)(, +(?P<fwd_intf>[\w\.\/\-]+)'
                         r'( indirectly connected)?)?$')
-        
+
         # receive via Loopback4
         p8_1 = re.compile(r'^receive +via +(?P<fwd_intf>[\w\.\/\-]+)$')
 
-        # Last updated 2w4d ago       
+        # Last updated 2w4d ago
         p9 = re.compile(r'^Last +updated +(?P<age>[\w\:\.]+) +ago$')
 
         # From FE80::EEBD:1DFF:FE09:56C2
@@ -1495,7 +1492,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
                 group = m.groupdict()
                 entry = group.pop('entry')
                 entry_dict = ret_dict.setdefault('entry', {}).setdefault(entry, {})
-                entry_dict.update({k:v for k,v in group.items() if v})
+                entry_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # Known via "static", distance 1, metric 0, candidate default path
@@ -1504,10 +1501,11 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             # Known via "connected", distance 0, metric 0 (connected)
             # Known via "eigrp 1", distance 130, metric 10880, type internal
             # Known via "bgp 65161", distance 20, metric 0, candidate default path
+            # Known via "bgp 100.1", distance 20, metric 0, candidate default path
             m = p2.match(line)
             if m:
                 group = m.groupdict()
-                entry_dict.update({k:v for k,v in group.items() if v})
+                entry_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # Tag 65161, type external
@@ -1516,8 +1514,8 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             if m:
                 group = m.groupdict()
                 tag_dict = ret_dict.setdefault('entry', {}).setdefault(entry, {})
-                tag_dict.update({'tag_name' : group['tag_name']})
-                tag_dict.update({'tag_type' : group['tag_type']})
+                tag_dict.update({'tag_name': group['tag_name']})
+                tag_dict.update({'tag_type': group['tag_type']})
 
                 continue
 
@@ -1526,7 +1524,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             m = p3.match(line)
             if m:
                 group = m.groupdict()
-                entry_dict.update({k:v for k,v in group.items() if v})
+                entry_dict.update({k: v for k, v in group.items() if v})
                 continue
             # Last update from 192.168.151.2 on Vlan101, 2w3d ago
             # Last update from 192.168.246.2 on Vlan103, 00:00:12 ago
@@ -1540,7 +1538,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             if m:
                 group = m.groupdict()
                 update_dict = entry_dict.setdefault('update', {})
-                update_dict.update({k:v for k,v in group.items() if v})
+                update_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # * 192.168.151.2, from 192.168.151.2, 2w3d ago, via Vlan101
@@ -1582,16 +1580,14 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             m = p16.match(line)
             if m:
                 hops_dict = entry_dict.setdefault('paths', {}).setdefault(index, {})
-                hops_dict.update({'as_hops' : m.groupdict()['num_hops']})
-
+                hops_dict.update({'as_hops': m.groupdict()['num_hops']})
                 continue
-            
+
             # Route tag 65161
             m = p17.match(line)
             if m:
                 route_dict = entry_dict.setdefault('paths', {}).setdefault(index, {})
-                route_dict.update({'route_tag' : m.groupdict()['route_tag']})
-
+                route_dict.update({'route_tag': m.groupdict()['route_tag']})
                 continue
 
             # Route metric is 10880, traffic share count is 1
@@ -1599,14 +1595,14 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             if m:
                 group = m.groupdict()
                 path_dict = entry_dict.setdefault('paths', {}).setdefault(index, {})
-                path_dict.update({k:v for k,v in group.items() if v})
+                path_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # Route count is 1/1, share count 0
             m = p7.match(line)
             if m:
                 group = m.groupdict()
-                entry_dict.update({k:v for k,v in group.items() if v})
+                entry_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # FE80::EEBD:1DFF:FE09:56C2, Vlan202
@@ -1616,7 +1612,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
                 group = m.groupdict()
                 index += 1
                 path_dict = entry_dict.setdefault('paths', {}).setdefault(index, {})
-                path_dict.update({k:v for k,v in group.items() if v})
+                path_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # receive via Loopback4
@@ -1625,7 +1621,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
                 group = m.groupdict()
                 index += 1
                 path_dict = entry_dict.setdefault('paths', {}).setdefault(index, {})
-                path_dict.update({k:v for k,v in group.items() if v})
+                path_dict.update({k: v for k, v in group.items() if v})
                 continue
 
             # From FE80::EEBD:1DFF:FE09:56C2
@@ -1671,7 +1667,7 @@ def cli(self, route=None, vrf=None, interface=None, output=None):
             # Advertised by eigrp 10 route-map GENIE_STATIC_INTO_EIGRP
             m18 = p18.match(line)
             if m18:
-                entry_dict.update({'advertised_by' : m18.groupdict()['advertised_by']})
+                entry_dict.update({'advertised_by': m18.groupdict()['advertised_by']})
                 continue
 
         ret_dict.update({'total_prefixes': index}) if ret_dict else None
diff --git a/src/genie/libs/parser/iosxe/show_spanning_tree.py b/src/genie/libs/parser/iosxe/show_spanning_tree.py
index fd0d4672b7..5e9ff1ffc8 100755
--- a/src/genie/libs/parser/iosxe/show_spanning_tree.py
+++ b/src/genie/libs/parser/iosxe/show_spanning_tree.py
@@ -1500,8 +1500,10 @@ class ShowSpanningTreeSummaryTotalsSchema(MetaParser):
         'root_bridge': str,
         'extended_system_id': bool,
         'portfast': bool,
-        'portfast_bpdu_guard': bool,
-        'portfast_bpdu_filter': bool,
+        Optional('portfast_bpdu_guard'): bool,
+        Optional('portfast_bpdu_filter'): bool,
+        Optional('portfast_edge_bpdu_guard'): bool,
+        Optional('portfast_edge_bpdu_filter'): bool,
         'loopguard': bool,
         'etherchannel_misconfig_guard': bool,
         'uplinkfast': bool,
@@ -1543,8 +1545,11 @@ def cli(self, output=None):
         # EtherChannel misconfig guard            is enabled
         # UplinkFast                              is disabled
         # BackboneFast                            is disabled
+        # Portfast Edge BPDU Guard Default        is disabled
+        # Portfast Edge BPDU Filter Default       is disabled
         p3 = re.compile(r'^(?P<key>Extended system ID|Portfast|PortFast BPDU Guard|Portfast BPDU Filter|'
-            r'Loopguard|EtherChannel misconfig guard|UplinkFast|BackboneFast)(\sDefault)?\s+is (?P<state>\w+)$')
+            r'Portfast Edge BPDU Guard|Portfast Edge BPDU Filter|Loopguard|EtherChannel misconfig guard|'
+            r'UplinkFast|BackboneFast)(\sDefault)?\s+is (?P<state>\w+)$')
 
         # Name                   Blocking Listening Learning Forwarding STP Active
         p4 = re.compile(r'^Name\s+Blocking Listening Learning Forwarding STP Active$')
@@ -1577,6 +1582,8 @@ def cli(self, output=None):
             # EtherChannel misconfig guard            is enabled
             # UplinkFast                              is disabled
             # BackboneFast                            is disabled
+            # Portfast Edge BPDU Guard Default        is disabled
+            # Portfast Edge BPDU Filter Default       is disabled
             m = p3.match(line)
             if m:
                 ret_dict[m.groupdict()['key'].strip().lower().replace(' ', '_')] = m.groupdict()['state'] == 'enabled'
diff --git a/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_expected.py
new file mode 100644
index 0000000000..f270848f2b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_expected.py
@@ -0,0 +1,34 @@
+expected_output = {
+    "channel_assignment": {
+        "allowed_channel_list": "36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161",
+        "anchor_time_hour": 0,
+        "chan_assn_mode": "AUTO",
+        "chan_upd_int": "600 seconds",
+        "chan_width_mhz": "best",
+        "channel_dwell_times": {
+            "average": "8 days 12 hours 26 " "minutes 20 seconds",
+            "max": "19 days 23 hours 19 " "minutes 57 seconds",
+            "minimum": "1 hours 38 minutes " "0 seconds",
+        },
+        "channel_energy_levels": {
+            "average_dbm": -80.0,
+            "max_dbm": -74.0,
+            "min_dbm": -86.0,
+        },
+        "channel_update_contribution": {
+            "channel_interference": "Enable",
+            "channel_load": "Disable",
+            "channel_noise": "Enable",
+            "device_aware": "Disable",
+        },
+        "clean_air": "Disabled",
+        "dca_db": 15,
+        "dca_level": "MEDIUM",
+        "dca_min_energy_dbm": -95.0,
+        "max_chan_width_mhz": 40,
+        "unused_channel_list": "165,169,173",
+        "wlc_leader_ip": "9.2.45.15",
+        "wlc_leader_name": "ewlc_2",
+        "zero_wait": "Disabled",
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_output.txt
new file mode 100644
index 0000000000..7da2f2f95b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowApDot115GhzChannel/cli/equal/golden_output2_output.txt
@@ -0,0 +1,29 @@
+Local Automatic Channel Assignment
+  Channel Assignment Mode                    : AUTO
+  Channel Update Interval                    : 600 seconds
+  Anchor time (Hour of the day)              : 0
+  Channel Update Contribution
+    Noise                                    : Enable
+    Interference                             : Enable
+    Load                                     : Disable
+    Device Aware                             : Disable
+  CleanAir Event-driven RRM option           : Disabled
+  Zero Wait DFS                              : Disabled
+  Channel Assignment Leader                  : ewlc_2 (9.2.45.15)
+
+  DCA Sensitivity Level                      : MEDIUM : 15 dB
+  DCA 802.11n/ac Channel Width               : best
+  DBS Max Channel Width                      : 40 MHz
+  DCA Minimum Energy Limit                   : -95 dBm
+  DCA Aggressive on startup                  : Enabled
+  Channel Energy Levels
+    Minimum                                  : -86 dBm
+    Average                                  : -80 dBm
+    Maximum                                  : -74 dBm
+  Channel Dwell Times
+    Minimum                                  : 1 hour 38 minutes 0 second 
+    Average                                  : 8 days 12 hours 26 minutes 20 seconds 
+    Maximum                                  : 19 days 23 hours 19 minutes 57 seconds 
+  802.11a 5 GHz Auto-RF Channel List
+    Allowed Channel List                     : 36,40,44,48,52,56,60,64,100,104,108,112,116,120,124,128,132,136,140,144,149,153,157,161
+    Unused Channel List                      : 165,169,173
diff --git a/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_expected.py b/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_expected.py
new file mode 100644
index 0000000000..866ebd8053
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_expected.py
@@ -0,0 +1,60 @@
+expected_output = {
+    "ap_name": {
+        "AP002A.1087.CA0A": {
+            "ap_ip_address": "2001:9:3:13:c822:82c8:32da:484d",
+            "ap_model": "AIR-AP2802E-D-K9",
+            "country": "IN",
+            "ethernet_mac": "002a.1087.ca0a",
+            "location": "default location",
+            "radio_mac": "00a2.eefd.9f20",
+            "regulatory_domain": "-D",
+            "slots_count": 2,
+            "state": "Registered",
+        },
+        "AP687D.B402.BB44": {
+            "ap_ip_address": "9.3.13.220",
+            "ap_model": "C9120AXE-D",
+            "country": "IN",
+            "ethernet_mac": "687d.b402.bb44",
+            "location": "default location",
+            "radio_mac": "687d.b475.dba0",
+            "regulatory_domain": "-D",
+            "slots_count": 2,
+            "state": "Registered",
+        },
+        "AP687D.B402.EF8C": {
+            "ap_ip_address": "9.3.13.199",
+            "ap_model": "C9120AXE-D",
+            "country": "IN",
+            "ethernet_mac": "687d.b402.ef8c",
+            "location": "default location",
+            "radio_mac": "687d.b477.7de0",
+            "regulatory_domain": "-D",
+            "slots_count": 2,
+            "state": "Registered",
+        },
+        "AP7061.7B5F.1136": {
+            "ap_ip_address": "2001:9:3:13:cc12:f0c6:3777:b777",
+            "ap_model": "AIR-AP3802E-D-K9",
+            "country": "IN",
+            "ethernet_mac": "7061.7b5f.1136",
+            "location": "default location",
+            "radio_mac": "9077.ee00.c7c0",
+            "regulatory_domain": "-D",
+            "slots_count": 2,
+            "state": "Registered",
+        },
+        "APA4B2.3987.937C": {
+            "ap_ip_address": "9.3.13.200",
+            "ap_model": "C9120AXE-D",
+            "country": "IN",
+            "ethernet_mac": "a4b2.3987.937c",
+            "location": "default location",
+            "radio_mac": "a4b2.3983.7580",
+            "regulatory_domain": "-D",
+            "slots_count": 2,
+            "state": "Registered",
+        },
+    },
+    "ap_neighbor_count": 5,
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_output.txt b/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_output.txt
new file mode 100644
index 0000000000..c300535b3e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowApSummary/cli/equal/golden_output5_output.txt
@@ -0,0 +1,12 @@
+Number of APs: 5
+
+CC = Country Code
+RD = Regulatory Domain
+
+AP Name                          Slots AP Model             Ethernet MAC   Radio MAC      CC   RD   IP Address                                State        Location
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------
+AP002A.1087.CA0A                 2     AIR-AP2802E-D-K9     002a.1087.ca0a 00a2.eefd.9f20 IN   -D   2001:9:3:13:c822:82c8:32da:484d           Registered   default location
+AP687D.B402.BB44                 2     C9120AXE-D           687d.b402.bb44 687d.b475.dba0 IN   -D   9.3.13.220                                Registered   default location
+AP687D.B402.EF8C                 2     C9120AXE-D           687d.b402.ef8c 687d.b477.7de0 IN   -D   9.3.13.199                                Registered   default location
+AP7061.7B5F.1136                 2     AIR-AP3802E-D-K9     7061.7b5f.1136 9077.ee00.c7c0 IN   -D   2001:9:3:13:cc12:f0c6:3777:b777           Registered   default location
+APA4B2.3987.937C                 2     C9120AXE-D           a4b2.3987.937c a4b2.3983.7580 IN   -D   9.3.13.200                                Registered   default location
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_arguments.json
new file mode 100644
index 0000000000..b877e1d83a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_arguments.json
@@ -0,0 +1,4 @@
+{
+    "neighbor": "10.82.15.252",
+    "address_family": "vpnv4"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_expected.py b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_expected.py
new file mode 100644
index 0000000000..60c5c1d6aa
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_expected.py
@@ -0,0 +1,58 @@
+expected_output = {
+    "vrf": {
+        "default": {
+            "neighbor": {
+                "10.82.15.252": {
+                    "address_family": {
+                        "vpnv4": {
+                            "received_routes": {},
+                            "bgp_table_version": 18,
+                            "local_router_id": "100.127.142.250"
+                        },
+                        "vpnv4 RD 65357:201": {
+                            "bgp_table_version": 18,
+                            "local_router_id": "100.127.142.250",
+                            "route_distinguisher": "65357:201",
+                            "default_vrf": "WAN_VRF",
+                            "received_routes": {
+                                "0.0.0.0": {
+                                    "index": {
+                                        1: {
+                                            "status_codes": "",
+                                            "next_hop": "10.82.15.252",
+                                            "origin_codes": "i",
+                                            "weight": 0,
+                                            "path": "0 65500 65340"
+                                        }
+                                    }
+                                },
+                                "10.1.1.0/24": {
+                                    "index": {
+                                        1: {
+                                            "status_codes": "",
+                                            "next_hop": "10.82.15.252",
+                                            "origin_codes": "?",
+                                            "weight": 0,
+                                            "path": "0 65500 65340"
+                                        }
+                                    }
+                                },
+                                "10.1.2.0/24": {
+                                    "index": {
+                                        1: {
+                                            "status_codes": "",
+                                            "next_hop": "10.82.15.252",
+                                            "origin_codes": "?",
+                                            "weight": 0,
+                                            "path": "0 65500 65340"
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_output.txt b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_output.txt
new file mode 100644
index 0000000000..8b53020025
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowBgpNeighborsReceivedRoutes/cli/equal/golden_output4_output.txt
@@ -0,0 +1,16 @@
+show ip bgp vpnv4 all neighbors 10.82.15.252 received-routes
+BGP table version is 18, local router ID is 100.127.142.250
+Status codes: s suppressed, d damped, h history, * valid, > best, i - internal,
+r RIB-failure, S Stale, m multipath, b backup-path, f RT-Filter,
+x best-external, a additional-path, c RIB-compressed,
+t secondary path, L long-lived-stale,
+Origin codes: i - IGP, e - EGP, ? - incomplete
+RPKI validation codes: V valid, I invalid, N Not found
+
+Network          Next Hop            Metric LocPrf Weight Path
+Route Distinguisher: 65357:201 (default for vrf WAN_VRF)
+
+      0.0.0.0 10.82.15.252 0 0 65500 65340 i
+      10.1.1.0/24 10.82.15.252 0 0 65500 65340 ?
+      10.1.2.0/24 10.82.15.252 0 0 65500 65340 ?
+Total number of prefixes 3
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..9a89d9076e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/empty/empty_output_arguments.json
@@ -0,0 +1,4 @@
+{
+    "interface_name" : "GigabitEthernet1/0/4"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_arguments.json
new file mode 100644
index 0000000000..9a89d9076e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_arguments.json
@@ -0,0 +1,4 @@
+{
+    "interface_name" : "GigabitEthernet1/0/4"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..f49f3b6be9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_expected.py
@@ -0,0 +1,70 @@
+expected_output={
+  'target_db': {
+    'Gi1/0/4': {
+      'hw_policy_signature': '0000039C',
+      'policies': 2,
+      'rules': 6,
+      'sig': '0000039C',
+      'sw_policy': {
+        'policy': 'ra_host',
+        'feature': 'RA guard - Active'
+      },
+      'mask_id': {
+        '00000200': {
+          'rule': 'DHCP SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00000200',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 546,
+          'feat': '1'
+        },
+        '00000080': {
+          'rule': 'DHCP CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000080',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 547,
+          'feat': '1'
+        },
+        '00000100': {
+          'rule': 'DHCP SERVER',
+          'protocol': 'UDP',
+          'mask': '00000100',
+          'action': 'PUNT',
+          'match1': 547,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000004': {
+          'rule': 'RS',
+          'protocol': 'ICMPV6',
+          'mask': '00000004',
+          'action': 'PUNT',
+          'match1': 133,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000008': {
+          'rule': 'RA',
+          'protocol': 'ICMPV6',
+          'mask': '00000008',
+          'action': 'PUNT',
+          'match1': 134,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000010': {
+          'rule': 'REDIR',
+          'protocol': 'ICMPV6',
+          'mask': '00000010',
+          'action': 'PUNT',
+          'match1': 137,
+          'match2': 0,
+          'feat': '1'
+        }
+      }
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..74ed51acb0
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output1_output.txt
@@ -0,0 +1,33 @@
+show device-tracking capture-policy interface GigabitEthernet 1/0/4 
+
+HW Target Gi1/0/4 HW policy signature 0000039C policies#:2 rules 6 sig 0000039C 
+
+SW policy dhcp_client feature DHCP Guard - Active 
+
+SW policy ra_host feature RA guard - Active 
+
+ 
+
+Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546#feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP CLIENT Protocol UDP mask 00000080 action PUNT match1 0 match2 547#feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP SERVER Protocol UDP mask 00000100 action PUNT match1 547 match2 0#feat:1 
+
+feature DHCP Guard 
+
+Rule RS Protocol ICMPV6 mask 00000004 action PUNT match1 133 match2 0#feat:1 
+
+feature RA guard 
+
+Rule RA Protocol ICMPV6 mask 00000008 action PUNT match1 134 match2 0#feat:1 
+
+feature RA guard 
+
+Rule REDIR Protocol ICMPV6 mask 00000010 action PUNT match1 137 match2 0#feat:1 
+
+feature RA guard 
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_arguments.json
new file mode 100644
index 0000000000..c4607db07a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_arguments.json
@@ -0,0 +1,3 @@
+{
+    "vlan_id" : "30"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_expected.py
new file mode 100644
index 0000000000..b941b973d9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_expected.py
@@ -0,0 +1,142 @@
+expected_output={
+  'target_db': {
+    'vlan 30': {
+      'hw_policy_signature': '0001DF9F',
+      'policies': 1,
+      'rules': 14,
+      'sig': '0001DF9F',
+      'sw_policy': {
+        'policy': 'default',
+        'feature': 'Device-tracking - Active'
+      },
+      'mask_id': {
+        '00000400': {
+          'rule': 'DHCP4 CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000400',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 67,
+          'feat': '1'
+        },
+        '00001000': {
+          'rule': 'DHCP4 SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00001000',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 68,
+          'feat': '1'
+        },
+        '00000800': {
+          'rule': 'DHCP4 SERVER',
+          'protocol': 'UDP',
+          'mask': '00000800',
+          'action': 'PUNT',
+          'match1': 67,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00004000': {
+          'rule': 'ARP',
+          'protocol': 'IPV4',
+          'mask': '00004000',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000200': {
+          'rule': 'DHCP SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00000200',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 546,
+          'feat': '1'
+        },
+        '00000080': {
+          'rule': 'DHCP CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000080',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 547,
+          'feat': '1'
+        },
+        '00000100': {
+          'rule': 'DHCP SERVER',
+          'protocol': 'UDP',
+          'mask': '00000100',
+          'action': 'PUNT',
+          'match1': 547,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000004': {
+          'rule': 'RS',
+          'protocol': 'ICMPV6',
+          'mask': '00000004',
+          'action': 'PUNT',
+          'match1': 133,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000008': {
+          'rule': 'RA',
+          'protocol': 'ICMPV6',
+          'mask': '00000008',
+          'action': 'PUNT',
+          'match1': 134,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000001': {
+          'rule': 'NS',
+          'protocol': 'ICMPV6',
+          'mask': '00000001',
+          'action': 'PUNT',
+          'match1': 135,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000002': {
+          'rule': 'NA',
+          'protocol': 'ICMPV6',
+          'mask': '00000002',
+          'action': 'PUNT',
+          'match1': 136,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000010': {
+          'rule': 'REDIR',
+          'protocol': 'ICMPV6',
+          'mask': '00000010',
+          'action': 'PUNT',
+          'match1': 137,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00008000': {
+          'rule': 'DAR',
+          'protocol': 'ICMPV6',
+          'mask': '00008000',
+          'action': 'PUNT',
+          'match1': 157,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00010000': {
+          'rule': 'DAC',
+          'protocol': 'ICMPV6',
+          'mask': '00010000',
+          'action': 'PUNT',
+          'match1': 158,
+          'match2': 0,
+          'feat': '1'
+        }
+      }
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_output.txt
new file mode 100644
index 0000000000..0ce2a88acc
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output2_output.txt
@@ -0,0 +1,61 @@
+HW Target vlan 30    HW policy signature 0001DF9F policies#:1 rules 14 sig 0001DF9F 
+
+SW policy default feature Device-tracking - Active 
+
+ 
+
+Rule DHCP4 CLIENT Protocol UDP mask 00000400 action PUNT match1 0 match2 67#feat:1 
+
+feature Device-tracking 
+
+Rule DHCP4 SERVER SOURCE Protocol UDP mask 00001000 action PUNT match1 0 match2 68#feat:1 
+
+feature Device-tracking 
+
+Rule DHCP4 SERVER Protocol UDP mask 00000800 action PUNT match1 67 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule ARP Protocol IPV4 mask 00004000 action PUNT match1 0 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546#feat:1 
+
+feature Device-tracking 
+
+Rule DHCP CLIENT Protocol UDP mask 00000080 action PUNT match1 0 match2 547#feat:1 
+
+feature Device-tracking 
+
+Rule DHCP SERVER Protocol UDP mask 00000100 action PUNT match1 547 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule RS Protocol ICMPV6 mask 00000004 action PUNT match1 133 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule RA Protocol ICMPV6 mask 00000008 action PUNT match1 134 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule NS Protocol ICMPV6 mask 00000001 action PUNT match1 135 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule NA Protocol ICMPV6 mask 00000002 action PUNT match1 136 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule REDIR Protocol ICMPV6 mask 00000010 action PUNT match1 137 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule DAR Protocol ICMPV6 mask 00008000 action PUNT match1 157 match2 0#feat:1 
+
+feature Device-tracking 
+
+Rule DAC Protocol ICMPV6 mask 00010000 action PUNT match1 158 match2 0#feat:1 
+
+feature Device-tracking 
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..15df545a6b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_expected.py
@@ -0,0 +1,298 @@
+expected_output={
+  'hw_policy_db': {
+    '0000039C': {
+      'targets': 2,
+      'targets_list': {
+        'Gi1/0/4': {
+          'type': 0,
+          'handle': '40B'
+        },
+        'Po128': {
+          'type': 0,
+          'handle': '491'
+        }
+      }
+    },
+    '0001DF9F': {
+      'targets': 1,
+      'targets_list': {
+        'vlan 30': {
+          'type': 1,
+          'handle': '1E'
+        }
+      }
+    }
+  },
+  'target_db': {
+    'Gi1/0/4': {
+      'hw_policy_signature': '0000039C',
+      'policies': 2,
+      'rules': 6,
+      'sig': '0000039C',
+      'sw_policy': {
+        'policy': 'ra_host',
+        'feature': 'RA guard'
+      },
+      'mask_id': {
+        '00000200': {
+          'rule': 'DHCP SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00000200',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 546,
+          'feat': '1'
+        },
+        '00000080': {
+          'rule': 'DHCP CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000080',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 547,
+          'feat': '1'
+        },
+        '00000100': {
+          'rule': 'DHCP SERVER',
+          'protocol': 'UDP',
+          'mask': '00000100',
+          'action': 'PUNT',
+          'match1': 547,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000004': {
+          'rule': 'RS',
+          'protocol': 'ICMPV6',
+          'mask': '00000004',
+          'action': 'PUNT',
+          'match1': 133,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000008': {
+          'rule': 'RA',
+          'protocol': 'ICMPV6',
+          'mask': '00000008',
+          'action': 'PUNT',
+          'match1': 134,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000010': {
+          'rule': 'REDIR',
+          'protocol': 'ICMPV6',
+          'mask': '00000010',
+          'action': 'PUNT',
+          'match1': 137,
+          'match2': 0,
+          'feat': '1'
+        }
+      }
+    },
+    'Po128': {
+      'hw_policy_signature': '0000039C',
+      'policies': 2,
+      'rules': 6,
+      'sig': '0000039C',
+      'sw_policy': {
+        'policy': 'ra_router',
+        'feature': 'RA guard'
+      },
+      'mask_id': {
+        '00000200': {
+          'rule': 'DHCP SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00000200',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 546,
+          'feat': '1'
+        },
+        '00000080': {
+          'rule': 'DHCP CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000080',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 547,
+          'feat': '1'
+        },
+        '00000100': {
+          'rule': 'DHCP SERVER',
+          'protocol': 'UDP',
+          'mask': '00000100',
+          'action': 'PUNT',
+          'match1': 547,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000004': {
+          'rule': 'RS',
+          'protocol': 'ICMPV6',
+          'mask': '00000004',
+          'action': 'PUNT',
+          'match1': 133,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000008': {
+          'rule': 'RA',
+          'protocol': 'ICMPV6',
+          'mask': '00000008',
+          'action': 'PUNT',
+          'match1': 134,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000010': {
+          'rule': 'REDIR',
+          'protocol': 'ICMPV6',
+          'mask': '00000010',
+          'action': 'PUNT',
+          'match1': 137,
+          'match2': 0,
+          'feat': '1'
+        }
+      }
+    },
+    'vlan 30': {
+      'hw_policy_signature': '0001DF9F',
+      'policies': 1,
+      'rules': 14,
+      'sig': '0001DF9F',
+      'sw_policy': {
+        'policy': 'default',
+        'feature': 'Device-tracking'
+      },
+      'mask_id': {
+        '00000400': {
+          'rule': 'DHCP4 CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000400',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 67,
+          'feat': '1'
+        },
+        '00001000': {
+          'rule': 'DHCP4 SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00001000',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 68,
+          'feat': '1'
+        },
+        '00000800': {
+          'rule': 'DHCP4 SERVER',
+          'protocol': 'UDP',
+          'mask': '00000800',
+          'action': 'PUNT',
+          'match1': 67,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00004000': {
+          'rule': 'ARP',
+          'protocol': 'IPV4',
+          'mask': '00004000',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000200': {
+          'rule': 'DHCP SERVER SOURCE',
+          'protocol': 'UDP',
+          'mask': '00000200',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 546,
+          'feat': '1'
+        },
+        '00000080': {
+          'rule': 'DHCP CLIENT',
+          'protocol': 'UDP',
+          'mask': '00000080',
+          'action': 'PUNT',
+          'match1': 0,
+          'match2': 547,
+          'feat': '1'
+        },
+        '00000100': {
+          'rule': 'DHCP SERVER',
+          'protocol': 'UDP',
+          'mask': '00000100',
+          'action': 'PUNT',
+          'match1': 547,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000004': {
+          'rule': 'RS',
+          'protocol': 'ICMPV6',
+          'mask': '00000004',
+          'action': 'PUNT',
+          'match1': 133,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000008': {
+          'rule': 'RA',
+          'protocol': 'ICMPV6',
+          'mask': '00000008',
+          'action': 'PUNT',
+          'match1': 134,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000001': {
+          'rule': 'NS',
+          'protocol': 'ICMPV6',
+          'mask': '00000001',
+          'action': 'PUNT',
+          'match1': 135,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000002': {
+          'rule': 'NA',
+          'protocol': 'ICMPV6',
+          'mask': '00000002',
+          'action': 'PUNT',
+          'match1': 136,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00000010': {
+          'rule': 'REDIR',
+          'protocol': 'ICMPV6',
+          'mask': '00000010',
+          'action': 'PUNT',
+          'match1': 137,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00008000': {
+          'rule': 'DAR',
+          'protocol': 'ICMPV6',
+          'mask': '00008000',
+          'action': 'PUNT',
+          'match1': 157,
+          'match2': 0,
+          'feat': '1'
+        },
+        '00010000': {
+          'rule': 'DAC',
+          'protocol': 'ICMPV6',
+          'mask': '00010000',
+          'action': 'PUNT',
+          'match1': 158,
+          'match2': 0,
+          'feat': '1'
+        }
+      }
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..9047da1526
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowDeviceTrackingCapturePolicy/cli/equal/golden_output_output.txt
@@ -0,0 +1,139 @@
+HW Policy DB: 
+
+HW Policy 0000039C #targets:2 
+
+Target Gi1/0/4 type 0 handle 40B 
+
+Target Po128 type 0 handle 491 
+
+HW Policy 0001DF9F #targets:1 
+
+Target vlan 30    type 1 handle 1E 
+
+Target DB: 
+
+HW Target Gi1/0/4 HW policy signature 0000039C policies#:2 rules#:6 sig 0000039C 
+
+SW policy dhcp_client feature DHCP Guard  
+
+SW policy ra_host feature RA guard  
+
+ 
+
+Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546 #feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP CLIENT Protocol UDP mask 00000080 action PUNT match1 0 match2 547 #feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP SERVER Protocol UDP mask 00000100 action PUNT match1 547 match2 0 #feat:1 
+
+feature DHCP Guard 
+
+Rule RS Protocol ICMPV6 mask 00000004 action PUNT match1 133 match2 0 #feat:1 
+
+feature RA guard 
+
+Rule RA Protocol ICMPV6 mask 00000008 action PUNT match1 134 match2 0 #feat:1 
+
+feature RA guard 
+
+Rule REDIR Protocol ICMPV6 mask 00000010 action PUNT match1 137 match2 0 #feat:1 
+
+feature RA guard 
+
+HW Target Po128 HW policy signature 0000039C policies#:2 rules#:6 sig 0000039C 
+
+SW policy dhcp_server feature DHCP Guard  
+
+SW policy ra_router feature RA guard  
+
+ 
+
+Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546 #feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP CLIENT Protocol UDP mask 00000080 action PUNT match1 0 match2 547 #feat:1 
+
+feature DHCP Guard 
+
+Rule DHCP SERVER Protocol UDP mask 00000100 action PUNT match1 547 match2 0 #feat:1 
+
+feature DHCP Guard 
+
+Rule RS Protocol ICMPV6 mask 00000004 action PUNT match1 133 match2 0 #feat:1 
+
+feature RA guard 
+
+Rule RA Protocol ICMPV6 mask 00000008 action PUNT match1 134 match2 0 #feat:1 
+
+feature RA guard 
+
+Rule REDIR Protocol ICMPV6 mask 00000010 action PUNT match1 137 match2 0 #feat:1 
+
+feature RA guard 
+
+HW Target vlan 30    HW policy signature 0001DF9F policies#:1 rules#:14 sig 0001DF9F 
+
+SW policy default feature Device-tracking  
+
+ 
+
+Rule DHCP4 CLIENT Protocol UDP mask 00000400 action PUNT match1 0 match2 67 #feat:1 
+
+feature Device-tracking 
+
+Rule DHCP4 SERVER SOURCE Protocol UDP mask 00001000 action PUNT match1 0 match2 68 #feat:1 
+
+feature Device-tracking 
+
+Rule DHCP4 SERVER Protocol UDP mask 00000800 action PUNT match1 67 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule ARP Protocol IPV4 mask 00004000 action PUNT match1 0 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule DHCP SERVER SOURCE Protocol UDP mask 00000200 action PUNT match1 0 match2 546 #feat:1 
+
+feature Device-tracking 
+
+Rule DHCP CLIENT Protocol UDP mask 00000080 action PUNT match1 0 match2 547 #feat:1 
+
+feature Device-tracking 
+
+Rule DHCP SERVER Protocol UDP mask 00000100 action PUNT match1 547 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule RS Protocol ICMPV6 mask 00000004 action PUNT match1 133 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule RA Protocol ICMPV6 mask 00000008 action PUNT match1 134 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule NS Protocol ICMPV6 mask 00000001 action PUNT match1 135 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule NA Protocol ICMPV6 mask 00000002 action PUNT match1 136 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule REDIR Protocol ICMPV6 mask 00000010 action PUNT match1 137 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule DAR Protocol ICMPV6 mask 00008000 action PUNT match1 157 match2 0 #feat:1 
+
+feature Device-tracking 
+
+Rule DAC Protocol ICMPV6 mask 00010000 action PUNT match1 158 match2 0 #feat:1 
+
+feature Device-tracking 
diff --git a/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_expected.py b/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_expected.py
index 4cd4bc9752..400e3d615f 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_expected.py
+++ b/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_expected.py
@@ -1,6 +1,6 @@
 expected_output = {
     'current_mode': 'STATUS',
-    'led_ecomode': 'Enabled',
+    'led_auto_off': 'Enabled',
     'number_of_ports_in_status': '40',
     'status': {
         'FortyGigabitEthernet1/1/1': 'BLACK',
diff --git a/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_output.txt b/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_output.txt
index 5cddc934bf..c4decc5e20 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_output.txt
+++ b/src/genie/libs/parser/iosxe/tests/ShowHardwareLed/cli/equal/golden_interface_output4_output.txt
@@ -1,5 +1,5 @@
 Current Mode: STATUS
-LED Ecomode: Enabled
+LED Auto off: Enabled
 
 SWITCH: 1
 SYSTEM: GREEN
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_arguments.json
new file mode 100644
index 0000000000..185763d7d0
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_arguments.json
@@ -0,0 +1,3 @@
+{
+    "include": "line protocol|Hardware is|BW"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_expected.py b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_expected.py
new file mode 100644
index 0000000000..96b68363e8
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_expected.py
@@ -0,0 +1,62 @@
+expected_output = {
+    "GigabitEthernet0/0/0": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "is_deleted": False,
+        "enabled": False,
+        "line_protocol": "down",
+        "oper_status": "down",
+        "type": "ISR4221-2x1GE",
+        "mac_address": "70ea.1ab5.49b0",
+        "phys_address": "70ea.1ab5.49b0",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "GigabitEthernet0/0/1": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "is_deleted": False,
+        "enabled": False,
+        "line_protocol": "down",
+        "oper_status": "down",
+        "type": "ISR4221-2x1GE",
+        "mac_address": "70ea.1ab5.49b1",
+        "phys_address": "70ea.1ab5.49b1",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "GigabitEthernet0/1/0": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "is_deleted": False,
+        "enabled": False,
+        "line_protocol": "down",
+        "oper_status": "down",
+        "type": "NIM-1GE-CU-SFP",
+        "mac_address": "70ea.1ab5.49b8",
+        "phys_address": "70ea.1ab5.49b8",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "GigabitEthernet0/2/0": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "is_deleted": False,
+        "enabled": False,
+        "line_protocol": "down",
+        "oper_status": "down",
+        "type": "NIM-1GE-CU-SFP",
+        "mac_address": "70ea.1ab5.49c0",
+        "phys_address": "70ea.1ab5.49c0",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_output.txt b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_output.txt
new file mode 100644
index 0000000000..7d87efeeae
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfaces/cli/equal/golden_interface_output_15_output.txt
@@ -0,0 +1,12 @@
+GigabitEthernet0/0/0 is administratively down, line protocol is down 
+  Hardware is ISR4221-2x1GE, address is 70ea.1ab5.49b0 (bia 70ea.1ab5.49b0)
+  MTU 1500 bytes, BW 1000000 Kbit/sec, DLY 10 usec, 
+GigabitEthernet0/0/1 is administratively down, line protocol is down 
+  Hardware is ISR4221-2x1GE, address is 70ea.1ab5.49b1 (bia 70ea.1ab5.49b1)
+  MTU 1500 bytes, BW 1000000 Kbit/sec, DLY 10 usec, 
+GigabitEthernet0/1/0 is administratively down, line protocol is down 
+  Hardware is NIM-1GE-CU-SFP, address is 70ea.1ab5.49b8 (bia 70ea.1ab5.49b8)
+  MTU 1500 bytes, BW 1000000 Kbit/sec, DLY 10 usec, 
+GigabitEthernet0/2/0 is administratively down, line protocol is down 
+  Hardware is NIM-1GE-CU-SFP, address is 70ea.1ab5.49c0 (bia 70ea.1ab5.49c0)
+  MTU 1500 bytes, BW 1000000 Kbit/sec, DLY 10 usec, 
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden2_expected.py
index bfd5a3b450..e9a03d21ea 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden2_expected.py
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden2_expected.py
@@ -2,7 +2,7 @@
     'interfaces': {
         'Te1/1/1': {
             'current': '4.2',
-            'max_power': '0.0',
+            'max_power': '0.0 W',
             'opticalrx': '-40.0',
             'opticaltx': '-5.7',
             'temp': '37.3',
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_expected.py b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_expected.py
new file mode 100644
index 0000000000..1e17d2ef03
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_expected.py
@@ -0,0 +1,81 @@
+expected_output = {
+  'interfaces': {
+    'Te1/0/10': {
+      'current': '0.0',
+      'opticalrx': 'N/A',
+      'opticaltx': 'N/A',
+      'temp': '31.5',
+      'voltage': '3.37'
+    },
+    'Te1/0/18': {
+      'current': '0.0',
+      'opticalrx': 'N/A',
+      'opticaltx': 'N/A',
+      'temp': '29.5',
+      'voltage': '3.33'
+    },
+    'Te1/0/19': {
+      'current': '0.5',
+      'opticalrx': 'N/A',
+      'opticaltx': 'N/A',
+      'temp': '30.8',
+      'voltage': '3.32'
+    },
+    'Te1/0/20': {
+      'current': '0.0',
+      'opticalrx': 'N/A',
+      'opticaltx': 'N/A',
+      'temp': '31.9',
+      'voltage': '3.32'
+    },
+    'Te1/0/9': {
+      'current': '0.0',
+      'opticalrx': 'N/A',
+      'opticaltx': 'N/A',
+      'temp': '30.6',
+      'voltage': '3.33'
+    },
+    'Te4/0/15': {
+      'current': '8.2',
+      'opticalrx': '-40.0',
+      'opticaltx': '-5.6',
+      'temp': '30.4',
+      'voltage': '3.27'
+    },
+    'Te4/0/16': {
+      'current': '8.5',
+      'opticalrx': '-40.0',
+      'opticaltx': '-5.6',
+      'temp': '30.5',
+      'voltage': '3.26'
+    },
+    'Te4/0/18': {
+      'current': '7.8',
+      'opticalrx': '-2.5',
+      'opticaltx': '-2.5',
+      'temp': '33.2',
+      'voltage': '3.30'
+    },
+    'Te4/0/19': {
+      'current': '7.4',
+      'opticalrx': '-2.0',
+      'opticaltx': '-2.1',
+      'temp': '30.5',
+      'voltage': '3.26'
+    },
+    'Te4/0/4': {
+      'current': '7.7',
+      'opticalrx': '-30.0',
+      'opticaltx': '-2.0',
+      'temp': '34.2',
+      'voltage': '3.28'
+    },
+    'Te4/0/6': {
+      'current': '38.9',
+      'opticalrx': '-40.0',
+      'opticaltx': '-2.0',
+      'temp': '31.7',
+      'voltage': '3.24'
+    }
+  }
+ }
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_output.txt b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_output.txt
new file mode 100644
index 0000000000..d4e61aca31
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowInterfacesTransceiver/cli/equal/golden3_output.txt
@@ -0,0 +1,20 @@
+If device is externally calibrated, only calibrated values are printed.
+++ : high alarm, +  : high warning, -  : low warning, -- : low alarm.
+NA or N/A: not applicable, Tx: transmit, Rx: receive.
+mA: milliamperes, dBm: decibels (milliwatts).
+
+                                             Optical   Optical
+             Temperature  Voltage  Current   Tx Power  Rx Power
+Port         (Celsius)    (Volts)  (mA)      (dBm)     (dBm)
+---------    -----------  -------  --------  --------  --------
+Te1/0/9      30.6       3.33       0.0       N/A       N/A   
+Te1/0/10     31.5       3.37       0.0       N/A       N/A   
+Te1/0/18     29.5       3.33       0.0       N/A       N/A   
+Te1/0/19     30.8       3.32       0.5       N/A       N/A   
+Te1/0/20     31.9       3.32       0.0       N/A       N/A   
+Te4/0/4      34.2       3.28       7.7      -2.0     -30.0   
+Te4/0/6      31.7       3.24      38.9      -2.0     -40.0   
+Te4/0/15     30.4       3.27       8.2      -5.6     -40.0   
+Te4/0/16     30.5       3.26       8.5      -5.6     -40.0   
+Te4/0/18     33.2       3.30       7.8      -2.5      -2.5   
+Te4/0/19     30.5       3.26       7.4      -2.1      -2.0   
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_arguments.json
new file mode 100644
index 0000000000..fa0cf1aebe
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_arguments.json
@@ -0,0 +1,3 @@
+{
+    "include": "line protocol|Internet address"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_expected.py b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_expected.py
new file mode 100644
index 0000000000..a4a6e66119
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_expected.py
@@ -0,0 +1,18 @@
+expected_output = {
+    "GigabitEthernet0/0/0": {
+        "enabled": False,
+        "oper_status": "down"
+    },
+    "GigabitEthernet0/0/1": {
+        "enabled": False,
+        "oper_status": "down"
+    },
+    "GigabitEthernet0/1/0": {
+        "enabled": False,
+        "oper_status": "down"
+    },
+    "GigabitEthernet0/2/0": {
+        "enabled": False,
+        "oper_status": "down"
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_output.txt
new file mode 100644
index 0000000000..172cba26db
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpInterface/cli/equal/golden_output7_output.txt
@@ -0,0 +1,4 @@
+GigabitEthernet0/0/0 is administratively down, line protocol is down
+GigabitEthernet0/0/1 is administratively down, line protocol is down
+GigabitEthernet0/1/0 is administratively down, line protocol is down
+GigabitEthernet0/2/0 is administratively down, line protocol is down
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..a84d74ab3f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,7 @@
+expected_output = {
+    'name': 'Advanced Protocol Pack',
+    'nbar_engine_version': 52,
+    'publisher': 'Cisco Systems Inc.',
+    'state': 'Active',
+    'version': '70.0',
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..ffd9fa7bbf
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpNbarProtocolPackActive/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,6 @@
+Active Protocol Pack:
+  Name:                          Advanced Protocol Pack
+  Version:                       70.0
+  Publisher:                     Cisco Systems Inc.
+  NBAR Engine Version:           52
+  State:                         Active
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_arguments.json
new file mode 100644
index 0000000000..f8310f3f9f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_arguments.json
@@ -0,0 +1,3 @@
+{
+    "route": "0.0.0.0"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_expected.py b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_expected.py
new file mode 100644
index 0000000000..359b85711b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_expected.py
@@ -0,0 +1,61 @@
+expected_output = {
+    "entry": {
+        "0.0.0.0/0": {
+            "ip": "0.0.0.0",
+            "mask": "0",
+            "net": "supernet",
+            "known_via": "bgp 100.1",
+            "distance": "20",
+            "metric": "0",
+            "type": "default path",
+            "tag_name": "65637",
+            "tag_type": "external",
+            "update": {
+                "from": "100.101.0.12",
+                "age": "00:16:36"
+            },
+            "paths": {
+                1: {
+                    "nexthop": "100.101.0.12",
+                    "from": "100.101.0.12",
+                    "age": "00:16:36",
+                    "prefer_non_rib_labels": False,
+                    "merge_labels": False,
+                    "metric": "0",
+                    "share_count": "1",
+                    "as_hops": "5",
+                    "route_tag": "65637",
+                    "mpls_label": "none",
+                    "mpls_flags": "NSF"
+                },
+                2: {
+                    "nexthop": "100.101.0.8",
+                    "from": "100.101.0.8",
+                    "age": "00:16:36",
+                    "prefer_non_rib_labels": False,
+                    "merge_labels": False,
+                    "metric": "0",
+                    "share_count": "1",
+                    "as_hops": "5",
+                    "route_tag": "65637",
+                    "mpls_label": "none",
+                    "mpls_flags": "NSF"
+                },
+                3: {
+                    "nexthop": "100.101.0.4",
+                    "from": "100.101.0.4",
+                    "age": "00:16:36",
+                    "prefer_non_rib_labels": False,
+                    "merge_labels": False,
+                    "metric": "0",
+                    "share_count": "1",
+                    "as_hops": "5",
+                    "route_tag": "65637",
+                    "mpls_label": "none",
+                    "mpls_flags": "NSF"
+                }
+            }
+        }
+    },
+    "total_prefixes": 3
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_output.txt
new file mode 100644
index 0000000000..c045e61b5d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpRouteWord/cli/equal/golden_output_7_output.txt
@@ -0,0 +1,26 @@
+Routing entry for 0.0.0.0/0, supernet
+  Known via "bgp 100.1", distance 20, metric 0, candidate default path
+  Tag 65637, type external
+  Last update from 100.101.0.12 00:16:36 ago
+  Routing Descriptor Blocks:
+    100.101.0.12, from 100.101.0.12, 00:16:36 ago
+      opaque_ptr 0x7BE623EA95A8 
+      Route metric is 0, traffic share count is 1
+      AS Hops 5
+      Route tag 65637
+      MPLS label: none
+      MPLS Flags: NSF
+    100.101.0.8, from 100.101.0.8, 00:16:36 ago
+      opaque_ptr 0x7BE623EA95A8 
+      Route metric is 0, traffic share count is 1
+      AS Hops 5
+      Route tag 65637
+      MPLS label: none
+      MPLS Flags: NSF
+  * 100.101.0.4, from 100.101.0.4, 00:16:36 ago
+      opaque_ptr 0x7BE623EA95A8 
+      Route metric is 0, traffic share count is 1
+      AS Hops 5
+      Route tag 65637
+      MPLS label: none
+      MPLS Flags: NSF
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..97d93b36b8
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,16 @@
+expected_output={
+    "ip_address": {
+        "192.168.100.2": {
+            "interface_name": "Gi1/0/2",
+            "filter_type": "ip",
+            "filter_mode": "active",
+            "vlan": "100"
+        },
+        "192.168.100.3": {
+            "interface_name": "Gi2/0/3",
+            "filter_type": "ip",
+            "filter_mode": "active",
+            "vlan": "100"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..6c7e0f1083
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpVerifySource/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,4 @@
+Interface  Filter-type  Filter-mode  IP-address       Mac-address        Vlan
+---------  -----------  -----------  ---------------  -----------------  ----
+Gi1/0/2    ip          active       192.168.100.2                       100
+Gi2/0/3    ip           active       192.168.100.3                       100
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_arguments.json
new file mode 100644
index 0000000000..8824068309
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_arguments.json
@@ -0,0 +1,3 @@
+{
+    "include": "protocol|address|subnet"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_expected.py b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_expected.py
new file mode 100644
index 0000000000..359314182b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_expected.py
@@ -0,0 +1,16 @@
+expected_output = {
+    "GigabitEthernet0/0/0": {
+        "enabled": False,
+        "oper_status": "down",
+        "ipv6": {
+            "FE80::72EA:1AFF:FEB5:49B0": {
+                "ip": "FE80::72EA:1AFF:FEB5:49B0",
+                "origin": "link_layer",
+                "status": "tentative"
+            },
+            "enabled": False
+        },
+        "autoconf": True,
+        "addresses_config_method": "stateless autoconfig"
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_output.txt b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_output.txt
new file mode 100644
index 0000000000..fd76e4f9b9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowIpv6Interface/cli/equal/golden_output_5_output.txt
@@ -0,0 +1,7 @@
+GigabitEthernet0/0/0 is administratively down, line protocol is down
+  IPv6 is tentative, link-local address is FE80::72EA:1AFF:FEB5:49B0 [TEN]
+  No Virtual link-local address(es):
+  Stateless address autoconfig enabled
+  No global unicast address is configured
+  Joined group address(es):
+  Hosts use stateless autoconfig for addresses.
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..445279e42f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,60 @@
+expected_output = {
+    "esi_mlag_entries": [
+        {
+            "vlan": 1400,
+            "mac": "0020.0100.0001",
+            "ip": "103.10.0.97",
+            "local_intf": "Po5:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1400,
+            "mac": "001b.0100.0001",
+            "ip": "103.10.0.129",
+            "local_intf": "Po5:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1400,
+            "mac": "0025.0100.0001",
+            "ip": "103.10.0.250",
+            "local_intf": "Po6:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1400,
+            "mac": "0020.0100.0001",
+            "ip": "2003:0:10:0:97::2",
+            "local_intf": "Po5:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1400,
+            "mac": "001b.0100.0001",
+            "ip": "2003:0:10:0:129::2",
+            "local_intf": "",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1401,
+            "mac": "001b.0100.0001",
+            "ip": "2003:0:10:0:21B:1FF:FE00:1",
+            "local_intf": "Po5:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1401,
+            "mac": "0020.0100.0001",
+            "ip": "2003:0:10:0:220:1FF:FE00:1",
+            "local_intf": "Po5:1400",
+            "neighbor_ip": "10.0.1.14"
+        },
+        {
+            "vlan": 1401,
+            "mac": "0025.0100.0001",
+            "ip": "2003:0:10:0:225:1FF:FE00:1",
+            "local_intf": "Po6:1400",
+            "neighbor_ip": "10.0.1.14"
+        }
+    ]
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..278dc06053
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,10 @@
+VLAN  MAC            IP                            Interface       Neighbor IP
+----- -------------- --------------------------------------- ----------------
+1400  0020.0100.0001 103.10.0.97                   Po5:1400        10.0.1.14
+1400  001b.0100.0001 103.10.0.129                  Po5:1400        10.0.1.14
+1400  0025.0100.0001 103.10.0.250                  Po6:1400        10.0.1.14
+1400  0020.0100.0001 2003:0:10:0:97::2             Po5:1400        10.0.1.14
+1400  001b.0100.0001 2003:0:10:0:129::2                            10.0.1.14
+1401  001b.0100.0001 2003:0:10:0:21B:1FF:FE00:1    Po5:1400        10.0.1.14
+1401  0020.0100.0001 2003:0:10:0:220:1FF:FE00:1    Po5:1400        10.0.1.14
+1401  0025.0100.0001 2003:0:10:0:225:1FF:FE00:1    Po6:1400        10.0.1.14
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_arguments.json
new file mode 100644
index 0000000000..cd0069b698
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_arguments.json
@@ -0,0 +1,3 @@
+{
+    "vlan_id": "1150"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..364286fc19
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,82 @@
+expected_output = {
+    "esi_mlag_entries": [
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0001",
+            "ip": "101.0.50.240",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0003",
+            "ip": "101.0.50.242",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0006",
+            "ip": "101.0.50.245",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0008",
+            "ip": "101.0.50.247",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.000a",
+            "ip": "101.0.50.249",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0001",
+            "ip": "2001::50:250:0:0:3",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0006",
+            "ip": "2001::50:250:0:0:4",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0003",
+            "ip": "2001::50:250:0:0:5",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0007",
+            "ip": "2001::50:250:0:0:6",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0005",
+            "ip": "2001::50:250:0:0:7",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        },
+        {
+            "vlan": 1150,
+            "mac": "0015.0100.0002",
+            "ip": "2001::50:250:0:0:8",
+            "local_intf": "Po2:1150",
+            "neighbor_ip": "10.0.1.11"
+        }
+    ]
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..e3e05ab948
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagMacIp/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,14 @@
+VLAN  MAC            IP                                      Interface       Neighbor IP
+----- -------------- --------------------------------------- --------------- -----------
+1150  0015.0100.0001 101.0.50.240                            Po2:1150        10.0.1.11
+1150  0015.0100.0003 101.0.50.242                            Po2:1150        10.0.1.11
+1150  0015.0100.0006 101.0.50.245                            Po2:1150        10.0.1.11
+1150  0015.0100.0008 101.0.50.247                            Po2:1150        10.0.1.11
+1150  0015.0100.000a 101.0.50.249                            Po2:1150        10.0.1.11
+1150  0015.0100.0001 2001::50:250:0:0:3                      Po2:1150        10.0.1.11
+1150  0015.0100.0006 2001::50:250:0:0:4                      Po2:1150        10.0.1.11
+1150  0015.0100.0003 2001::50:250:0:0:5                      Po2:1150        10.0.1.11
+1150  0015.0100.0007 2001::50:250:0:0:6                      Po2:1150        10.0.1.11
+1150  0015.0100.0005 2001::50:250:0:0:7                      Po2:1150        10.0.1.11
+1150  0015.0100.0002 2001::50:250:0:0:8                      Po2:1150        10.0.1.11
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..a084110dea
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,24 @@
+expected_output = {
+    "esi_mlag": {
+        "10.0.1.13": {
+            "up_down_time": "00:22:25",
+            "state": "2560",
+            "src_interface": "Loopback1",
+            "bgp_router_id": "10.0.1.14",
+            "asn": 65034,
+            "pc_count": 3,
+            "vlan_count": 300,
+            "mac_count": 1048,
+            "interfaces": {
+                "Po6": {
+                    "esi_id": "0150.F722.D491.0000.0600",
+                    "state": "Ready"
+                },
+                "Po5": {
+                    "esi_id": "0170.1F53.9AB0.8000.0500",
+                    "state": "Ready"
+                }
+            }
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..3f08552622
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,13 @@
+Local BGP RouterID : 10.0.1.14, ASN : 65034
+Neighbor IP : 10.0.1.13, Up/Down : 00:22:25, State/PfxRcd : 2560, Source Interface : Loopback1
+
+
+Total Port-Channel Count       : 3
+Total VLAN Count               : 300
+Total MAC Count                : 1048
+
+
+Interface       ESI                      State
+--------------- ------------------------ ------------
+Po6             0150.F722.D491.0000.0600 Ready
+Po5             0170.1F53.9AB0.8000.0500 Ready
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..17cd96a0dc
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,14 @@
+expected_output = {
+    "esi_mlag": {
+        "10.0.1.14": {
+            "up_down_time": "never",
+            "state": "Idle",
+            "src_interface": "Loopback1",
+            "bgp_router_id": "10.0.1.13",
+            "asn": 65034,
+            "pc_count": 1,
+            "vlan_count": 300,
+            "mac_count": 0,
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..f95a80bcd8
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,11 @@
+Local BGP RouterID : 10.0.1.13, ASN : 65034
+Neighbor IP : 10.0.1.14, Up/Down : never, State/PfxRcd : Idle, Source Interface : Loopback1
+
+
+Total Port-Channel Count       : 1
+Total VLAN Count               : 300
+Total MAC Count                : 0
+
+
+Interface       ESI                      State
+--------------- ------------------------ ------------
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_expected.py
new file mode 100644
index 0000000000..78ef0701a5
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_expected.py
@@ -0,0 +1,21 @@
+expected_output = {
+    "esi_mlag": {
+        "": {
+            "pc_count": 3,
+            "vlan_count": 300,
+            "mac_count": 0,
+            "interfaces": {
+                "Po6": {
+                    "esi_id": "0150.F722.D491.0000.0600",
+                    "state": "Global Incomplete"
+                },
+                "Po5": {
+                    "esi_id": "0170.1F53.9AB0.8000.0500",
+                    "state": "Global Incomplete"
+                }
+            }
+        }
+    }
+}
+
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_output.txt
new file mode 100644
index 0000000000..48db7fd348
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagSummary/cli/equal/golden_output_3_output.txt
@@ -0,0 +1,12 @@
+Dist3-9500-42#sh l2vpn evpn esi-mlag summary 
+BGP is not configured or not up
+
+Total Port-Channel Count       : 3
+Total VLAN Count               : 300
+Total MAC Count                : 0
+
+
+Interface       ESI                      State
+--------------- ------------------------ ------------
+Po6             0150.F722.D491.0000.0600 Global Incomplete
+Po5             0170.1F53.9AB0.8000.0500 Global Incomplete
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..8a3776d4a1
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,39 @@
+expected_output = {
+    "esi_mlag_vlan": [
+        {
+            "vlan": 1400,
+            "vni": 21400,
+            "local_mac_cnt": 2,
+            "remote_mac_cnt": 0,
+            "state": "Established"
+        },
+        {
+            "vlan": 1401,
+            "vni": 21401,
+            "local_mac_cnt": 2,
+            "remote_mac_cnt": 0,
+            "state": "Established"
+        },
+        {
+            "vlan": 1402,
+            "vni": 21402,
+            "local_mac_cnt": 2,
+            "remote_mac_cnt": 0,
+            "state": "Established"
+        },
+        {
+            "vlan": 1403,
+            "vni": 21403,
+            "local_mac_cnt": 2,
+            "remote_mac_cnt": 0,
+            "state": "Established"
+        },
+        {
+            "vlan": 1404,
+            "vni": 21404,
+            "local_mac_cnt": 2,
+            "remote_mac_cnt": 0,
+            "state": "Established"
+        }
+    ]
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..2aa67df6b2
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,7 @@
+VLAN  VNI      Local MAC Remote MAC State
+----- -------- --------- ---------- --------------------
+1400  21400    2         0          Established
+1401  21401    2         0          Established
+1402  21402    2         0          Established
+1403  21403    2         0          Established
+1404  21404    2         0          Established
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_expected.py
new file mode 100644
index 0000000000..406e7524f0
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_expected.py
@@ -0,0 +1,25 @@
+expected_output = {
+    "esi_mlag_vlan": [
+        {
+            "vlan": 1100,
+            "vni": 21100,
+            "local_mac_cnt": 0,
+            "remote_mac_cnt": 0,
+            "state": "No BGP, Incomplete"
+        },
+        {
+            "vlan": 1101,
+            "vni": 21101,
+            "local_mac_cnt": 0,
+            "remote_mac_cnt": 0,
+            "state": "No BGP, Incomplete"
+        },
+        {
+            "vlan": 1102,
+            "vni": 21102,
+            "local_mac_cnt": 0,
+            "remote_mac_cnt": 0,
+            "state": "No BGP, Incomplete"
+        }
+    ]
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_output.txt
new file mode 100644
index 0000000000..61e188da4f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowL2vpnEvpnEsiMlagVlanBrief/cli/equal/golden_output_2_output.txt
@@ -0,0 +1,5 @@
+VLAN  VNI      Local MAC Remote MAC State
+----- -------- --------- ---------- --------------------
+1100  21100    0         0          No BGP, Incomplete
+1101  21101    0         0          No BGP, Incomplete
+1102  21102    0         0          No BGP, Incomplete
diff --git a/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_arguments.json
new file mode 100644
index 0000000000..8f5719773f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_arguments.json
@@ -0,0 +1,4 @@
+{
+    "instance_id": "1", 
+    "prefix": "0.0.0.0/0"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_expected.py b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_expected.py
new file mode 100644
index 0000000000..63d33d281d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_expected.py
@@ -0,0 +1,26 @@
+expected_output = {
+    "lisp_id": {
+        0: {
+            "instance_id": {
+                1: {
+                    "eid_table": "default",
+                    "entries": 1,
+                    "eid_prefix": "0.0.0.0/0",
+                    "eid": "0.0.0.0",
+                    "mask": 0,
+                    "uptime": "00:58:48",
+                    "expires": "never",
+                    "via": "static",
+                    "sources": "static",
+                    "state": "forward-native",
+                    "last_modified": "00:58:48",
+                    "map_source": "local",
+                    "activity": "Exempt",
+                    "packets_out": 503,
+                    "packets_out_bytes": 201990,
+                    "counters_not_accurate": True
+                }
+            }
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_output.txt b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_output.txt
new file mode 100644
index 0000000000..ad29eb2284
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowLispIpv4MapCachePrefix/cli/equal/golden_output10_output.txt
@@ -0,0 +1,8 @@
+LISP IPv4 Mapping Cache for LISP 0 EID-table default (IID 1), 1 entries
+
+0.0.0.0/0, uptime: 00:58:48, expires: never, via static
+  Sources: static
+  State: forward-native, last modified: 00:58:48, map-source: local
+  Exempt, Packets out: 503(201990 bytes), counters are not accurate (~ 00:00:12 ago)
+  Configured as EID address space
+  Encapsulating to proxy ETR 
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_expected.py
new file mode 100755
index 0000000000..c311239707
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_expected.py
@@ -0,0 +1,15 @@
+expected_output = {
+        'meraki': {
+            'switch': {
+                  '1' : {
+                    'switch_num': 1,
+                    'pid': 'C9200L-48P-4G',
+                    'serial_number': 'JAE25171718',
+                    'meraki_sn': 'Q2ZZ-JYE2-DTVV',
+                    'mac_addr': 'bcd2.95ab.4e00',
+                    'conversion_status': 'Registered', 
+                    'current_mode': 'C9K-M'  
+                }, 
+            }, 
+        },
+    }
diff --git a/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_output.txt
new file mode 100755
index 0000000000..7581a5c164
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowMeraki/cli/equal/golden_output2_output.txt
@@ -0,0 +1,4 @@
+Switch                 Serial                                               Migration
+Num    PID             Number             Cloud ID        Mac Address       Status       Mode
+-----------------------------------------------------------------------------------------------
+1   C9200L-48P-4G      JAE25171718        Q2ZZ-JYE2-DTVV  bcd2.95ab.4e00    Registered   C9K-M
diff --git a/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_arguments.json
new file mode 100644
index 0000000000..5063e3f2d6
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_arguments.json
@@ -0,0 +1,3 @@
+{
+    "session": "all"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_expected.py b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_expected.py
new file mode 100644
index 0000000000..f81a2e6f75
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_expected.py
@@ -0,0 +1,22 @@
+expected_output = {
+    "session": {
+        "10": {
+            "type": "ERSPAN Source Session",
+            "status": "Admin Enabled",
+            "source_ports": {
+                "both": "Gi0/0/1"
+            },
+            "destination_ip_address": "10.1.1.1",
+            "mtu": 1464,
+            "destination_erspan_id": "10",
+            "origin_ip_address": "100.1.1.1"
+        },
+        "20": {
+            "type": "ERSPAN Destination Session",
+            "status": "Admin Enabled",
+            "destination_ports": "Gi0/1/3",
+            "source_ip_address": "10.1.1.1",
+            "source_erspan_id": "10"
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_output.txt b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_output.txt
new file mode 100644
index 0000000000..9d420ce76a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowMonitor/cli/equal/golden_output7_output.txt
@@ -0,0 +1,19 @@
+Session 10
+----------
+Type                     : ERSPAN Source Session
+Status                   : Admin Enabled
+Source Ports             :
+    Both                 : Gi0/0/1
+Destination IP Address   : 10.1.1.1
+MTU                      : 1464
+Destination ERSPAN ID    : 10
+Origin IP Address        : 100.1.1.1
+
+
+Session 20
+----------
+Type                     : ERSPAN Destination Session
+Status                   : Admin Enabled
+Destination Ports        : Gi0/1/3
+Source IP Address        : 10.1.1.1
+Source ERSPAN ID         : 10
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..e489fa0489
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/empty/empty_output_arguments.json
@@ -0,0 +1,5 @@
+{
+    "switch" : "3",
+    "client_mac" : "0000.0033.3333"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_arguments.json
new file mode 100644
index 0000000000..cd1a6cd2be
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_arguments.json
@@ -0,0 +1,6 @@
+{
+    "switch" : "3",
+    "if_id" : "0x456"
+}
+
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..9b7761e111
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_expected.py
@@ -0,0 +1,19 @@
+expected_output={
+  'mac_entries': {
+    1: {
+      'interface': 'Gi2/0/10',
+      'vlan': 50,
+      'mac': '0000.0022.2222',
+      'logical_id': 0,
+      'position': 12288,
+      'asic_number': 0,
+      'auth_act': 'FWD_ALL_LRN_DATA',
+      'restore_auth_act': 'None',
+      'flag': 'NONE',
+      'drop': 'No',
+      'policy': 'NONE',
+      'policy_oid': 551,
+      'packets': 0
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..1a85d1cf74
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output1_output.txt
@@ -0,0 +1,10 @@
+Sec_RAITT#show plat soft fed sw ac access-security sec-mac-lrn-table interface if-id 0x456
+Access Security Secure-Mac Table Summary
+
+
+Secure MAC Client Port Vlan and MAC entries:
+
+     Interface    VLAN       MAC              Logical-ID Position   Asic# Auth-Act           Restore-Auth-Act   Flag         Drop   Policy   Policy-OID Packets    
+---- ------------ ---------- ---------------- ---------- ---------- ----- ------------------ ------------------ ------------ ------ -------- ---------- ---------- 
+   1 Gi2/0/10     50         0000.0022.2222   0          12288      0     FWD_ALL_LRN_DATA   None               NONE         No     NONE     551        0         
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_arguments.json
new file mode 100644
index 0000000000..4dd45beb43
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_arguments.json
@@ -0,0 +1,4 @@
+{
+    "switch" : "3"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_expected.py
new file mode 100644
index 0000000000..e66ab0be0d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_expected.py
@@ -0,0 +1,19 @@
+expected_output={
+  'mac_entries': {
+    1: {
+      'interface': 'Gi1/0/10',
+      'vlan': 50,
+      'mac': '0000.0022.2222',
+      'logical_id': 0,
+      'position': 12288,
+      'asic_number': 0,
+      'auth_act': 'FWD_ALL_LRN_DATA',
+      'restore_auth_act': 'None',
+      'flag': 'NONE',
+      'drop': 'No',
+      'policy': 'NONE',
+      'policy_oid': 551,
+      'packets': 0
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_output.txt
new file mode 100644
index 0000000000..970b65ba17
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output2_output.txt
@@ -0,0 +1,10 @@
+Sec_RAITT#show plat soft fed sw ac access-security sec-mac-lrn-table interface if-id 0x456
+Access Security Secure-Mac Table Summary
+
+
+Secure MAC Client Port Vlan and MAC entries:
+
+     Interface    VLAN       MAC              Logical-ID Position   Asic# Auth-Act           Restore-Auth-Act   Flag         Drop   Policy   Policy-OID Packets    
+---- ------------ ---------- ---------------- ---------- ---------- ----- ------------------ ------------------ ------------ ------ -------- ---------- ---------- 
+   1 Gi1/0/10     50         0000.0022.2222   0          12288      0     FWD_ALL_LRN_DATA   None               NONE         No     NONE     551        0         
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..3164e8cccb
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_arguments.json
@@ -0,0 +1,6 @@
+{
+    "switch" : "3",
+    "client_mac" : "0000.0033.3333"
+}
+
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..852ee43662
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_expected.py
@@ -0,0 +1,19 @@
+expected_output={
+  'mac_entries': {
+    1: {
+      'interface': 'Gi3/0/10',
+      'vlan': 50,
+      'mac': '0000.0033.3333',
+      'logical_id': 0,
+      'position': 12288,
+      'asic_number': 0,
+      'auth_act': 'FWD_ALL_LRN_DATA',
+      'restore_auth_act': 'None',
+      'flag': 'NONE',
+      'drop': 'No',
+      'policy': 'NONE',
+      'policy_oid': 551,
+      'packets': 0
+    }
+  }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..35bf0103d2
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatSoftFedSwAccessSecuritySecMacLrnTable/cli/equal/golden_output_output.txt
@@ -0,0 +1,10 @@
+Sec_RAITT#show plat soft fed sw 3 access-security sec-mac-lrn-table mac 0000.0033.3333
+Access Security Secure-Mac Table Summary
+
+
+Secure MAC Client Port Vlan and MAC entries:
+
+     Interface    VLAN       MAC              Logical-ID Position   Asic# Auth-Act           Restore-Auth-Act   Flag         Drop   Policy   Policy-OID Packets    
+---- ------------ ---------- ---------------- ---------- ---------- ----- ------------------ ------------------ ------------ ------ -------- ---------- ---------- 
+   1 Gi3/0/10     50         0000.0033.3333   0          12288      0     FWD_ALL_LRN_DATA   None               NONE         No     NONE     551        0         
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..bce0af88f6
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/empty/empty_output_arguments.json
@@ -0,0 +1,4 @@
+{
+    "type": "active",
+    "files_compare": "(\"f1\",\"f2\")"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..bce0af88f6
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_arguments.json
@@ -0,0 +1,4 @@
+{
+    "type": "active",
+    "files_compare": "(\"f1\",\"f2\")"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..d6bc476fbe
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_expected.py
@@ -0,0 +1,10 @@
+expected_output={
+  'table_name': {
+    'ipv4_vrf_dip_em_table': {
+      'length_subtables_f1': 12,
+      'length_subtables_f2': 13,
+      'nb_subtables_f1': 1,
+      'nb_subtables_f2': 1
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..6cacba5930
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchActiveStandbyFwdAsicInsightNplSummaryDiff/cli/equal/golden_output_output.txt
@@ -0,0 +1,4 @@
+show platform hardware fed switch active fwd-asic insight npl_summary_diff("f1","f2")
+Comparing summary f1 and f2 ...
+table_name                               length_subtables_f1            length_subtables_f2            nb_subtables_f1                nb_subtables_f2    
+ipv4_vrf_dip_em_table                    (12,)                          (13,)                          1                              1   
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..e0ff71bcc9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/empty/empty_output_arguments.json
@@ -0,0 +1,5 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/2",
+    "match": "CGID|class"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..e0ff71bcc9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_arguments.json
@@ -0,0 +1,5 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/2",
+    "match": "CGID|class"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..ac96e0f296
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_expected.py
@@ -0,0 +1,7 @@
+expected_output = {
+    "interface": "GigabitEthernet1/0/2",
+    "location": "pm-dc1-tc6",
+    "direction": "Ingress",
+    "cgid": "0x634E00",
+    "no_of_classes": 1
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..e7997c2969
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosInterfaceIngressNdpDetailedInclude/cli/equal/golden_output_output.txt
@@ -0,0 +1,3 @@
+[GigabitEthernet1/0/2, pm-dc1-tc6, Ingress]: CGID = 0x634E00  
+
+  No of classes: 1
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..d85a6ded3e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/empty/empty_output_arguments.json
@@ -0,0 +1,6 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/3",
+    "queue_id": 6,
+    "match": "Q-Limit"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..d85a6ded3e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_arguments.json
@@ -0,0 +1,6 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/3",
+    "queue_id": 6,
+    "match": "Q-Limit"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..c5a9969cb7
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_expected.py
@@ -0,0 +1 @@
+expected_output ={'q_limit_blocks': 100000}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..3308a483b7
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosQueueConfigInterfaceQueueInclude/cli/equal/golden_output_output.txt
@@ -0,0 +1 @@
+Q-Limit(Blocks    )    : 100000
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..c5d0d34ca2
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/empty/empty_output_arguments.json
@@ -0,0 +1,5 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/3",
+    "match": "VOQ Offset"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..c5d0d34ca2
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_arguments.json
@@ -0,0 +1,5 @@
+{
+    "sw_number": 1,
+    "interface": "GigabitEthernet1/0/3",
+    "match": "VOQ Offset"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..675c5d3f2f
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_expected.py
@@ -0,0 +1 @@
+expected_output = {'voq_offset': [0, 0, 0, 0, 0, 5, 6, 7]}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..1784cf616a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformHardwareFedSwitchQosSchedulerInterfaceInclude/cli/equal/golden_output_output.txt
@@ -0,0 +1 @@
+|                       : VOQ Offset :   0 |   0 |   0 |   0 |   0 |   5 |   6 |   7 
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_arguments.json
new file mode 100644
index 0000000000..1b45744350
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_arguments.json
@@ -0,0 +1,4 @@
+{
+        "switch_var": "switch_var"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..b9f98b93b3
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,12 @@
+expected_output = {
+    'igmp_snooping_summary': {
+        'group_current_count': 0,
+        'group_max_count': 0,
+        'last_used_group_urid': '0x600000000000575c',
+        'last_used_vlan_urid': '0x4000000000000006',
+        'port_current_count': 2001,
+        'port_max_count': 2057,
+        'vlan_current_count': 3,
+        'vlan_max_count': 3
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..8f8a926b4b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,5 @@
+  Vlan Current Count/Max Reached    : 3/3
+  Group Current Count/Max Reached   : 0/0
+  Port Current Count/Max Reached    : 2001/2057
+  Last used Vlan Urid               : 0x4000000000000006
+  Last Used Group Urid              : 0x600000000000575c
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..b9f98b93b3
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_expected.py
@@ -0,0 +1,12 @@
+expected_output = {
+    'igmp_snooping_summary': {
+        'group_current_count': 0,
+        'group_max_count': 0,
+        'last_used_group_urid': '0x600000000000575c',
+        'last_used_vlan_urid': '0x4000000000000006',
+        'port_current_count': 2001,
+        'port_max_count': 2057,
+        'vlan_current_count': 3,
+        'vlan_max_count': 3
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..8f8a926b4b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpIgmpSnoopingSummary/cli/equal/golden_output_output.txt
@@ -0,0 +1,5 @@
+  Vlan Current Count/Max Reached    : 3/3
+  Group Current Count/Max Reached   : 0/0
+  Port Current Count/Max Reached    : 2001/2057
+  Last used Vlan Urid               : 0x4000000000000006
+  Last Used Group Urid              : 0x600000000000575c
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_arguments.json
new file mode 100644
index 0000000000..1b45744350
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_arguments.json
@@ -0,0 +1,4 @@
+{
+        "switch_var": "switch_var"
+}
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..c5f037bba5
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,5 @@
+expected_output = {
+	'mfib_count': {
+		'number_of_entries': 32001
+	}
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..de1ed1785b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_1_output.txt
@@ -0,0 +1 @@
+Number of entries = 32001
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..4679258f28
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_expected.py
@@ -0,0 +1,5 @@
+expected_output = {
+    'mfib_count': {
+        'number_of_entries': 32001
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..de1ed1785b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedIpMfibVrfCount/cli/equal/golden_output_output.txt
@@ -0,0 +1 @@
+Number of entries = 32001
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..7484152c46
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_expected.py
@@ -0,0 +1,8 @@
+expected_output = {
+    'mld_snooping_summary': {
+        'group_address': 'FF13::1',
+        'host_type': 'v1',
+        'interface': 'Vlan 11',
+        'member_ports': 'Po92'
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..a9d203ff54
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedMldSnoopingIpv6GroupsCount/cli/equal/golden_output_output.txt
@@ -0,0 +1,7 @@
+Flags: M -- MLD snooping, S -- Static, E -- EVPN sync
+
+Vlan      Group                    Type        Version     Port List
+-----------------------------------------------------------------------
+Group Address (Vlan 11)        : FF13::1
+Host type                      : v1
+Member Ports                   : Po92
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/empty/empty_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/empty/empty_output_arguments.json
new file mode 100644
index 0000000000..bc0e4e7f17
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/empty/empty_output_arguments.json
@@ -0,0 +1,3 @@
+{
+    "switch_var" : "active"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_arguments.json
new file mode 100644
index 0000000000..a4af35981e
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_arguments.json
@@ -0,0 +1,4 @@
+{
+    "switch_var" : "active",
+    "feature_name" : "sgacl"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..87026cfd22
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_expected.py
@@ -0,0 +1,83 @@
+expected_output={
+  'class_group_name': {
+    'V4SGACL;000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv4',
+      'cg_id': 273,
+      'pol_hdl': '0x5405cf68',
+      'oid': '0x81E',
+      'no_of_ace': 1,
+      'ipv4_ace_key_mask': {
+        'ipv4_src_value': '0.0.0.0',
+        'ipv4_src_mask': '0.0.0.0',
+        'ipv4_dst_value': '0.0.0.0',
+        'ipv4_dst_mask': '0.0.0.0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    },
+    'V6SGACL<000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv6',
+      'cg_id': 545,
+      'pol_hdl': '0x5405f6c8',
+      'oid': '0x823',
+      'no_of_ace': 1,
+      'ipv6_ace_key_mask': {
+        'ipv6_src_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_src_mac_mask': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_dst_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..7e4fe2ae4a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output1_output.txt
@@ -0,0 +1,96 @@
+S1-UUT#show platform software fed switch active acl info sdk detail  
+
+-------------------------------------------------------------- 
+
+         ACLs info details (programmed in datapath) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V4SGACL;000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv4 
+
+      CG ID           : 273 
+
+      Pol Hdl         : 0x5405cf68 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x81E, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV4 ACE Key/Mask 
+
+        ipv4_src: value = 0.0.0.0       mask = 0.0.0.0 
+
+        ipv4_dst: value = 0.0.0.0       mask = 0.0.0.0 
+
+            proto     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+           
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V6SGACL<000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv6 
+
+      CG ID           : 545 
+
+      Pol Hdl         : 0x5405f6c8 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x823, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV6 ACE Key/Mask 
+
+        src_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+        dst_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+            ext_h     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+  
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_arguments.json
new file mode 100644
index 0000000000..6a8633b944
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_arguments.json
@@ -0,0 +1,6 @@
+{
+    "switch_var" : "active",
+    "feature_name": "sgacl",
+    "in_out" : "in ",
+    "cg_id" : "273"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_expected.py
new file mode 100644
index 0000000000..87026cfd22
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_expected.py
@@ -0,0 +1,83 @@
+expected_output={
+  'class_group_name': {
+    'V4SGACL;000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv4',
+      'cg_id': 273,
+      'pol_hdl': '0x5405cf68',
+      'oid': '0x81E',
+      'no_of_ace': 1,
+      'ipv4_ace_key_mask': {
+        'ipv4_src_value': '0.0.0.0',
+        'ipv4_src_mask': '0.0.0.0',
+        'ipv4_dst_value': '0.0.0.0',
+        'ipv4_dst_mask': '0.0.0.0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    },
+    'V6SGACL<000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv6',
+      'cg_id': 545,
+      'pol_hdl': '0x5405f6c8',
+      'oid': '0x823',
+      'no_of_ace': 1,
+      'ipv6_ace_key_mask': {
+        'ipv6_src_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_src_mac_mask': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_dst_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_output.txt
new file mode 100644
index 0000000000..7e4fe2ae4a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output2_output.txt
@@ -0,0 +1,96 @@
+S1-UUT#show platform software fed switch active acl info sdk detail  
+
+-------------------------------------------------------------- 
+
+         ACLs info details (programmed in datapath) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V4SGACL;000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv4 
+
+      CG ID           : 273 
+
+      Pol Hdl         : 0x5405cf68 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x81E, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV4 ACE Key/Mask 
+
+        ipv4_src: value = 0.0.0.0       mask = 0.0.0.0 
+
+        ipv4_dst: value = 0.0.0.0       mask = 0.0.0.0 
+
+            proto     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+           
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V6SGACL<000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv6 
+
+      CG ID           : 545 
+
+      Pol Hdl         : 0x5405f6c8 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x823, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV6 ACE Key/Mask 
+
+        src_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+        dst_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+            ext_h     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+  
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..bc0e4e7f17
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_arguments.json
@@ -0,0 +1,3 @@
+{
+    "switch_var" : "active"
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..87026cfd22
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_expected.py
@@ -0,0 +1,83 @@
+expected_output={
+  'class_group_name': {
+    'V4SGACL;000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv4',
+      'cg_id': 273,
+      'pol_hdl': '0x5405cf68',
+      'oid': '0x81E',
+      'no_of_ace': 1,
+      'ipv4_ace_key_mask': {
+        'ipv4_src_value': '0.0.0.0',
+        'ipv4_src_mask': '0.0.0.0',
+        'ipv4_dst_value': '0.0.0.0',
+        'ipv4_dst_mask': '0.0.0.0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    },
+    'V6SGACL<000': {
+      'direction': 'Egress',
+      'feature': 'Sgacl',
+      'protocol': 'IPv6',
+      'cg_id': 545,
+      'pol_hdl': '0x5405f6c8',
+      'oid': '0x823',
+      'no_of_ace': 1,
+      'ipv6_ace_key_mask': {
+        'ipv6_src_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_src_mac_mask': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'ipv6_dst_mac_value': '0x0.0x0.0x0.0x0.0x0.0x0',
+        'V': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'M': {
+          'proto': '0x0',
+          'tos': '0x0',
+          'tcp_flg': '0x0',
+          'ttl': '0x0',
+          'ipv4_flags': '0x0',
+          'src_port': '0x0',
+          'dst_port': '0x0'
+        },
+        'result_actions': {
+          'punt': 'N',
+          'drop': 'Y',
+          'mirror': 'N',
+          'counter': '0x0',
+          'counter_value': 0
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..7e4fe2ae4a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveAclInfoSdkDetail/cli/equal/golden_output_output.txt
@@ -0,0 +1,96 @@
+S1-UUT#show platform software fed switch active acl info sdk detail  
+
+-------------------------------------------------------------- 
+
+         ACLs info details (programmed in datapath) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V4SGACL;000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv4 
+
+      CG ID           : 273 
+
+      Pol Hdl         : 0x5405cf68 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x81E, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV4 ACE Key/Mask 
+
+        ipv4_src: value = 0.0.0.0       mask = 0.0.0.0 
+
+        ipv4_dst: value = 0.0.0.0       mask = 0.0.0.0 
+
+            proto     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+           
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
+ 
+
+Class Group Name: V6SGACL<000  
+
+   Direction: Egress 
+
+      Feature         : Sgacl 
+
+      Protocol        : IPv6 
+
+      CG ID           : 545 
+
+      Pol Hdl         : 0x5405f6c8 
+
+-------------------------------------------------------------- 
+
+ ACL (OID: 0x823, No of ACEs: 1) 
+
+-------------------------------------------------------------- 
+
+   
+
+    IPV6 ACE Key/Mask 
+
+        src_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+        dst_mac: value = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+                  mask = 0x0.0x0.0x0.0x0.0x0.0x0 
+
+            ext_h     tos      tcp_flg     ttl       ipv4_flags    src_port     dst_port 
+
+        V:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+        M:  0x0       0x0      0x0         0x0       0x0           0x0          0x0 
+
+  
+
+    Result Action 
+
+        Punt : N    Drop : Y    Mirror : N    Counter: 0x0 (0) 
+
+-------------------------------------------------------------- 
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_expected.py
new file mode 100644
index 0000000000..1406da8fe9
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_expected.py
@@ -0,0 +1,9 @@
+expected_output = {
+    'interface_id': {
+        "87": {
+            "cvlan_id": 20,
+            "svlan_id": 30,
+            "action": 1
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_output.txt
new file mode 100644
index 0000000000..eae7c7005d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchActiveVtAll/cli/equal/golden1_output.txt
@@ -0,0 +1,6 @@
+Displaying fed vlan_translate port data
+=======================================
+
+If-id         Cvlan-id      Svlan-id              Action
+----------------------------------------------------------------------
+87           20            30                    1
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..037ce0d084
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_expected.py
@@ -0,0 +1,459 @@
+expected_output = {
+   "interfaces":{
+      "TwoGigabitEthernet2/0/1":{
+         "lpn":1,
+         "asic":1,
+         "port":0,
+         "if_id":"0x0000004b",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/2":{
+         "lpn":2,
+         "asic":1,
+         "port":1,
+         "if_id":"0x0000004c",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/3":{
+         "lpn":3,
+         "asic":1,
+         "port":2,
+         "if_id":"0x0000004d",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/4":{
+         "lpn":4,
+         "asic":1,
+         "port":3,
+         "if_id":"0x0000004e",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/5":{
+         "lpn":5,
+         "asic":1,
+         "port":4,
+         "if_id":"0x0000004f",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/6":{
+         "lpn":6,
+         "asic":1,
+         "port":5,
+         "if_id":"0x00000050",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/7":{
+         "lpn":7,
+         "asic":1,
+         "port":6,
+         "if_id":"0x00000051",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/8":{
+         "lpn":8,
+         "asic":1,
+         "port":7,
+         "if_id":"0x00000052",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/9":{
+         "lpn":9,
+         "asic":1,
+         "port":8,
+         "if_id":"0x00000053",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/10":{
+         "lpn":10,
+         "asic":1,
+         "port":9,
+         "if_id":"0x00000054",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/11":{
+         "lpn":11,
+         "asic":1,
+         "port":10,
+         "if_id":"0x00000055",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/12":{
+         "lpn":12,
+         "asic":1,
+         "port":11,
+         "if_id":"0x00000056",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/13":{
+         "lpn":13,
+         "asic":1,
+         "port":12,
+         "if_id":"0x00000057",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/14":{
+         "lpn":14,
+         "asic":1,
+         "port":13,
+         "if_id":"0x00000058",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/15":{
+         "lpn":15,
+         "asic":1,
+         "port":14,
+         "if_id":"0x00000059",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/16":{
+         "lpn":16,
+         "asic":1,
+         "port":15,
+         "if_id":"0x0000005a",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/17":{
+         "lpn":17,
+         "asic":1,
+         "port":16,
+         "if_id":"0x0000005b",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/18":{
+         "lpn":18,
+         "asic":1,
+         "port":17,
+         "if_id":"0x0000005c",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/19":{
+         "lpn":19,
+         "asic":0,
+         "port":18,
+         "if_id":"0x0000005d",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/20":{
+         "lpn":20,
+         "asic":0,
+         "port":19,
+         "if_id":"0x0000005e",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/21":{
+         "lpn":21,
+         "asic":0,
+         "port":20,
+         "if_id":"0x0000005f",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/22":{
+         "lpn":22,
+         "asic":0,
+         "port":21,
+         "if_id":"0x00000060",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/23":{
+         "lpn":23,
+         "asic":0,
+         "port":22,
+         "if_id":"0x00000061",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/24":{
+         "lpn":24,
+         "asic":0,
+         "port":23,
+         "if_id":"0x00000062",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/25":{
+         "lpn":25,
+         "asic":0,
+         "port":24,
+         "if_id":"0x00000063",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/26":{
+         "lpn":26,
+         "asic":0,
+         "port":25,
+         "if_id":"0x00000064",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/27":{
+         "lpn":27,
+         "asic":0,
+         "port":26,
+         "if_id":"0x00000065",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/28":{
+         "lpn":28,
+         "asic":0,
+         "port":27,
+         "if_id":"0x00000066",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/29":{
+         "lpn":29,
+         "asic":0,
+         "port":28,
+         "if_id":"0x00000067",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/30":{
+         "lpn":30,
+         "asic":0,
+         "port":29,
+         "if_id":"0x00000068",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/31":{
+         "lpn":31,
+         "asic":0,
+         "port":30,
+         "if_id":"0x00000069",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/32":{
+         "lpn":32,
+         "asic":0,
+         "port":31,
+         "if_id":"0x0000006a",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/33":{
+         "lpn":33,
+         "asic":0,
+         "port":32,
+         "if_id":"0x0000006b",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/34":{
+         "lpn":34,
+         "asic":0,
+         "port":33,
+         "if_id":"0x0000006c",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/35":{
+         "lpn":35,
+         "asic":0,
+         "port":34,
+         "if_id":"0x0000006d",
+         "active":"Y"
+      },
+      "TwoGigabitEthernet2/0/36":{
+         "lpn":36,
+         "asic":0,
+         "port":35,
+         "if_id":"0x0000006e",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/37":{
+         "lpn":37,
+         "asic":1,
+         "port":36,
+         "if_id":"0x0000006f",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/38":{
+         "lpn":38,
+         "asic":1,
+         "port":37,
+         "if_id":"0x00000070",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/39":{
+         "lpn":39,
+         "asic":1,
+         "port":38,
+         "if_id":"0x00000071",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/40":{
+         "lpn":40,
+         "asic":1,
+         "port":39,
+         "if_id":"0x00000072",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/41":{
+         "lpn":41,
+         "asic":1,
+         "port":40,
+         "if_id":"0x00000073",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/42":{
+         "lpn":42,
+         "asic":1,
+         "port":41,
+         "if_id":"0x00000074",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/43":{
+         "lpn":43,
+         "asic":0,
+         "port":42,
+         "if_id":"0x00000075",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/44":{
+         "lpn":44,
+         "asic":0,
+         "port":43,
+         "if_id":"0x00000076",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/45":{
+         "lpn":45,
+         "asic":0,
+         "port":44,
+         "if_id":"0x00000077",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/46":{
+         "lpn":46,
+         "asic":0,
+         "port":45,
+         "if_id":"0x00000078",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/47":{
+         "lpn":47,
+         "asic":0,
+         "port":46,
+         "if_id":"0x00000079",
+         "active":"Y"
+      },
+      "TenGigabitEthernet2/0/48":{
+         "lpn":48,
+         "asic":0,
+         "port":47,
+         "if_id":"0x0000007a",
+         "active":"Y"
+      },
+      "GigabitEthernet2/1/1":{
+         "lpn":49,
+         "asic":1,
+         "port":48,
+         "if_id":"0x0000007b",
+         "active":"N"
+      },
+      "GigabitEthernet2/1/2":{
+         "lpn":50,
+         "asic":1,
+         "port":49,
+         "if_id":"0x0000007c",
+         "active":"N"
+      },
+      "GigabitEthernet2/1/3":{
+         "lpn":51,
+         "asic":0,
+         "port":50,
+         "if_id":"0x0000007d",
+         "active":"N"
+      },
+      "GigabitEthernet2/1/4":{
+         "lpn":52,
+         "asic":0,
+         "port":51,
+         "if_id":"0x0000007e",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/1":{
+         "lpn":53,
+         "asic":1,
+         "port":52,
+         "if_id":"0x0000007f",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/2":{
+         "lpn":54,
+         "asic":1,
+         "port":53,
+         "if_id":"0x00000080",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/3":{
+         "lpn":55,
+         "asic":1,
+         "port":54,
+         "if_id":"0x00000081",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/4":{
+         "lpn":56,
+         "asic":1,
+         "port":55,
+         "if_id":"0x00000082",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/5":{
+         "lpn":57,
+         "asic":0,
+         "port":56,
+         "if_id":"0x00000083",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/6":{
+         "lpn":58,
+         "asic":0,
+         "port":57,
+         "if_id":"0x00000084",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/7":{
+         "lpn":59,
+         "asic":0,
+         "port":58,
+         "if_id":"0x00000085",
+         "active":"N"
+      },
+      "TenGigabitEthernet2/1/8":{
+         "lpn":60,
+         "asic":0,
+         "port":59,
+         "if_id":"0x00000086",
+         "active":"N"
+      },
+      "FortyGigabitEthernet2/1/1":{
+         "lpn":61,
+         "asic":1,
+         "port":60,
+         "if_id":"0x00000087",
+         "active":"Y"
+      },
+      "FortyGigabitEthernet2/1/2":{
+         "lpn":62,
+         "asic":0,
+         "port":61,
+         "if_id":"0x00000088",
+         "active":"Y"
+      },
+      "TwentyFiveGigE2/1/1":{
+         "lpn":63,
+         "asic":1,
+         "port":62,
+         "if_id":"0x00000089",
+         "active":"N"
+      },
+      "TwentyFiveGigE2/1/2":{
+         "lpn":64,
+         "asic":0,
+         "port":63,
+         "if_id":"0x0000008a",
+         "active":"N"
+      },
+      "AppGigabitEthernet2/0/1":{
+         "lpn":65,
+         "asic":1,
+         "port":18,
+         "if_id":"0x0000008b",
+         "active":"Y"
+      }
+   }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..db68b59086
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareFedSwitchNumberIfmMappingsLpn/cli/equal/golden_output1_output.txt
@@ -0,0 +1,70 @@
+Mappings Table
+
+
+LPN         ASIC  Port  Interface                         IF_ID               Active
+------------------------------------------------------------------------------------
+1           1     0     TwoGigabitEthernet2/0/1           0x0000004b          Y
+2           1     1     TwoGigabitEthernet2/0/2           0x0000004c          Y
+3           1     2     TwoGigabitEthernet2/0/3           0x0000004d          Y
+4           1     3     TwoGigabitEthernet2/0/4           0x0000004e          Y
+5           1     4     TwoGigabitEthernet2/0/5           0x0000004f          Y
+6           1     5     TwoGigabitEthernet2/0/6           0x00000050          Y
+7           1     6     TwoGigabitEthernet2/0/7           0x00000051          Y
+8           1     7     TwoGigabitEthernet2/0/8           0x00000052          Y
+9           1     8     TwoGigabitEthernet2/0/9           0x00000053          Y
+10          1     9     TwoGigabitEthernet2/0/10          0x00000054          Y
+11          1     10    TwoGigabitEthernet2/0/11          0x00000055          Y
+12          1     11    TwoGigabitEthernet2/0/12          0x00000056          Y
+13          1     12    TwoGigabitEthernet2/0/13          0x00000057          Y
+14          1     13    TwoGigabitEthernet2/0/14          0x00000058          Y
+15          1     14    TwoGigabitEthernet2/0/15          0x00000059          Y
+16          1     15    TwoGigabitEthernet2/0/16          0x0000005a          Y
+17          1     16    TwoGigabitEthernet2/0/17          0x0000005b          Y
+18          1     17    TwoGigabitEthernet2/0/18          0x0000005c          Y
+19          0     18    TwoGigabitEthernet2/0/19          0x0000005d          Y
+20          0     19    TwoGigabitEthernet2/0/20          0x0000005e          Y
+21          0     20    TwoGigabitEthernet2/0/21          0x0000005f          Y
+22          0     21    TwoGigabitEthernet2/0/22          0x00000060          Y
+23          0     22    TwoGigabitEthernet2/0/23          0x00000061          Y
+24          0     23    TwoGigabitEthernet2/0/24          0x00000062          Y
+25          0     24    TwoGigabitEthernet2/0/25          0x00000063          Y
+26          0     25    TwoGigabitEthernet2/0/26          0x00000064          Y
+27          0     26    TwoGigabitEthernet2/0/27          0x00000065          Y
+28          0     27    TwoGigabitEthernet2/0/28          0x00000066          Y
+29          0     28    TwoGigabitEthernet2/0/29          0x00000067          Y
+30          0     29    TwoGigabitEthernet2/0/30          0x00000068          Y
+31          0     30    TwoGigabitEthernet2/0/31          0x00000069          Y
+32          0     31    TwoGigabitEthernet2/0/32          0x0000006a          Y
+33          0     32    TwoGigabitEthernet2/0/33          0x0000006b          Y
+34          0     33    TwoGigabitEthernet2/0/34          0x0000006c          Y
+35          0     34    TwoGigabitEthernet2/0/35          0x0000006d          Y
+36          0     35    TwoGigabitEthernet2/0/36          0x0000006e          Y
+37          1     36    TenGigabitEthernet2/0/37          0x0000006f          Y
+38          1     37    TenGigabitEthernet2/0/38          0x00000070          Y
+39          1     38    TenGigabitEthernet2/0/39          0x00000071          Y
+40          1     39    TenGigabitEthernet2/0/40          0x00000072          Y
+41          1     40    TenGigabitEthernet2/0/41          0x00000073          Y
+42          1     41    TenGigabitEthernet2/0/42          0x00000074          Y
+43          0     42    TenGigabitEthernet2/0/43          0x00000075          Y
+44          0     43    TenGigabitEthernet2/0/44          0x00000076          Y
+45          0     44    TenGigabitEthernet2/0/45          0x00000077          Y
+46          0     45    TenGigabitEthernet2/0/46          0x00000078          Y
+47          0     46    TenGigabitEthernet2/0/47          0x00000079          Y
+48          0     47    TenGigabitEthernet2/0/48          0x0000007a          Y
+49          1     48    GigabitEthernet2/1/1              0x0000007b          N
+50          1     49    GigabitEthernet2/1/2              0x0000007c          N
+51          0     50    GigabitEthernet2/1/3              0x0000007d          N
+52          0     51    GigabitEthernet2/1/4              0x0000007e          N
+53          1     52    TenGigabitEthernet2/1/1           0x0000007f          N
+54          1     53    TenGigabitEthernet2/1/2           0x00000080          N
+55          1     54    TenGigabitEthernet2/1/3           0x00000081          N
+56          1     55    TenGigabitEthernet2/1/4           0x00000082          N
+57          0     56    TenGigabitEthernet2/1/5           0x00000083          N
+58          0     57    TenGigabitEthernet2/1/6           0x00000084          N
+59          0     58    TenGigabitEthernet2/1/7           0x00000085          N
+60          0     59    TenGigabitEthernet2/1/8           0x00000086          N
+61          1     60    FortyGigabitEthernet2/1/1         0x00000087          Y
+62          0     61    FortyGigabitEthernet2/1/2         0x00000088          Y
+63          1     62    TwentyFiveGigE2/1/1               0x00000089          N
+64          0     63    TwentyFiveGigE2/1/2               0x0000008a          N
+65          1     18    AppGigabitEthernet2/0/1           0x0000008b          Y
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..83604ae3db
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_expected.py
@@ -0,0 +1,63 @@
+expected_output={
+      'l3_injected_packets': {
+        'total_inject': 3524142,
+        'failed_inject': 0,
+        'sent': 0,
+        'prerouted': 0,
+        'non_cef_capable': 0,
+        'non_unicast': 0,
+        'ip': 135,
+        'ipv6': 12147,
+        'mpls': 0,
+        'non_ip_tunnel': 0,
+        'udlr_tunnel': 0,
+        'p2mp_replicated_mcast': 0,
+        'non_ip_fastswitched_over_tunnel': 0,
+        'legacy_pak_path': 3524007,
+        'other_packet': 0,
+        'ip_fragmented': 0,
+        'normal': 135,
+        'nexthop': 0,
+        'adjacency': 0,
+        'feature': 0,
+        'undefined': 0,
+        'pak_find_no_adj': 0,
+        'no_adj_id': 0,
+        'sb_alloc': 1023352,
+        'sb_local': 135,
+        'p2mcast_failed_count_0_p2mcast_enqueue_fail': 0,
+        'unicast_dhc': 0,
+        'mobile_ip': 0,
+        'ipv6_na': 0,
+        'ipv6_ns': 0,
+        'transport_failed_cases': 0,
+        'grow_packet_buffer': 0,
+        'cant_l3_inject_pkts': 0
+      },
+      'per_feature_packet_inject_statistics': {
+        'feature_multicast': 0,
+        'feature_edge_switching_service': 0,
+        'feature_session_border_controller': 0,
+        'feature_interrupt_level': 0,
+        'feature_use_outbound_interface': 0,
+        'feature_interrupt_level_with_oce': 0,
+        'feature_icmpv6_error_message': 0,
+        'feature_session_border_controller_media_packet_injection': 0,
+        'feature_tunnel_ethernet_over_gre': 0,
+        'feature_secure_socket_layer_virtual_private_network': 0,
+        'feature_epc_wireshark_injecting_packets': 0,
+        'feature_multicast_overlay_replication': 0
+      },
+      'l2_injected_packets': {
+        'total_l2_inject': 28324,
+        'failed_l2_inject': 0,
+        'total_bd__inject': 28324,
+        'failed_bd__inject': 0,
+        'total_bd_local__inject': 0,
+        'failed_bd_local__inject': 0,
+        'total_efp_inject': 0,
+        'failed_efp_inject': 0,
+        'total_vlan_inject': 0,
+        'failed_vlan_inject': 0
+      }
+    }
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..00c95b241c
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInfrastructureInject/cli/equal/golden_output_output.txt
@@ -0,0 +1,43 @@
+Statistics for L3 injected packets:
+ 3524142 total inject pak, 0 failed
+ 0 sent, 0 prerouted
+ 0 non-CEF capable, 0 non-unicast
+ 135 IP, 12147 IPv6
+ 0 MPLS, 0 Non-IP Tunnel
+ 0 UDLR tunnel, 0 P2MP replicated mcast
+ 0 Non-IP Fastswitched over Tunnel, 3524007 legacy pak path
+ 0 Other packet
+ 0 IP fragmented
+ 135 normal, 0 nexthop
+ 0 adjacency, 0 feature
+ 0 undefined
+ 0 pak find no adj, 0 no adj-id
+ 1023352 sb alloc, 135 sb local
+ 0 p2mcast failed count 0 p2mcast enqueue fail
+ 0 unicast dhc
+ 0 mobile ip
+ 0 IPv6 NA
+ 0 IPv6 NS
+ 0 Transport failed cases
+ 0 Grow packet buffer
+ 0 Cant-l3-inject-pkts
+ per feature packet inject statistics
+ 0 Feature multicast
+ 0 Feature Edge Switching Service
+ 0 Feature Session Border Controller
+ 0 Feature interrupt level
+ 0 Feature use outbound interface
+ 0 Feature interrupt level with OCE
+ 0 Feature ICMPv6 error message
+ 0 Feature Session Border Controller media packet injection
+ 0 Feature Tunnel Ethernet over GRE
+ 0 Feature Secure Socket Layer Virtual Private Network
+ 0 Feature EPC Wireshark injecting packets
+ 0 Feature multicast overlay replication
+
+Statistics for L2 injected packets:
+ 28324 total L2 inject pak, 0 failed
+ 28324 total BD  inject pak, 0 failed
+ 0 total BD-local  inject pak, 0 failed
+ 0 total EFP inject pak, 0 failed
+ 0 total VLAN inject pak, 0 failed
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..3e923b96a3
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_arguments.json
@@ -0,0 +1,4 @@
+{
+    "intf": "HundredGigE2/0/22"
+
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..fc53fc759a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_expected.py
@@ -0,0 +1,31 @@
+expected_output = {
+    'aom_obj_id': 2071,
+    'aom_sanity_check': 'PASS',
+    'aom_state': 'created',
+    'auth_user': '',
+    'bandwidth': 100000000,
+    'dirty_status': 'unknown',
+    'encap': 'ARPA',
+    'flags': 'ipv4',
+    'flow_control_id': 49175,
+    'frr_linkdown_id': 65535,
+    'icmp6_flags': ['unreachables', 'redirects'],
+    'icmp_flags': ['unreachables', 'redirects', 'no-info-reply', 'no-mask-reply'],
+    'id': 1275,
+    'ip_address': '10.10.10.96',
+    'ipv6_address': '::',
+    'mtu': 1500,
+    'name': 'HundredGigE2/0/22',
+    'qfp_id': 1275,
+    'qos_trust_type': 'Trust DSCP',
+    'rx_channel_id': 0,
+    'schedules': 4096,
+    'smi_protocols': ['UNKNOWN'],
+    'snmp_id': 98,
+    'state': 'enabled',
+    'tx_channel_id': 0,
+    'type': 'PORT',
+    'vnet_extra_info': 0,
+    'vnet_name': '',
+    'vnet_tag': 0
+    }
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..54756eaa58
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareInterfaceF0Name/cli/equal/golden_output_output.txt
@@ -0,0 +1,18 @@
+Name: HundredGigE2/0/22, ID: 1275, QFP ID: 1275, Schedules: 4096
+Type: PORT, State: enabled, SNMP ID: 98, MTU: 1500
+TX channel ID: 0, RX channel ID: 0, AOM state: created
+Flow control ID: 49175
+bandwidth: 100000000, encap: ARPA
+IP Address: 10.10.10.96
+IPV6 Address: ::
+Flags: ipv4
+ICMP Flags: unreachables, redirects, no-info-reply, no-mask-reply
+ICMP6 Flags: unreachables, redirects
+SMI enabled on protocol(s): UNKNOWN
+Authenticated-user:
+FRR linkdown ID: 65535
+vNet Name: , vNet Tag: 0, vNet Extra Information: 0
+Dirty: unknown
+AOM dependency sanity check: PASS
+AOM Obj ID: 2071
+QOS trust type: Trust DSCP
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_arguments.json
new file mode 100644
index 0000000000..2b829cf13c
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_arguments.json
@@ -0,0 +1,4 @@
+{
+    "object": "2036",
+    "object_identifier": "downlinks"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_expected.py
new file mode 100644
index 0000000000..976415357a
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_expected.py
@@ -0,0 +1,38 @@
+expected_output = {
+    'object_identifier': {
+        2042: {
+            'description': 'matm mac entry type VLAN, id 1, ''4ce1.75b3.d1df',
+            'object_identifier': 2042,
+            'status': 'Done'
+        },
+        2053: {
+            'description': '(TPP generated) l2m_config ''l2m_mrouter_entry object',
+            'object_identifier': 2053,
+            'status': 'Done'
+        },
+        2072: {
+            'description': 'Tx Channel HundredGigE2/0/22, ''handle 1275, hw handle 1275, ''flag 0x0, dirty hw: NONE dirty ''aom NONE',
+            'object_identifier': 2072,
+            'status': 'Done'},
+        2075: {
+            'description': 'PM port object: port/interface ''1275',
+            'object_identifier': 2075,
+            'status': 'Done'
+        },
+        2078: {
+            'description': 'uRPF-list(hdl=0x00000018)',
+            'object_identifier': 2078,
+            'status': 'Done'
+        },
+        2081: {
+            'description': 'PREFIX 10.10.10.96/32 (Table id ''0)',
+            'object_identifier': 2081,
+            'status': 'Done'
+        },
+        2088: {
+            'description': 'adj 0xf8004fb1, Flags None',
+            'object_identifier': 2088,
+            'status': 'Done'
+            }
+        }
+    }
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_output.txt
new file mode 100644
index 0000000000..e4ac751b3d
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPlatformSoftwareObjectManagerF0ObjectIdentifier/cli/equal/golden_output_output.txt
@@ -0,0 +1,27 @@
+Object identifier: 2072
+  Description: Tx Channel HundredGigE2/0/22, handle 1275, hw handle 1275, flag 0x0, dirty hw: NONE dirty aom NONE
+  Status: Done
+
+Object identifier: 2075
+  Description: PM port object: port/interface 1275
+  Status: Done
+
+Object identifier: 2078
+  Description: uRPF-list(hdl=0x00000018)
+  Status: Done
+
+Object identifier: 2081
+  Description: PREFIX 10.10.10.96/32 (Table id 0)
+  Status: Done
+
+Object identifier: 2088
+  Description: adj 0xf8004fb1, Flags None
+  Status: Done
+
+Object identifier: 2042
+  Description: matm mac entry type VLAN, id 1, 4ce1.75b3.d1df
+  Status: Done
+
+Object identifier: 2053
+  Description: (TPP generated) l2m_config l2m_mrouter_entry object
+  Status: Done
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output4_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output4_expected.py
index 463015ad6d..7e4313b417 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output4_expected.py
+++ b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output4_expected.py
@@ -6,6 +6,8 @@
             'match_evaluation': 'match-any',
             'packets': 0,
             'police': {
+                'rate_pps': 2000,
+                'burst_pkt': 11264,
                 'conformed': {
                     'actions': {
                         'transmit': True,
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_arguments.json b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_arguments.json
new file mode 100644
index 0000000000..17e608da88
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_arguments.json
@@ -0,0 +1,3 @@
+{
+    "class_map": "system-cpp-police-forus"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_expected.py
new file mode 100644
index 0000000000..df8597eec5
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_expected.py
@@ -0,0 +1,30 @@
+expected_output = {
+    "class_map": {
+        "system-cpp-police-forus": {
+            "match_evaluation": "match-any",
+            "packets": 0,
+            "bytes": 0,
+            "rate": {"interval": 300, "offered_rate_bps": 0, "drop_rate_bps": 0},
+            "match": ["none"],
+            "police": {
+                "rate_pps": 1000,
+                "burst_pkt": 244,
+                "conformed": {"bytes": 2371810, "actions": {"transmit": True}},
+                "exceeded": {"bytes": 9136400, "actions": {"drop": True}},
+            },
+        },
+        "system-cpp-police-forus-addr-resolution": {
+            "match_evaluation": "match-any",
+            "packets": 0,
+            "bytes": 0,
+            "rate": {"interval": 300, "offered_rate_bps": 0, "drop_rate_bps": 0},
+            "match": ["none"],
+            "police": {
+                "rate_pps": 3000,
+                "burst_pkt": 732,
+                "conformed": {"bytes": 256, "actions": {"transmit": True}},
+                "exceeded": {"bytes": 0, "actions": {"drop": True}},
+            },
+        },
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_output.txt
new file mode 100644
index 0000000000..628a5af064
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPolicyMapControlPlaneClassMap/cli/equal/golden_output5_output.txt
@@ -0,0 +1,21 @@
+Class-map: system-cpp-police-forus (match-any)
+      0 packets, 0 bytes
+      5 minute offered rate 0000 bps, drop rate 0000 bps
+      Match: none
+      police:
+          rate 1000 pps, burst 244 packets
+        conformed 2371810 bytes; actions:
+          transmit
+        exceeded 9136400 bytes; actions:
+          drop
+    Class-map: system-cpp-police-forus-addr-resolution (match-any)
+      0 packets, 0 bytes
+      5 minute offered rate 0000 bps, drop rate 0000 bps
+      Match: none
+      police:
+          rate 3000 pps, burst 732 packets
+        conformed 256 bytes; actions:
+          transmit
+        exceeded 0 bytes; actions:
+          drop
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_expected.py b/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_expected.py
new file mode 100644
index 0000000000..2694a2b306
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_expected.py
@@ -0,0 +1,3911 @@
+expected_output = {
+    'lsmi_io_pool': {
+        'free': 832,
+        'total': 6295128,
+        'used': 6294296,
+    },
+    'per_process_memory': {
+        "SERIAL A'detect": {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45128,
+            'pid': 58,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '*Dead*': {
+            'allocated': 5393488,
+            'freed': 3511208,
+            'getbufs': 17486679,
+            'holding': 1567944,
+            'pid': 0,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '*Init*': {
+            'allocated': 384659632,
+            'freed': 63644408,
+            'getbufs': 0,
+            'holding': 296924520,
+            'pid': 0,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '*MallocLite*': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 3348768,
+            'pid': 0,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '*Sched*': {
+            'allocated': 1008,
+            'freed': 1142232,
+            'getbufs': 0,
+            'holding': 1008,
+            'pid': 0,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '100ms check': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 110,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        '802.1x switch': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 181,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA ACCT Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 194,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA Cached Serve': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 328,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA Dictionary R': {
+            'allocated': 560,
+            'freed': 560,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 201,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA EPD HANDLER': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 214,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA Proxy': {
+            'allocated': 7944,
+            'freed': 848,
+            'getbufs': 0,
+            'holding': 76760,
+            'pid': 342,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA SEND STOP EV': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 384,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA Server': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 193,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA System Acct': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 307,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AAA_SERVER_DEADT': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 40,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ACCT Periodic Pr': {
+            'allocated': 98736,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 143736,
+            'pid': 195,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ACL Log Punt Ser': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 119,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ACL Logging Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 145,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ACL deny punt se': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 120,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ADJ NSF process': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33408,
+            'pid': 200,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ADJ background': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69408,
+            'pid': 293,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ADJ resolve proc': {
+            'allocated': 456,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69456,
+            'pid': 308,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AN CONFIG DOWNLO': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 272,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AN HELPER': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 271,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AN': {
+            'allocated': 71280,
+            'freed': 1672,
+            'getbufs': 0,
+            'holding': 186728,
+            'pid': 270,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ARP Background': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 36,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ARP HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 106,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ARP Input': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 35,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ARP Snoop': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 53,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ASP Process Crea': {
+            'allocated': 448,
+            'freed': 880,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 373,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ATM ASYNC PROC': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 38,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ATM Idle Timer': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 37,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AUTO LAG Protoco': {
+            'allocated': 896,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57448,
+            'pid': 256,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'AggMgr Process': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 128,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'App Route Proces': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 316,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'BACK CHECK': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 73,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'BFD HA': {
+            'allocated': 16680,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 61680,
+            'pid': 305,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'BSO task': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 245,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Bulkstat-Client': {
+            'allocated': 17264,
+            'freed': 21400,
+            'getbufs': 0,
+            'holding': 56576,
+            'pid': 403,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CDP Forward Proc': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 185,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CDP Protocol': {
+            'allocated': 401112,
+            'freed': 124360,
+            'getbufs': 0,
+            'holding': 86688,
+            'pid': 196,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF MIB API': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 39,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF RP Backgroun': {
+            'allocated': 456,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45456,
+            'pid': 239,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF RRP RF waite': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 108,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF background p': {
+            'allocated': 231536,
+            'freed': 8168,
+            'getbufs': 0,
+            'holding': 292184,
+            'pid': 230,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF switching ba': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69408,
+            'pid': 199,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF: IPv4 proces': {
+            'allocated': 56704,
+            'freed': 22752,
+            'getbufs': 0,
+            'holding': 99800,
+            'pid': 292,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CEF: IPv6 proces': {
+            'allocated': 10552,
+            'freed': 3088,
+            'getbufs': 0,
+            'holding': 76824,
+            'pid': 257,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CFM HA IPC messa': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 252,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CMM IPC Msg Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 285,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CMM event proces': {
+            'allocated': 10096,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 55096,
+            'pid': 286,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'COND_DEBUG HA IP': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 341,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CONSOLE helper p': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 92,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'COPS': {
+            'allocated': 1944,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 262944,
+            'pid': 309,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CRYPTO MAP FREE': {
+            'allocated': 448,
+            'freed': 896,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 355,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CTS CORE': {
+            'allocated': 2336,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 71336,
+            'pid': 71,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CTS HA IPC flow': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 82,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CTS HA': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 81,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'CWAN OIR Handler': {
+            'allocated': 3808456,
+            'freed': 10600,
+            'getbufs': 0,
+            'holding': 1031720,
+            'pid': 155,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Call Home DS': {
+            'allocated': 50072,
+            'freed': 144,
+            'getbufs': 0,
+            'holding': 48864,
+            'pid': 406,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Call Home DSfile': {
+            'allocated': 3720,
+            'freed': 328,
+            'getbufs': 0,
+            'holding': 48720,
+            'pid': 407,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Call Home Timer': {
+            'allocated': 26576,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 48328,
+            'pid': 198,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Call Home proces': {
+            'allocated': 244032,
+            'freed': 83448,
+            'getbufs': 0,
+            'holding': 137832,
+            'pid': 405,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Check heaps': {
+            'allocated': 6240,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 50792,
+            'pid': 9,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Chunk Manager': {
+            'allocated': 1533936,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 1578936,
+            'pid': 1,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Collection proce': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69408,
+            'pid': 294,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Compute load avg': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 125,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Connection Mgr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57128,
+            'pid': 501,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Critical Bkgnd': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 66,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto ACL': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 361,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto CA': {
+            'allocated': 1288432,
+            'freed': 1112144,
+            'getbufs': 0,
+            'holding': 176320,
+            'pid': 346,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto IKE Dispa': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 357,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto IKEv2': {
+            'allocated': 312096,
+            'freed': 2112,
+            'getbufs': 0,
+            'holding': 378984,
+            'pid': 364,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto IKMP': {
+            'allocated': 41456,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 110008,
+            'pid': 358,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto INT': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 356,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto PAS Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 362,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto PKI-CRL': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 347,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto PKI-HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 107,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto PKI-Rev-P': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 348,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Crypto Support': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 326,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DAI Packet Proce': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 282,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DB Lock Manager': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 15,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DBAL EVENTS': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 95,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DCM Core Thread': {
+            'allocated': 30880,
+            'freed': 5984,
+            'getbufs': 0,
+            'holding': 69800,
+            'pid': 383,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DCM snmp dp Thre': {
+            'allocated': 31144,
+            'freed': 1136,
+            'getbufs': 0,
+            'holding': 59768,
+            'pid': 401,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DDR Timers': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45120,
+            'pid': 42,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Client': {
+            'allocated': 0,
+            'freed': 1824,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 300,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Security He': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 376,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Snooping HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 103,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Snooping cl': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 100,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Snooping db': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 102,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCP Snooping': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 101,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCPC HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 111,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCPD HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 105,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCPv6 LQ client': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 320,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCPv6 Relay HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 112,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DHCPv6 Server HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 113,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DNS Service': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 312,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DTP Protocol': {
+            'allocated': 1792,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 70344,
+            'pid': 180,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DiagCard1/-1': {
+            'allocated': 17952,
+            'freed': 18312,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 368,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DiscardQ Backgro': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 11,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'DynCmd Package P': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 323,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Dynamic ARP Insp': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 51,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED CLI': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 410,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED CRASH': {
+            'allocated': 20352,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 71672,
+            'pid': 425,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Config': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 422,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Counter': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 411,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED DS': {
+            'allocated': 20352,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 71672,
+            'pid': 424,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Env': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 423,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Generic': {
+            'allocated': 385264,
+            'freed': 5680,
+            'getbufs': 72316,
+            'holding': 436584,
+            'pid': 387,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED IOSWD': {
+            'allocated': 14184,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65504,
+            'pid': 413,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Identity': {
+            'allocated': 14208,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65528,
+            'pid': 143,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Interface': {
+            'allocated': 15456,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 66776,
+            'pid': 412,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED MAT': {
+            'allocated': 14104,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65424,
+            'pid': 150,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED ND': {
+            'allocated': 53608,
+            'freed': 353744,
+            'getbufs': 0,
+            'holding': 104360,
+            'pid': 151,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED None': {
+            'allocated': 15008,
+            'freed': 6248,
+            'getbufs': 0,
+            'holding': 66328,
+            'pid': 414,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED OIR': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 415,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED RF': {
+            'allocated': 15280,
+            'freed': 5912,
+            'getbufs': 0,
+            'holding': 65872,
+            'pid': 416,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED RPC': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 400,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Routing': {
+            'allocated': 14248,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65568,
+            'pid': 388,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED SNMP Noti': {
+            'allocated': 14248,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65568,
+            'pid': 419,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED SNMP Obje': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 418,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED SNMP': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 417,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Syslog': {
+            'allocated': 3938440,
+            'freed': 5680,
+            'getbufs': 849828,
+            'holding': 3989760,
+            'pid': 386,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Test': {
+            'allocated': 14056,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65376,
+            'pid': 421,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM ED Timer': {
+            'allocated': 14360,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 65680,
+            'pid': 420,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM GED BINOS PR': {
+            'allocated': 20160,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 71480,
+            'pid': 375,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM Helper Threa': {
+            'allocated': 9000,
+            'freed': 528,
+            'getbufs': 0,
+            'holding': 53472,
+            'pid': 495,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM Policy Direc': {
+            'allocated': 19240,
+            'freed': 1784,
+            'getbufs': 0,
+            'holding': 74456,
+            'pid': 408,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EEM Server': {
+            'allocated': 1485272,
+            'freed': 28496,
+            'getbufs': 0,
+            'holding': 1501776,
+            'pid': 399,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EFP Errd': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 246,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EM Background Pr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 330,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EM ED GOLD': {
+            'allocated': 40832,
+            'freed': 5680,
+            'getbufs': 0,
+            'holding': 92152,
+            'pid': 426,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EM_SHIM_NOTIFY_T': {
+            'allocated': 448,
+            'freed': 17328,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 94,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EM_SHIM_TASK': {
+            'allocated': 17328,
+            'freed': 84840,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 93,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ENABLE AAA': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 329,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EPC WS PD suppor': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 393,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'EPC WS PI suppor': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 392,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Entity MIB API': {
+            'allocated': 30656,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 75656,
+            'pid': 43,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethchnl': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 161,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ether EFP Proces': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 247,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethernet CFM': {
+            'allocated': 2600,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 119152,
+            'pid': 160,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethernet OAM Pro': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 159,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethernet PM Moni': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69128,
+            'pid': 255,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethernet PM Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 253,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ethernet PM Soft': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 254,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Exec': {
+            'allocated': 28890432,
+            'freed': 28683432,
+            'getbufs': 0,
+            'holding': 278216,
+            'pid': 153,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FEC_Link_event_h': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 132,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FEP background p': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 136,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FHRP Main thread': {
+            'allocated': 3344,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 48344,
+            'pid': 186,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FMANRP REP Helpe': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 173,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FNF background p': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 396,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FNF_WIRELESS_PRO': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 288,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FPD Action Proce': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 149,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FPD Management P': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45112,
+            'pid': 148,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'FRR Background P': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 229,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'File Copy Handle': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 339,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Flow Exporter Pa': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 284,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Flow Exporter Ti': {
+            'allocated': 448,
+            'freed': 2056,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 283,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'GLBP HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 297,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'GraphIt': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 49,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'HQF TARGET DYNAM': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 202,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'HSRP HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 298,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'HTTP CORE': {
+            'allocated': 34968,
+            'freed': 34696,
+            'getbufs': 0,
+            'holding': 119456,
+            'pid': 275,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ICMP event handl': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 209,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IDB Work': {
+            'allocated': 1472,
+            'freed': 1472,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 68,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IDMGR CORE': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 331,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IF-MGR control p': {
+            'allocated': 6600,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 51600,
+            'pid': 86,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IF-MGR event pro': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 87,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IFS Agent Manage': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 44,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IGMPQR': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 279,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IGMPSN L2MCM': {
+            'allocated': 11544,
+            'freed': 53352,
+            'getbufs': 0,
+            'holding': 47608,
+            'pid': 259,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IGMPSN MRD': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 260,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IGMPSN': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 261,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IGMPSN-HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 280,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IKEv2 AAA handle': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 365,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IKEv2 Cluster Lo': {
+            'allocated': 1824,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 46824,
+            'pid': 378,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IKEv2 FlexVPN Pr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 377,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSD chasfs task': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 75,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSD ipc task': {
+            'allocated': 35078768,
+            'freed': 3199408,
+            'getbufs': 0,
+            'holding': 31261592,
+            'pid': 74,
+            'retbufs': 36456,
+            'tty': 0,
+        },
+        'IOSXE heartbeat': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 14,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSXE signals IO': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 48,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSXE-RP FastPat': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 131,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSXE-RP Punt IP': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 118,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSXE-RP Punt Se': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 117,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IOSXE-RP SPA TSM': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 121,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP ARP Adjacency': {
+            'allocated': 2296,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 71296,
+            'pid': 206,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP ARP Retry Age': {
+            'allocated': 66064,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 111064,
+            'pid': 207,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP Background': {
+            'allocated': 76792,
+            'freed': 44216,
+            'getbufs': 0,
+            'holding': 90856,
+            'pid': 242,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP Connected Rou': {
+            'allocated': 90104,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 147104,
+            'pid': 243,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP IRDP': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 232,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP Input': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 208,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP RIB Update': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69408,
+            'pid': 241,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IP Traceroute': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 304,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPAM Events': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 205,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPAM Manager': {
+            'allocated': 98736,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 167872,
+            'pid': 204,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPAM/ODAP Events': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 203,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Apps Task': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 17,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Check Queue': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 28,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Deferred Por': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 25,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Dynamic Cach': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 21,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Event Notifi': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 18,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC ISSU Dispatc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 6,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC ISSU Version': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 488,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Keep Alive M': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 31,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC LC Message H': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 237,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Loadometer': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 32,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Mcast Pendin': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 19,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Periodic Tim': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 24,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Process leve': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 26,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Seat Manager': {
+            'allocated': 2192,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 47192,
+            'pid': 27,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Seat RX Cont': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 29,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Seat TX Cont': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 30,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Service NonC': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 22,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Session Deta': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 33,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPC Zone Manager': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 23,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPSEC key engine': {
+            'allocated': 6936,
+            'freed': 5616,
+            'getbufs': 0,
+            'holding': 69872,
+            'pid': 360,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPSEC manual key': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 359,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPSECv6 PS Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 327,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPSec background': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 363,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPv6 Access Cont': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 124,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPv6 RIB Cleanup': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 317,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPv6 RIB Event H': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 318,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPv6 Static Hand': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 319,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'IPv6 ping proces': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 212,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ISSU Utility Pro': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 391,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Image License br': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 62,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Inline Power': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 183,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Key chain liveke': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 333,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'L2MCAST Wireless': {
+            'allocated': 0,
+            'freed': 944,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 287,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'L2TRACE SERVER': {
+            'allocated': 63744,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 51168,
+            'pid': 289,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'LDAP process': {
+            'allocated': 2288,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 70840,
+            'pid': 332,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'LICENSE AGENT': {
+            'allocated': 47792,
+            'freed': 1632,
+            'getbufs': 0,
+            'holding': 164904,
+            'pid': 502,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'LIM Process': {
+            'allocated': 1008,
+            'freed': 1008,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 258,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'LINE AAA': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 334,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'LOCAL AAA': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 335,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'License Client N': {
+            'allocated': 336,
+            'freed': 1328,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 61,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'License HA Consi': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 64,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'License IPC serv': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 55,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'License IPC stat': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 54,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Licensing Auto U': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 63,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Licensing MIB pr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 374,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Load Meter': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 2,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Logger': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 69,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MATM CF Flow Con': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 97,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MATM RP Shim Pro': {
+            'allocated': 640,
+            'freed': 640,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 154,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MATM SPI client': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 79,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MFIB Master back': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69408,
+            'pid': 299,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MGMTE stats Proc': {
+            'allocated': 45600,
+            'freed': 45600,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 152,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MKA': {
+            'allocated': 37816,
+            'freed': 1096,
+            'getbufs': 0,
+            'holding': 81720,
+            'pid': 191,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MLDSN L2MCM': {
+            'allocated': 11496,
+            'freed': 50064,
+            'getbufs': 0,
+            'holding': 50040,
+            'pid': 276,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MLDSN-HA': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 281,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MLD_SNOOP': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 278,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MMN bkgrd proces': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 141,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MRD': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 277,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MRIB Process': {
+            'allocated': 167728,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 236280,
+            'pid': 494,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MRIB RP Proxy': {
+            'allocated': 784,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69784,
+            'pid': 302,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MVPN Mgr Process': {
+            'allocated': 2152,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 58704,
+            'pid': 313,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MVRP Process': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 162,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'MVRP SWITCH Proc': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 340,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Multicast Offloa': {
+            'allocated': 896,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57448,
+            'pid': 314,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NCD Process': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 369,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NG Backup Interf': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 133,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGCP SCHEDULER P': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 248,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC Configurati': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 96,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC DOT1X Proce': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 142,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC ILP CF Proc': {
+            'allocated': 10096,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 55096,
+            'pid': 104,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC L2M': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 139,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC Learning Pr': {
+            'allocated': 26392,
+            'freed': 26392,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 98,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC OIR CC Proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 77,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC diag proces': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 138,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC led process': {
+            'allocated': 0,
+            'freed': 4312,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 176,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC stack power': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 273,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC_MACSEC_IOSD': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 146,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NGWC_OIRSHIM_TAS': {
+            'allocated': 45632,
+            'freed': 2880,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 76,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'NIST rng proc': {
+            'allocated': 36576,
+            'freed': 34960,
+            'getbufs': 0,
+            'holding': 46616,
+            'pid': 338,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Net Background': {
+            'allocated': 350968,
+            'freed': 11864,
+            'getbufs': 0,
+            'holding': 96416,
+            'pid': 67,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Net Input': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 56,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Network-rf Notif': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 115,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Ng3k envvar sync': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 78,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Online Diag EEM': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45408,
+            'pid': 379,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Opaque Database': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 324,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PI MATM Aging Pr': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 177,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PIM HA': {
+            'allocated': 896,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45448,
+            'pid': 366,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PIM register asy': {
+            'allocated': 576,
+            'freed': 576,
+            'getbufs': 0,
+            'holding': 45136,
+            'pid': 211,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PKI OCSP': {
+            'allocated': 1936,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 70936,
+            'pid': 349,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PKI Revocation': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 350,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PKI Trustpool': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69112,
+            'pid': 197,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PKI/SSL IPC proc': {
+            'allocated': 9408,
+            'freed': 2416,
+            'getbufs': 0,
+            'holding': 125704,
+            'pid': 175,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PLFM-MGR IPC pro': {
+            'allocated': 4456,
+            'freed': 397872,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 135,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PM Callback': {
+            'allocated': 37792,
+            'freed': 115000,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 371,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PM EPD API': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 215,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PPP Bind': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 217,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PPP IP Route': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 218,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PPP SIP': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 216,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PTP protocol eng': {
+            'allocated': 5528,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 50080,
+            'pid': 182,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Per-Second Jobs': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 127,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Per-minute Jobs': {
+            'allocated': 2816,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 47816,
+            'pid': 126,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Platform appsess': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 20,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Policy Manager': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 41,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Policy bind Proc': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 370,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Pool Manager': {
+            'allocated': 1095576,
+            'freed': 823776,
+            'getbufs': 993784,
+            'holding': 343176,
+            'pid': 10,
+            'retbufs': 788868,
+            'tty': 0,
+        },
+        'Port-Security': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45408,
+            'pid': 179,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PrstVbl': {
+            'allocated': 4032,
+            'freed': 4032,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 45,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Punt FP Stats Du': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 84,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'PuntInject Keepa': {
+            'allocated': 560,
+            'freed': 560,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 85,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'QoS stats proces': {
+            'allocated': 11808,
+            'freed': 11808,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 321,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RBM CORE': {
+            'allocated': 29776,
+            'freed': 896,
+            'getbufs': 0,
+            'holding': 97880,
+            'pid': 398,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REDUNDANCY FSM': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 83,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REDUNDANCY peer': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 109,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REP BPA/EPA Proc': {
+            'allocated': 7504,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 52056,
+            'pid': 269,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REP LSL Hello Pr': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 174,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REP LSL Proc': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 268,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REP Switch Helpe': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 343,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'REP Topology cha': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 172,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RF Master Main T': {
+            'allocated': 33416,
+            'freed': 46808,
+            'getbufs': 0,
+            'holding': 61808,
+            'pid': 122,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RF Master Status': {
+            'allocated': 3384,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 48384,
+            'pid': 123,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RF Slave Main Th': {
+            'allocated': 560832,
+            'freed': 23144,
+            'getbufs': 0,
+            'holding': 477832,
+            'pid': 4,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RIB LM VALIDATE': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 220,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RMI RM Notify Wa': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 47,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RO Notify Timers': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 7,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RP HA Periodic': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 91,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RSA background p': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 345,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RSVP SYNC': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 267,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'RTTYS Process': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 157,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Remote Console P': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 144,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Retransmission o': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 5,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Routing Topology': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 240,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SCTP Main Proces': {
+            'allocated': 38912,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 83464,
+            'pid': 322,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SENSOR-MGR event': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 34,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SEP_webui_wsma_h': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 118248,
+            'pid': 336,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SFF8472': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 130,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SISF HA Process': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 114,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SMART': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 50,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP DBAL Cache': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 170,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP DBAL WRAPPE': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 169,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP LA Cache In': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 496,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP LA Cache pr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 499,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP MA SA': {
+            'allocated': 8457552,
+            'freed': 133928,
+            'getbufs': 0,
+            'holding': 5682240,
+            'pid': 168,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SNMP Timers': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 303,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SPA ENTITY Proce': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 380,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SPAN switch': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 394,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SR CapMan Proces': {
+            'allocated': 11384,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 55936,
+            'pid': 311,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSH Event handle': {
+            'allocated': 8728,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 53472,
+            'pid': 219,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSM connection m': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 221,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSS Feature Mana': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 224,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSS Feature Time': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 225,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSS Manager': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 222,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SSS Policy Manag': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 223,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'STACK MGR Proces': {
+            'allocated': 0,
+            'freed': 1296,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 80,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'STP HA IPC flow': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 306,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SXP CORE': {
+            'allocated': 2376,
+            'freed': 2968,
+            'getbufs': 0,
+            'holding': 70928,
+            'pid': 72,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Serial Backgroun': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 46,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Service Routing': {
+            'allocated': 152,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45152,
+            'pid': 310,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Socket Timers': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 274,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SpanTree Flush': {
+            'allocated': 0,
+            'freed': 142528,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 244,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'SpanTree Helper': {
+            'allocated': 69752,
+            'freed': 29728,
+            'getbufs': 0,
+            'holding': 45112,
+            'pid': 3,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Spanning Tree St': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 192,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Spanning Tree': {
+            'allocated': 162736,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 46008,
+            'pid': 226,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Src Fltr backgro': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45408,
+            'pid': 147,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Switch Backup In': {
+            'allocated': 73984,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 118984,
+            'pid': 164,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Syslog Traps': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 389,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Syslog': {
+            'allocated': 47200,
+            'freed': 47200,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 427,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TCP HA PROC': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 264,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TCP Protocols': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 263,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TCP Timer': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 262,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TP CUTOVER EVENT': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 156,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TPLUS': {
+            'allocated': 2432,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 70984,
+            'pid': 337,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TPS IPC Process': {
+            'allocated': 792,
+            'freed': 5896,
+            'getbufs': 0,
+            'holding': 117792,
+            'pid': 352,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TRACK Client thr': {
+            'allocated': 3344,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 48344,
+            'pid': 188,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TRACK Main threa': {
+            'allocated': 13440,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 58440,
+            'pid': 187,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'TTY Background': {
+            'allocated': 70144,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45568,
+            'pid': 70,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Test AAA Client': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 385,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Thermal backgrou': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 140,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Timer Library': {
+            'allocated': 99192,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 143744,
+            'pid': 325,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Timers': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 12,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Token Daemon': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45128,
+            'pid': 65,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Transport Port A': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 129,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Tunnel FIB': {
+            'allocated': 456,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57456,
+            'pid': 290,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Tunnel': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 291,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'UDLD': {
+            'allocated': 17704,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 62256,
+            'pid': 227,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VIDB BACKGD MGR': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 8,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VLAN Manager': {
+            'allocated': 515168,
+            'freed': 463664,
+            'getbufs': 0,
+            'holding': 119032,
+            'pid': 429,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VMATM Callback': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 178,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VRRP Main thread': {
+            'allocated': 3344,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 48344,
+            'pid': 189,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VRRS Main thread': {
+            'allocated': 36976,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 81976,
+            'pid': 190,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VRRS': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 228,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'VTP Trap Process': {
+            'allocated': 7504,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 52056,
+            'pid': 367,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WATCH_AFS': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 13,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WCDB ARP Process': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 52,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WCM CONFIG SHARE': {
+            'allocated': 560,
+            'freed': 1152,
+            'getbufs': 0,
+            'holding': 69560,
+            'pid': 266,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WCM/AAA IPC proc': {
+            'allocated': 296,
+            'freed': 592,
+            'getbufs': 0,
+            'holding': 117000,
+            'pid': 353,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WDB Process': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 184,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WLM HA IPC flow': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 167,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WLM HA': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 166,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WPM HA Reconcile': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 99,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WSMAN Process': {
+            'allocated': 15952,
+            'freed': 14136,
+            'getbufs': 0,
+            'holding': 118944,
+            'pid': 395,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'WSMA_NOTIFY': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 117304,
+            'pid': 213,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'Wireless Manager': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 165,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR FOF process': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45408,
+            'pid': 296,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR RP Ping Back': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 235,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR RP Test Back': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 238,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR RRP RF waite': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 33000,
+            'pid': 116,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR background p': {
+            'allocated': 408,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45528,
+            'pid': 233,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR mcast': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 234,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XDR receive': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 236,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XML Proxy Client': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 60,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'XPS background p': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 137,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'client_entity_se': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 57,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'cpf_msg_holdq_pr': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 88,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'cpf_msg_rcvq_pro': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 89,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'cpf_process_tpQ': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 90,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'crypto engine pr': {
+            'allocated': 268672,
+            'freed': 267472,
+            'getbufs': 0,
+            'holding': 46056,
+            'pid': 344,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'crypto sw pk pro': {
+            'allocated': 7375736,
+            'freed': 7341992,
+            'getbufs': 0,
+            'holding': 56936,
+            'pid': 59,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'dcm_cli_engine': {
+            'allocated': 14920,
+            'freed': 200,
+            'getbufs': 0,
+            'holding': 59592,
+            'pid': 381,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'dcm_cli_provider': {
+            'allocated': 9712,
+            'freed': 464,
+            'getbufs': 0,
+            'holding': 54384,
+            'pid': 382,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'dcm_expression_p': {
+            'allocated': 6752,
+            'freed': 464,
+            'getbufs': 0,
+            'holding': 51128,
+            'pid': 404,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'dhcp snooping sw': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 372,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'encrypt proc': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 354,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'fib_fib_bfd_sb e': {
+            'allocated': 536,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 69536,
+            'pid': 231,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ifIndex Receive': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 16,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'mDNS': {
+            'allocated': 631152,
+            'freed': 340616,
+            'getbufs': 0,
+            'holding': 265952,
+            'pid': 210,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'mdns Timer Proce': {
+            'allocated': 553160,
+            'freed': 553016,
+            'getbufs': 0,
+            'holding': 69144,
+            'pid': 493,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'nbar-auto-custom': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 251,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'nbar-custom-prot': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 250,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'nbar-graph-sende': {
+            'allocated': 448,
+            'freed': 448,
+            'getbufs': 0,
+            'holding': 69000,
+            'pid': 249,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ngpm main proces': {
+            'allocated': 0,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 134,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'ngwc callhome pe': {
+            'allocated': 7616,
+            'freed': 7616,
+            'getbufs': 0,
+            'holding': 45000,
+            'pid': 163,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'pki_app': {
+            'allocated': 1704,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 70704,
+            'pid': 351,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'radius dtls clie': {
+            'allocated': 100560,
+            'freed': 0,
+            'getbufs': 0,
+            'holding': 145560,
+            'pid': 158,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'snmp dcm ma shim': {
+            'allocated': 6288,
+            'freed': 464,
+            'getbufs': 0,
+            'holding': 50808,
+            'pid': 402,
+            'retbufs': 0,
+            'tty': 0,
+        },
+        'static': {
+            'allocated': 448,
+            'freed': 3632,
+            'getbufs': 0,
+            'holding': 57000,
+            'pid': 315,
+            'retbufs': 0,
+            'tty': 0,
+        },
+    },
+    'processor_pool': {
+        'free': 514879552,
+        'total': 886321088,
+        'used': 371441536,
+    },
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_output.txt b/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_output.txt
new file mode 100644
index 0000000000..dfc5ce1068
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowProcessesMemorySorted/cli/equal/golden_output1_sorted_output.txt
@@ -0,0 +1,502 @@
+Processor Pool Total:  886321088 Used:  371441536 Free:  514879552
+ lsmpi_io Pool Total:    6295128 Used:    6294296 Free:        832
+
+ PID TTY  Allocated      Freed    Holding    Getbufs    Retbufs Process
+   0   0  384659632   63644408  296924520          0          0 *Init*
+  74   0   35078768    3199408   31261592          0      36456 IOSD ipc task
+ 168   0    8457552     133928    5682240          0          0 SNMP MA SA
+ 386   0    3938440       5680    3989760     849828          0 EEM ED Syslog
+   0   0          0          0    3348768          0          0 *MallocLite*
+   1   0    1533936          0    1578936          0          0 Chunk Manager
+   0   0    5393488    3511208    1567944   17486679          0 *Dead*
+ 399   0    1485272      28496    1501776          0          0 EEM Server
+ 155   0    3808456      10600    1031720          0          0 CWAN OIR Handler
+   4   0     560832      23144     477832          0          0 RF Slave Main Th
+ 387   0     385264       5680     436584      72316          0 EEM ED Generic
+ 364   0     312096       2112     378984          0          0 Crypto IKEv2
+  10   0    1095576     823776     343176     993784     788868 Pool Manager
+ 230   0     231536       8168     292184          0          0 CEF background p
+ 153   0   28890432   28683432     278216          0          0 Exec
+ 210   0     631152     340616     265952          0          0 mDNS
+ 309   0       1944          0     262944          0          0 COPS
+ 494   0     167728        448     236280          0          0 MRIB Process
+ 270   0      71280       1672     186728          0          0 AN
+ 346   0    1288432    1112144     176320          0          0 Crypto CA
+ 204   0      98736          0     167872          0          0 IPAM Manager
+ 502   0      47792       1632     164904          0          0 LICENSE AGENT
+ 243   0      90104          0     147104          0          0 IP Connected Rou
+ 158   0     100560          0     145560          0          0 radius dtls clie
+ 325   0      99192        448     143744          0          0 Timer Library
+ 195   0      98736          0     143736          0          0 ACCT Periodic Pr
+ 405   0     244032      83448     137832          0          0 Call Home proces
+ 175   0       9408       2416     125704          0          0 PKI/SSL IPC proc
+ 275   0      34968      34696     119456          0          0 HTTP CORE
+ 160   0       2600        448     119152          0          0 Ethernet CFM
+ 429   0     515168     463664     119032          0          0 VLAN Manager
+ 164   0      73984          0     118984          0          0 Switch Backup In
+ 395   0      15952      14136     118944          0          0 WSMAN Process
+ 265   0          0          0     118360          0          0 SEP_webui_wsma_h
+ 336   0          0          0     118248          0          0 SEP_webui_wsma_h
+ 352   0        792       5896     117792          0          0 TPS IPC Process
+ 213   0          0          0     117304          0          0 WSMA_NOTIFY
+ 169   0        448        448     117000          0          0 SNMP DBAL WRAPPE
+ 271   0          0          0     117000          0          0 AN HELPER
+ 272   0          0          0     117000          0          0 AN CONFIG DOWNLO
+ 245   0          0          0     117000          0          0 BSO task
+ 353   0        296        592     117000          0          0 WCM/AAA IPC proc
+  95   0          0          0     117000          0          0 DBAL EVENTS
+ 373   0        448        880     117000          0          0 ASP Process Crea
+  75   0          0          0     117000          0          0 IOSD chasfs task
+ 361   0          0          0     117000          0          0 Crypto ACL
+ 207   0      66064          0     111064          0          0 IP ARP Retry Age
+ 358   0      41456        448     110008          0          0 Crypto IKMP
+ 151   0      53608     353744     104360          0          0 EEM ED ND
+ 292   0      56704      22752      99800          0          0 CEF: IPv4 proces
+ 398   0      29776        896      97880          0          0 RBM CORE
+  67   0     350968      11864      96416          0          0 Net Background
+ 426   0      40832       5680      92152          0          0 EM ED GOLD
+ 242   0      76792      44216      90856          0          0 IP Background
+ 196   0     401112     124360      86688          0          0 CDP Protocol
+ 322   0      38912        448      83464          0          0 SCTP Main Proces
+ 190   0      36976          0      81976          0          0 VRRS Main thread
+ 191   0      37816       1096      81720          0          0 MKA
+ 257   0      10552       3088      76824          0          0 CEF: IPv6 proces
+ 342   0       7944        848      76760          0          0 AAA Proxy
+  43   0      30656          0      75656          0          0 Entity MIB API
+ 408   0      19240       1784      74456          0          0 EEM Policy Direc
+ 424   0      20352       5680      71672          0          0 EEM ED DS
+ 425   0      20352       5680      71672          0          0 EEM ED CRASH
+ 375   0      20160       5680      71480          0          0 EEM GED BINOS PR
+  71   0       2336          0      71336          0          0 CTS CORE
+ 206   0       2296          0      71296          0          0 IP ARP Adjacency
+ 337   0       2432        448      70984          0          0 TPLUS
+ 349   0       1936          0      70936          0          0 PKI OCSP
+  72   0       2376       2968      70928          0          0 SXP CORE
+ 332   0       2288        448      70840          0          0 LDAP process
+ 351   0       1704          0      70704          0          0 pki_app
+ 180   0       1792        448      70344          0          0 DTP Protocol
+ 360   0       6936       5616      69872          0          0 IPSEC key engine
+ 383   0      30880       5984      69800          0          0 DCM Core Thread
+ 302   0        784          0      69784          0          0 MRIB RP Proxy
+ 266   0        560       1152      69560          0          0 WCM CONFIG SHARE
+ 231   0        536          0      69536          0          0 fib_fib_bfd_sb e
+ 308   0        456          0      69456          0          0 ADJ resolve proc
+ 294   0        408          0      69408          0          0 Collection proce
+ 299   0        408          0      69408          0          0 MFIB Master back
+ 199   0        408          0      69408          0          0 CEF switching ba
+ 241   0        408          0      69408          0          0 IP RIB Update
+ 293   0        408          0      69408          0          0 ADJ background
+ 493   0     553160     553016      69144          0          0 mdns Timer Proce
+ 255   0          0          0      69128          0          0 Ethernet PM Moni
+ 197   0          0          0      69112          0          0 PKI Trustpool
+ 335   0        448        448      69000          0          0 LOCAL AAA
+ 357   0        448        448      69000          0          0 Crypto IKE Dispa
+ 356   0          0          0      69000          0          0 Crypto INT
+ 324   0          0          0      69000          0          0 Opaque Database
+ 354   0          0          0      69000          0          0 encrypt proc
+ 370   0        448        448      69000          0          0 Policy bind Proc
+ 345   0          0          0      69000          0          0 RSA background p
+ 347   0        448        448      69000          0          0 Crypto PKI-CRL
+ 348   0          0          0      69000          0          0 Crypto PKI-Rev-P
+ 300   0          0       1824      69000          0          0 DHCP Client
+  68   0       1472       1472      69000          0          0 IDB Work
+ 385   0          0          0      69000          0          0 Test AAA Client
+  41   0          0          0      69000          0          0 Policy Manager
+  55   0          0          0      69000          0          0 License IPC serv
+  60   0        448        448      69000          0          0 XML Proxy Client
+ 291   0        448        448      69000          0          0 Tunnel
+ 350   0          0          0      69000          0          0 PKI Revocation
+ 284   0        448        448      69000          0          0 Flow Exporter Pa
+ 283   0        448       2056      69000          0          0 Flow Exporter Ti
+ 363   0          0          0      69000          0          0 IPSec background
+  69   0        448        448      69000          0          0 Logger
+  54   0          0          0      69000          0          0 License IPC stat
+ 267   0          0          0      69000          0          0 RSVP SYNC
+ 107   0          0          0      69000          0          0 Crypto PKI-HA
+ 396   0          0          0      69000          0          0 FNF background p
+ 377   0          0          0      69000          0          0 IKEv2 FlexVPN Pr
+ 263   0          0          0      69000          0          0 TCP Protocols
+ 262   0          0          0      69000          0          0 TCP Timer
+ 223   0          0          0      69000          0          0 SSS Policy Manag
+ 222   0          0          0      69000          0          0 SSS Manager
+ 251   0        448        448      69000          0          0 nbar-auto-custom
+ 250   0        448        448      69000          0          0 nbar-custom-prot
+ 249   0        448        448      69000          0          0 nbar-graph-sende
+ 248   0        448        448      69000          0          0 NGCP SCHEDULER P
+ 221   0        448        448      69000          0          0 SSM connection m
+ 140   0          0          0      69000          0          0 Thermal backgrou
+ 427   0      47200      47200      69000          0          0 Syslog
+ 240   0          0          0      69000          0          0 Routing Topology
+ 137   0          0          0      69000          0          0 XPS background p
+ 236   0          0          0      69000          0          0 XDR receive
+ 205   0        448        448      69000          0          0 IPAM Events
+ 136   0          0          0      69000          0          0 FEP background p
+ 218   0        448        448      69000          0          0 PPP IP Route
+ 208   0          0          0      69000          0          0 IP Input
+ 412   0      15456       5680      66776          0          0 EEM ED Interface
+ 414   0      15008       6248      66328          0          0 EEM ED None
+ 416   0      15280       5912      65872          0          0 EEM ED RF
+ 420   0      14360       5680      65680          0          0 EEM ED Timer
+ 419   0      14248       5680      65568          0          0 EEM ED SNMP Noti
+ 388   0      14248       5680      65568          0          0 EEM ED Routing
+ 143   0      14208       5680      65528          0          0 EEM ED Identity
+ 413   0      14184       5680      65504          0          0 EEM ED IOSWD
+ 150   0      14104       5680      65424          0          0 EEM ED MAT
+ 411   0      14056       5680      65376          0          0 EEM ED Counter
+ 415   0      14056       5680      65376          0          0 EEM ED OIR
+ 418   0      14056       5680      65376          0          0 EEM ED SNMP Obje
+ 417   0      14056       5680      65376          0          0 EEM ED SNMP
+ 410   0      14056       5680      65376          0          0 EEM ED CLI
+ 422   0      14056       5680      65376          0          0 EEM ED Config
+ 423   0      14056       5680      65376          0          0 EEM ED Env
+ 400   0      14056       5680      65376          0          0 EEM ED RPC
+ 421   0      14056       5680      65376          0          0 EEM ED Test
+ 227   0      17704        448      62256          0          0 UDLD
+ 122   0      33416      46808      61808          0          0 RF Master Main T
+ 305   0      16680          0      61680          0          0 BFD HA
+ 401   0      31144       1136      59768          0          0 DCM snmp dp Thre
+ 381   0      14920        200      59592          0          0 dcm_cli_engine
+ 313   0       2152        448      58704          0          0 MVPN Mgr Process
+ 187   0      13440          0      58440          0          0 TRACK Main threa
+ 290   0        456          0      57456          0          0 Tunnel FIB
+ 256   0        896        448      57448          0          0 AUTO LAG Protoco
+ 314   0        896        448      57448          0          0 Multicast Offloa
+ 501   0          0          0      57128          0          0 Connection Mgr
+ 374   0          0          0      57000          0          0 Licensing MIB pr
+ 202   0          0          0      57000          0          0 HQF TARGET DYNAM
+ 159   0        448        448      57000          0          0 Ethernet OAM Pro
+ 318   0          0          0      57000          0          0 IPv6 RIB Event H
+ 359   0          0          0      57000          0          0 IPSEC manual key
+ 162   0        448        448      57000          0          0 MVRP Process
+ 340   0        448        448      57000          0          0 MVRP SWITCH Proc
+  83   0          0          0      57000          0          0 REDUNDANCY FSM
+ 134   0          0          0      57000          0          0 ngpm main proces
+ 315   0        448       3632      57000          0          0 static
+ 323   0          0          0      57000          0          0 DynCmd Package P
+ 321   0      11808      11808      57000          0          0 QoS stats proces
+ 319   0          0          0      57000          0          0 IPv6 Static Hand
+  92   0          0          0      57000          0          0 CONSOLE helper p
+ 317   0          0          0      57000          0          0 IPv6 RIB Cleanup
+ 316   0        448        448      57000          0          0 App Route Proces
+ 114   0        448        448      57000          0          0 SISF HA Process
+ 254   0        448        448      57000          0          0 Ethernet PM Soft
+ 127   0          0          0      57000          0          0 Per-Second Jobs
+ 253   0          0          0      57000          0          0 Ethernet PM Proc
+ 232   0          0          0      57000          0          0 IP IRDP
+  59   0    7375736    7341992      56936          0          0 crypto sw pk pro
+ 403   0      17264      21400      56576          0          0 Bulkstat-Client
+ 311   0      11384        448      55936          0          0 SR CapMan Proces
+ 104   0      10096          0      55096          0          0 NGWC ILP CF Proc
+ 286   0      10096          0      55096          0          0 CMM event proces
+ 474   0      10096          0      55096          0          0 IPC ISSU Version
+ 382   0       9712        464      54384          0          0 dcm_cli_provider
+ 495   0       9000        528      53472          0          0 EEM Helper Threa
+ 219   0       8728          0      53472          0          0 SSH Event handle
+ 269   0       7504        448      52056          0          0 REP BPA/EPA Proc
+ 367   0       7504        448      52056          0          0 VTP Trap Process
+  86   0       6600          0      51600          0          0 IF-MGR control p
+ 289   0      63744        448      51168          0          0 L2TRACE SERVER
+ 404   0       6752        464      51128          0          0 dcm_expression_p
+ 402   0       6288        464      50808          0          0 snmp dcm ma shim
+   9   0       6240        448      50792          0          0 Check heaps
+ 182   0       5528        448      50080          0          0 PTP protocol eng
+ 276   0      11496      50064      50040          0          0 MLDSN L2MCM
+ 406   0      50072        144      48864          0          0 Call Home DS
+ 407   0       3720        328      48720          0          0 Call Home DSfile
+ 123   0       3384          0      48384          0          0 RF Master Status
+ 186   0       3344          0      48344          0          0 FHRP Main thread
+ 189   0       3344          0      48344          0          0 VRRP Main thread
+ 188   0       3344          0      48344          0          0 TRACK Client thr
+ 198   0      26576          0      48328          0          0 Call Home Timer
+ 126   0       2816          0      47816          0          0 Per-minute Jobs
+ 259   0      11544      53352      47608          0          0 IGMPSN L2MCM
+  27   0       2192          0      47192          0          0 IPC Seat Manager
+ 378   0       1824          0      46824          0          0 IKEv2 Cluster Lo
+ 338   0      36576      34960      46616          0          0 NIST rng proc
+ 344   0     268672     267472      46056          0          0 crypto engine pr
+ 226   0     162736        448      46008          0          0 Spanning Tree
+  70   0      70144        448      45568          0          0 TTY Background
+ 233   0        408          0      45528          0          0 XDR background p
+ 239   0        456          0      45456          0          0 CEF RP Backgroun
+ 366   0        896        448      45448          0          0 PIM HA
+ 179   0        408          0      45408          0          0 Port-Security
+ 296   0        408          0      45408          0          0 XDR FOF process
+ 379   0        408          0      45408          0          0 Online Diag EEM
+ 147   0        408          0      45408          0          0 Src Fltr backgro
+ 310   0        152          0      45152          0          0 Service Routing
+ 480   0          0          0      45136          0          0 IPC ISSU Version
+ 211   0        576        576      45136          0          0 PIM register asy
+  65   0          0          0      45128          0          0 Token Daemon
+  58   0          0          0      45128          0          0 SERIAL A'detect
+  42   0        448        448      45120          0          0 DDR Timers
+   3   0      69752      29728      45112          0          0 SpanTree Helper
+ 148   0          0          0      45112          0          0 FPD Management P
+ 224   0          0          0      45000          0          0 SSS Feature Mana
+ 193   0        448        448      45000          0          0 AAA Server
+ 228   0          0          0      45000          0          0 VRRS
+ 229   0          0          0      45000          0          0 FRR Background P
+  12   0        448        448      45000          0          0 Timers
+ 125   0        448        448      45000          0          0 Compute load avg
+ 135   0       4456     397872      45000          0          0 PLFM-MGR IPC pro
+ 144   0          0          0      45000          0          0 Remote Console P
+ 234   0          0          0      45000          0          0 XDR mcast
+ 235   0          0          0      45000          0          0 XDR RP Ping Back
+ 124   0          0          0      45000          0          0 IPv6 Access Cont
+ 237   0          0          0      45000          0          0 IPC LC Message H
+ 238   0          0          0      45000          0          0 XDR RP Test Back
+ 128   0          0          0      45000          0          0 AggMgr Process
+  14   0          0          0      45000          0          0 IOSXE heartbeat
+ 121   0          0          0      45000          0          0 IOSXE-RP SPA TSM
+ 120   0          0          0      45000          0          0 ACL deny punt se
+ 119   0          0          0      45000          0          0 ACL Log Punt Ser
+ 244   0          0     142528      45000          0          0 SpanTree Flush
+  11   0          0          0      45000          0          0 DiscardQ Backgro
+ 225   0          0          0      45000          0          0 SSS Feature Time
+ 247   0        448        448      45000          0          0 Ether EFP Proces
+ 118   0          0          0      45000          0          0 IOSXE-RP Punt IP
+ 117   0          0          0      45000          0          0 IOSXE-RP Punt Se
+ 203   0        448        448      45000          0          0 IPAM/ODAP Events
+ 115   0          0          0      45000          0          0 Network-rf Notif
+ 252   0          0          0      45000          0          0 CFM HA IPC messa
+ 146   0          0          0      45000          0          0 NGWC_MACSEC_IOSD
+ 194   0          0          0      45000          0          0 AAA ACCT Proc
+ 185   0        448        448      45000          0          0 CDP Forward Proc
+ 113   0          0          0      45000          0          0 DHCPv6 Server HA
+ 112   0          0          0      45000          0          0 DHCPv6 Relay HA
+ 129   0          0          0      45000          0          0 Transport Port A
+ 201   0        560        560      45000          0          0 AAA Dictionary R
+ 260   0          0          0      45000          0          0 IGMPSN MRD
+ 261   0          0          0      45000          0          0 IGMPSN
+ 111   0          0          0      45000          0          0 DHCPC HA
+ 110   0          0          0      45000          0          0 100ms check
+ 264   0          0          0      45000          0          0 TCP HA PROC
+ 109   0          0          0      45000          0          0 REDUNDANCY peer
+ 142   0          0          0      45000          0          0 NGWC DOT1X Proce
+ 246   0        448        448      45000          0          0 EFP Errd
+ 106   0          0          0      45000          0          0 ARP HA
+ 184   0        448        448      45000          0          0 WDB Process
+ 183   0          0          0      45000          0          0 Inline Power
+ 220   0          0          0      45000          0          0 RIB LM VALIDATE
+ 181   0          0          0      45000          0          0 802.1x switch
+ 273   0          0          0      45000          0          0 NGWC stack power
+ 192   0          0          0      45000          0          0 Spanning Tree St
+ 130   0          0          0      45000          0          0 SFF8472
+ 217   0        448        448      45000          0          0 PPP Bind
+ 277   0          0          0      45000          0          0 MRD
+ 278   0          0          0      45000          0          0 MLD_SNOOP
+ 216   0        448        448      45000          0          0 PPP SIP
+ 215   0          0          0      45000          0          0 PM EPD API
+ 281   0          0          0      45000          0          0 MLDSN-HA
+ 138   0          0          0      45000          0          0 NGWC diag proces
+ 102   0          0          0      45000          0          0 DHCP Snooping db
+ 101   0          0          0      45000          0          0 DHCP Snooping
+ 214   0          0          0      45000          0          0 AAA EPD HANDLER
+ 131   0          0          0      45000          0          0 IOSXE-RP FastPat
+ 212   0          0          0      45000          0          0 IPv6 ping proces
+ 288   0        448        448      45000          0          0 FNF_WIRELESS_PRO
+ 177   0        448        448      45000          0          0 PI MATM Aging Pr
+ 209   0          0          0      45000          0          0 ICMP event handl
+  99   0          0          0      45000          0          0 WPM HA Reconcile
+  98   0      26392      26392      45000          0          0 NGWC Learning Pr
+  97   0          0          0      45000          0          0 MATM CF Flow Con
+  96   0          0          0      45000          0          0 NGWC Configurati
+ 132   0        448        448      45000          0          0 FEC_Link_event_h
+ 297   0          0          0      45000          0          0 GLBP HA
+ 298   0          0          0      45000          0          0 HSRP HA
+  94   0        448      17328      45000          0          0 EM_SHIM_NOTIFY_T
+  93   0      17328      84840      45000          0          0 EM_SHIM_TASK
+ 176   0          0       4312      45000          0          0 NGWC led process
+ 303   0          0          0      45000          0          0 SNMP Timers
+ 304   0          0          0      45000          0          0 IP Traceroute
+  91   0          0          0      45000          0          0 RP HA Periodic
+ 306   0          0          0      45000          0          0 STP HA IPC flow
+ 307   0          0          0      45000          0          0 AAA System Acct
+  90   0          0          0      45000          0          0 cpf_process_tpQ
+   8   0          0          0      45000          0          0 VIDB BACKGD MGR
+ 258   0       1008       1008      45000          0          0 LIM Process
+ 268   0        448        448      45000          0          0 REP LSL Proc
+ 312   0          0          0      45000          0          0 DNS Service
+  89   0          0          0      45000          0          0 cpf_msg_rcvq_pro
+ 174   0        448        448      45000          0          0 REP LSL Hello Pr
+ 173   0        448        448      45000          0          0 FMANRP REP Helpe
+ 172   0        448        448      45000          0          0 REP Topology cha
+ 171   0          0          0      45000          0          0 SNMP DBAL Cache
+ 170   0          0          0      45000          0          0 SNMP DBAL Cache
+ 149   0          0          0      45000          0          0 FPD Action Proce
+ 320   0        448        448      45000          0          0 DHCPv6 LQ client
+  15   0          0          0      45000          0          0 DB Lock Manager
+  88   0          0          0      45000          0          0 cpf_msg_holdq_pr
+ 167   0          0          0      45000          0          0 WLM HA IPC flow
+  87   0          0          0      45000          0          0 IF-MGR event pro
+ 166   0        448        448      45000          0          0 WLM HA
+ 139   0          0          0      45000          0          0 NGWC L2M
+ 327   0          0          0      45000          0          0 IPSECv6 PS Proc
+ 328   0        448        448      45000          0          0 AAA Cached Serve
+ 329   0        448        448      45000          0          0 ENABLE AAA
+ 330   0          0          0      45000          0          0 EM Background Pr
+ 331   0          0          0      45000          0          0 IDMGR CORE
+ 105   0          0          0      45000          0          0 DHCPD HA
+ 333   0          0          0      45000          0          0 Key chain liveke
+ 334   0        448        448      45000          0          0 LINE AAA
+ 165   0          0          0      45000          0          0 Wireless Manager
+ 152   0      45600      45600      45000          0          0 MGMTE stats Proc
+  82   0          0          0      45000          0          0 CTS HA IPC flow
+ 133   0        448        448      45000          0          0 NG Backup Interf
+ 339   0        448        448      45000          0          0 File Copy Handle
+ 163   0       7616       7616      45000          0          0 ngwc callhome pe
+ 341   0          0          0      45000          0          0 COND_DEBUG HA IP
+  81   0        448        448      45000          0          0 CTS HA
+ 343   0        448        448      45000          0          0 REP Switch Helpe
+ 279   0          0          0      45000          0          0 IGMPQR
+  80   0          0       1296      45000          0          0 STACK MGR Proces
+   7   0          0          0      45000          0          0 RO Notify Timers
+  79   0          0          0      45000          0          0 MATM SPI client
+  78   0          0          0      45000          0          0 Ng3k envvar sync
+  77   0          0          0      45000          0          0 NGWC OIR CC Proc
+  76   0      45632       2880      45000          0          0 NGWC_OIRSHIM_TAS
+  18   0          0          0      45000          0          0 IPC Event Notifi
+  73   0          0          0      45000          0          0 BACK CHECK
+ 280   0          0          0      45000          0          0 IGMPSN-HA
+  66   0          0          0      45000          0          0 Critical Bkgnd
+ 355   0        448        896      45000          0          0 CRYPTO MAP FREE
+ 285   0          0          0      45000          0          0 CMM IPC Msg Proc
+  64   0          0          0      45000          0          0 License HA Consi
+  63   0        448        448      45000          0          0 Licensing Auto U
+ 161   0        448        448      45000          0          0 Ethchnl
+  62   0          0          0      45000          0          0 Image License br
+  61   0        336       1328      45000          0          0 License Client N
+ 362   0          0          0      45000          0          0 Crypto PAS Proc
+  17   0          0          0      45000          0          0 IPC Apps Task
+   6   0          0          0      45000          0          0 IPC ISSU Dispatc
+ 365   0          0          0      45000          0          0 IKEv2 AAA handle
+ 287   0          0        944      45000          0          0 L2MCAST Wireless
+ 154   0        640        640      45000          0          0 MATM RP Shim Pro
+ 368   0      17952      18312      45000          0          0 DiagCard1/-1
+ 369   0          0          0      45000          0          0 NCD Process
+ 141   0          0          0      45000          0          0 MMN bkgrd proces
+ 371   0      37792     115000      45000          0          0 PM Callback
+ 372   0        448        448      45000          0          0 dhcp snooping sw
+  57   0          0          0      45000          0          0 client_entity_se
+ 157   0          0          0      45000          0          0 RTTYS Process
+  56   0          0          0      45000          0          0 Net Input
+ 376   0        448        448      45000          0          0 DHCP Security He
+  53   0          0          0      45000          0          0 ARP Snoop
+ 178   0          0          0      45000          0          0 VMATM Callback
+ 100   0          0          0      45000          0          0 DHCP Snooping cl
+ 380   0          0          0      45000          0          0 SPA ENTITY Proce
+  52   0          0          0      45000          0          0 WCDB ARP Process
+ 156   0          0          0      45000          0          0 TP CUTOVER EVENT
+  51   0          0          0      45000          0          0 Dynamic ARP Insp
+ 384   0        448        448      45000          0          0 AAA SEND STOP EV
+  50   0        448        448      45000          0          0 SMART
+   5   0          0          0      45000          0          0 Retransmission o
+ 274   0          0          0      45000          0          0 Socket Timers
+  49   0        448        448      45000          0          0 GraphIt
+ 389   0          0          0      45000          0          0 Syslog Traps
+ 391   0          0          0      45000          0          0 ISSU Utility Pro
+ 392   0          0          0      45000          0          0 EPC WS PI suppor
+ 393   0          0          0      45000          0          0 EPC WS PD suppor
+ 394   0        448        448      45000          0          0 SPAN switch
+  48   0          0          0      45000          0          0 IOSXE signals IO
+ 103   0          0          0      45000          0          0 DHCP Snooping HA
+  46   0        448        448      45000          0          0 Serial Backgroun
+  16   0          0          0      45000          0          0 ifIndex Receive
+  45   0       4032       4032      45000          0          0 PrstVbl
+  44   0          0          0      45000          0          0 IFS Agent Manage
+ 326   0        448        448      45000          0          0 Crypto Support
+ 452   0          0          0      45000          0          0 IPC ISSU Version
+ 453   0          0          0      45000          0          0 IPC ISSU Version
+ 451   0          0          0      45000          0          0 IPC ISSU Version
+ 499   0          0          0      45000          0          0 SNMP LA Cache pr
+  20   0          0          0      45000          0          0 Platform appsess
+  40   0          0          0      45000          0          0 AAA_SERVER_DEADT
+  39   0          0          0      45000          0          0 CEF MIB API
+  38   0          0          0      45000          0          0 ATM ASYNC PROC
+  37   0        448        448      45000          0          0 ATM Idle Timer
+  36   0          0          0      45000          0          0 ARP Background
+  35   0          0          0      45000          0          0 ARP Input
+  34   0          0          0      45000          0          0 SENSOR-MGR event
+  33   0          0          0      45000          0          0 IPC Session Deta
+  32   0          0          0      45000          0          0 IPC Loadometer
+  31   0          0          0      45000          0          0 IPC Keep Alive M
+  30   0          0          0      45000          0          0 IPC Seat TX Cont
+  29   0          0          0      45000          0          0 IPC Seat RX Cont
+  28   0          0          0      45000          0          0 IPC Check Queue
+ 492   0          0          0      45000          0          0 IPC ISSU Version
+  26   0          0          0      45000          0          0 IPC Process leve
+  25   0          0          0      45000          0          0 IPC Deferred Por
+  24   0          0          0      45000          0          0 IPC Periodic Tim
+  23   0          0          0      45000          0          0 IPC Zone Manager
+  22   0          0          0      45000          0          0 IPC Service NonC
+  21   0          0          0      45000          0          0 IPC Dynamic Cach
+ 430   0          0          0      45000          0          0 IPC ISSU Version
+ 431   0          0          0      45000          0          0 IPC ISSU Version
+ 432   0          0          0      45000          0          0 IPC ISSU Version
+ 433   0          0          0      45000          0          0 IPC ISSU Version
+ 434   0          0          0      45000          0          0 IPC ISSU Version
+ 435   0          0          0      45000          0          0 IPC ISSU Version
+ 436   0          0          0      45000          0          0 IPC ISSU Version
+ 437   0          0          0      45000          0          0 IPC ISSU Version
+ 438   0          0          0      45000          0          0 IPC ISSU Version
+ 439   0          0          0      45000          0          0 IPC ISSU Version
+ 440   0          0          0      45000          0          0 IPC ISSU Version
+ 441   0          0          0      45000          0          0 IPC ISSU Version
+ 442   0          0          0      45000          0          0 IPC ISSU Version
+ 443   0          0          0      45000          0          0 IPC ISSU Version
+ 444   0          0          0      45000          0          0 IPC ISSU Version
+ 445   0          0          0      45000          0          0 IPC ISSU Version
+ 446   0          0          0      45000          0          0 IPC ISSU Version
+ 447   0          0          0      45000          0          0 IPC ISSU Version
+ 448   0          0          0      45000          0          0 IPC ISSU Version
+ 449   0          0          0      45000          0          0 IPC ISSU Version
+ 450   0          0          0      45000          0          0 IPC ISSU Version
+ 491   0          0          0      45000          0          0 IPC ISSU Version
+ 496   0          0          0      45000          0          0 SNMP LA Cache In
+  19   0          0          0      45000          0          0 IPC Mcast Pendin
+ 454   0          0          0      45000          0          0 IPC ISSU Version
+ 455   0          0          0      45000          0          0 IPC ISSU Version
+ 456   0          0          0      45000          0          0 IPC ISSU Version
+ 457   0          0          0      45000          0          0 IPC ISSU Version
+ 458   0          0          0      45000          0          0 IPC ISSU Version
+ 459   0          0          0      45000          0          0 IPC ISSU Version
+ 460   0          0          0      45000          0          0 IPC ISSU Version
+ 461   0          0          0      45000          0          0 IPC ISSU Version
+ 462   0          0          0      45000          0          0 IPC ISSU Version
+ 463   0          0          0      45000          0          0 IPC ISSU Version
+ 464   0          0          0      45000          0          0 IPC ISSU Version
+ 465   0          0          0      45000          0          0 IPC ISSU Version
+ 466   0          0          0      45000          0          0 IPC ISSU Version
+ 467   0          0          0      45000          0          0 IPC ISSU Version
+ 468   0          0          0      45000          0          0 IPC ISSU Version
+ 469   0          0          0      45000          0          0 IPC ISSU Version
+ 470   0          0          0      45000          0          0 IPC ISSU Version
+ 471   0          0          0      45000          0          0 IPC ISSU Version
+ 472   0          0          0      45000          0          0 IPC ISSU Version
+ 473   0          0          0      45000          0          0 IPC ISSU Version
+ 490   0          0          0      45000          0          0 IPC ISSU Version
+ 475   0          0          0      45000          0          0 IPC ISSU Version
+ 476   0          0          0      45000          0          0 IPC ISSU Version
+ 477   0          0          0      45000          0          0 IPC ISSU Version
+ 478   0          0          0      45000          0          0 IPC ISSU Version
+ 479   0          0          0      45000          0          0 IPC ISSU Version
+ 489   0          0          0      45000          0          0 IPC ISSU Version
+ 481   0          0          0      45000          0          0 IPC ISSU Version
+ 482   0          0          0      45000          0          0 IPC ISSU Version
+ 483   0          0          0      45000          0          0 IPC ISSU Version
+ 484   0          0          0      45000          0          0 IPC ISSU Version
+ 485   0          0          0      45000          0          0 IPC ISSU Version
+ 486   0          0          0      45000          0          0 IPC ISSU Version
+ 487   0          0          0      45000          0          0 IPC ISSU Version
+ 488   0          0          0      45000          0          0 IPC ISSU Version
+ 200   0        408          0      33408          0          0 ADJ NSF process
+  13   0          0          0      33000          0          0 WATCH_AFS
+ 116   0          0          0      33000          0          0 XDR RRP RF waite
+ 108   0          0          0      33000          0          0 CEF RRP RF waite
+ 282   0          0          0      33000          0          0 DAI Packet Proce
+  85   0        560        560      33000          0          0 PuntInject Keepa
+  84   0          0          0      33000          0          0 Punt FP Stats Du
+   2   0        448        448      33000          0          0 Load Meter
+  47   0          0          0      33000          0          0 RMI RM Notify Wa
+ 145   0          0          0      33000          0          0 ACL Logging Proc
+   0   0       1008    1142232       1008          0          0 *Sched*
+                                377023560 Total
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_expected.py
new file mode 100644
index 0000000000..e5e41e2ba3
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_expected.py
@@ -0,0 +1,21 @@
+expected_output = {
+   "prp_channel":{
+      "PR1":{
+         "layer_type":"L2",
+         "ports":"2",
+         "maxports":"2",
+         "port_state":"Inuse",
+         "protocol":"Enabled",
+         "Gi1/1":{
+            "slot_port":"1/1",
+            "port_state":"Inuse",
+            "protocol":"Enabled"
+         },
+         "Gi1/2":{
+            "slot_port":"1/2",
+            "port_state":"Inuse",
+            "protocol":"Enabled"
+         }
+      }
+   }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_output.txt
new file mode 100644
index 0000000000..563e2a9e51
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowPrpChannelDetails/cli/equal/golden_1_output.txt
@@ -0,0 +1,15 @@
+PRP-channel: PR1
+------------
+Layer type = L2 
+Ports: 2    Maxports = 2
+Port state = prp-channel is Inuse
+Protocol = Enabled  
+Ports in the group:
+1) Port: Gi1/1
+Logical slot/port = 1/1 Port state = Inuse 
+    Protocol = Enabled
+2) Port: Gi1/2
+Logical slot/port = 1/2 Port state = Inuse 
+    Protocol = Enabled
+
+
diff --git a/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_expected.py b/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_expected.py
new file mode 100644
index 0000000000..eea31bf156
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_expected.py
@@ -0,0 +1,15 @@
+expected_output = {
+    'client_count': 120,
+    'client_notification_tmr_msec': 30000,
+    'communications': 'Up',
+    'maintenance_mode': 'Disabled',
+    'manual_swact': 'enabled',
+    'mode': 'Duplex',
+    'my_state': '13 -ACTIVE',
+    'peer_state': '8  -STANDBY HOT',
+    'redundancy_mode_configured': 'sso',
+    'redundancy_mode_operational': 'sso',
+    'redundancy_state': 'sso',
+    'unit': 'Secondary',
+    'unit_id': 6,
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_output.txt b/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_output.txt
new file mode 100644
index 0000000000..1edd030ea4
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowRedundancyStates/cli/equal/golden_output4_output.txt
@@ -0,0 +1,16 @@
+show redundancy states
+       my state = 13 -ACTIVE
+     peer state = 8  -STANDBY HOT
+           Mode = Duplex
+           Unit = Secondary
+        Unit ID = 6
+
+Redundancy Mode (Operational) = sso
+Redundancy Mode (Configured)  = sso
+Redundancy State              = sso
+     Maintenance Mode = Disabled
+    Manual Swact = enabled
+ Communications = Up
+
+   client count = 120
+ client_notification_TMR = 30000 milliseconds
diff --git a/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..e151d683bc
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,665 @@
+expected_output = {
+    "rep_segment_no": 50,
+    "rep_segment": {
+        "BOIS168ZW2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Primary Edge No-Neighbor",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "1c6a.7a71.cb00",
+                    "port_number": "013",
+                    "port_priority": "010",
+                    "neighbor_number": "1 / [-60]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "1c6a.7a71.cb00",
+                    "port_number": "012",
+                    "port_priority": "000",
+                    "neighbor_number": "2 / [-59]"
+                }
+            }
+        },
+        "BOIU1616ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "00a6.caca.7bbf",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "3 / [-58]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "00a6.caca.7bbf",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "4 / [-57]"
+                }
+            }
+        },
+        "BOISI1228ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "643a.ea3e.473f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "5 / [-56]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "643a.ea3e.473f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "6 / [-55]"
+                }
+            }
+        },
+        "MRDN163VZG002": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "0896.adac.d93f",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "7 / [-54]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "0896.adac.d93f",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "8 / [-53]"
+                }
+            }
+        },
+        "MRDNI1028ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "cc7f.764b.08bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "9 / [-52]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "cc7f.764b.08bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "10 / [-51]"
+                }
+            }
+        },
+        "MRDN1628ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "ccb6.c899.d2bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "11 / [-50]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "ccb6.c899.d2bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "12 / [-49]"
+                }
+            }
+        },
+        "MRDNI1101ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4464.3c45.05bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "13 / [-48]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4464.3c45.05bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "14 / [-47]"
+                }
+            }
+        },
+        "MRDN161MW2002": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "70e4.229b.6d00",
+                    "port_number": "013",
+                    "port_priority": "000",
+                    "neighbor_number": "15 / [-46]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "70e4.229b.6d00",
+                    "port_number": "012",
+                    "port_priority": "000",
+                    "neighbor_number": "16 / [-45]"
+                }
+            }
+        },
+        "MRDNI1096ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "b08b.cf30.403f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "17 / [-44]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "b08b.cf30.403f",
+                    "port_number": "00A",
+                    "port_priority": "000",
+                    "neighbor_number": "18 / [-43]"
+                }
+            }
+        },
+        "KUNAI1002NG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/7": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "f4db.e6fa.103f",
+                    "port_number": "00D",
+                    "port_priority": "000",
+                    "neighbor_number": "19 / [-42]"
+                },
+                "TenGigabitEthernet0/0/6": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "f4db.e6fa.103f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "20 / [-41]"
+                }
+            }
+        },
+        "KUNAI1006ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "7061.7b9b.ba3f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "21 / [-40]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "7061.7b9b.ba3f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "22 / [-39]"
+                }
+            }
+        },
+        "KUNAI1005ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "bc4a.56fa.f0bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "23 / [-38]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "bc4a.56fa.f0bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "24 / [-37]"
+                }
+            }
+        },
+        "KUNAI1016ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4c42.1ea1.33bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "25 / [-36]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4c42.1ea1.33bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "26 / [-35]"
+                }
+            }
+        },
+        "KUNAI1017ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4cec.0fbe.c2bf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "27 / [-34]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "4cec.0fbe.c2bf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "28 / [-33]"
+                }
+            }
+        },
+        "MRDN162ZZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "c4b2.39cd.023f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "29 / [-32]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "c4b2.39cd.023f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "30 / [-31]"
+                }
+            }
+        },
+        "MRDNI1011ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "7488.bbdb.ac3f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "31 / [-30]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "7488.bbdb.ac3f",
+                    "port_number": "00A",
+                    "port_priority": "000",
+                    "neighbor_number": "32 / [-29]"
+                }
+            }
+        },
+        "MRDN163ZZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "3890.a502.373f",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "33 / [-28]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "3890.a502.373f",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "34 / [-27]"
+                }
+            }
+        },
+        "NMPBIDBAZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "f80b.cb8f.7bbf",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "35 / [-26]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Alternate",
+                    "vlan_status": "some vlans blocked",
+                    "bridge_mac": "f80b.cb8f.7bbf",
+                    "port_number": "021",
+                    "port_priority": "040",
+                    "neighbor_number": "36 / [-25]"
+                }
+            }
+        },
+        "NMPA162PZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a03d.6fe9.77bf",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "37 / [-24]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a03d.6fe9.77bf",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "38 / [-23]"
+                }
+            }
+        },
+        "NMPAI1020ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "cc7f.762e.0abf",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "39 / [-22]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "cc7f.762e.0abf",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "40 / [-21]"
+                }
+            }
+        },
+        "NMPAI1068ZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "5856.9fd2.783f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "41 / [-20]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "5856.9fd2.783f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "42 / [-19]"
+                }
+            }
+        },
+        "NMPA160AW2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "24e9.b3e6.ab00",
+                    "port_number": "01A",
+                    "port_priority": "000",
+                    "neighbor_number": "43 / [-18]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "24e9.b3e6.ab00",
+                    "port_number": "019",
+                    "port_priority": "000",
+                    "neighbor_number": "44 / [-17]"
+                }
+            }
+        },
+        "NMPAIDHHZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "549f.c689.063f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "45 / [-16]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "549f.c689.063f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "46 / [-15]"
+                }
+            }
+        },
+        "NMPA1636W2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "24e9.b3e6.fc00",
+                    "port_number": "01A",
+                    "port_priority": "000",
+                    "neighbor_number": "47 / [-14]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "24e9.b3e6.fc00",
+                    "port_number": "019",
+                    "port_priority": "000",
+                    "neighbor_number": "48 / [-13]"
+                }
+            }
+        },
+        "MRDN163CW2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a46c.2a8d.6f00",
+                    "port_number": "013",
+                    "port_priority": "000",
+                    "neighbor_number": "49 / [-12]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a46c.2a8d.6f00",
+                    "port_number": "012",
+                    "port_priority": "000",
+                    "neighbor_number": "50 / [-11]"
+                }
+            }
+        },
+        "MRDN163QZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "2cd0.2dba.263f",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "51 / [-10]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "2cd0.2dba.263f",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "52 / [-9]"
+                }
+            }
+        },
+        "MRDN163KW2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "74a2.e603.e400",
+                    "port_number": "013",
+                    "port_priority": "000",
+                    "neighbor_number": "53 / [-8]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "74a2.e603.e400",
+                    "port_number": "012",
+                    "port_priority": "000",
+                    "neighbor_number": "54 / [-7]"
+                }
+            }
+        },
+        "GRCYIDAYZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/5": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "84eb.ef59.743f",
+                    "port_number": "00C",
+                    "port_priority": "000",
+                    "neighbor_number": "55 / [-6]"
+                },
+                "TenGigabitEthernet0/0/4": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "84eb.ef59.743f",
+                    "port_number": "00B",
+                    "port_priority": "000",
+                    "neighbor_number": "56 / [-5]"
+                }
+            }
+        },
+        "BOIU161PZG001": {
+            "interfaces": {
+                "TenGigabitEthernet0/0/27": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "f80b.cb8c.edbf",
+                    "port_number": "022",
+                    "port_priority": "000",
+                    "neighbor_number": "57 / [-4]"
+                },
+                "TenGigabitEthernet0/0/26": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "f80b.cb8c.edbf",
+                    "port_number": "021",
+                    "port_priority": "000",
+                    "neighbor_number": "58 / [-3]"
+                }
+            }
+        },
+        "BOIS1646W2001": {
+            "interfaces": {
+                "TenGigabitEthernet0/2": {
+                    "edge": "Intermediate",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a89d.214f.4f00",
+                    "port_number": "013",
+                    "port_priority": "000",
+                    "neighbor_number": "59 / [-2]"
+                },
+                "TenGigabitEthernet0/1": {
+                    "edge": "Secondary Edge No-Neighbor",
+                    "role": "Open",
+                    "vlan_status": "all vlans forwarding",
+                    "bridge_mac": "a89d.214f.4f00",
+                    "port_number": "012",
+                    "port_priority": "010",
+                    "neighbor_number": "60 / [-1]"
+                }
+            }
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..7029177c79
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowRepTopologyDetail/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,361 @@
+REP Segment 50
+BOIS168ZW2001, Te0/2 (Primary Edge No-Neighbor)
+  Open Port, all vlans forwarding
+  Bridge MAC: 1c6a.7a71.cb00
+  Port Number: 013
+  Port Priority: 010
+  Neighbor Number: 1 / [-60]
+BOIS168ZW2001, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 1c6a.7a71.cb00
+  Port Number: 012
+  Port Priority: 000
+  Neighbor Number: 2 / [-59]
+BOIU1616ZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 00a6.caca.7bbf
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 3 / [-58]
+BOIU1616ZG001, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 00a6.caca.7bbf
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 4 / [-57]
+BOISI1228ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 643a.ea3e.473f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 5 / [-56]
+BOISI1228ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 643a.ea3e.473f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 6 / [-55]
+MRDN163VZG002, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 0896.adac.d93f
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 7 / [-54]
+MRDN163VZG002, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 0896.adac.d93f
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 8 / [-53]
+MRDNI1028ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: cc7f.764b.08bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 9 / [-52]
+MRDNI1028ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: cc7f.764b.08bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 10 / [-51]
+MRDN1628ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: ccb6.c899.d2bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 11 / [-50]
+MRDN1628ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: ccb6.c899.d2bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 12 / [-49]
+MRDNI1101ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4464.3c45.05bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 13 / [-48]
+MRDNI1101ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4464.3c45.05bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 14 / [-47]
+MRDN161MW2002, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 70e4.229b.6d00
+  Port Number: 013
+  Port Priority: 000
+  Neighbor Number: 15 / [-46]
+MRDN161MW2002, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 70e4.229b.6d00
+  Port Number: 012
+  Port Priority: 000
+  Neighbor Number: 16 / [-45]
+MRDNI1096ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: b08b.cf30.403f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 17 / [-44]
+MRDNI1096ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: b08b.cf30.403f
+  Port Number: 00A
+  Port Priority: 000
+  Neighbor Number: 18 / [-43]
+KUNAI1002NG001, Te0/0/7 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: f4db.e6fa.103f
+  Port Number: 00D
+  Port Priority: 000
+  Neighbor Number: 19 / [-42]
+KUNAI1002NG001, Te0/0/6 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: f4db.e6fa.103f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 20 / [-41]
+KUNAI1006ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 7061.7b9b.ba3f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 21 / [-40]
+KUNAI1006ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 7061.7b9b.ba3f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 22 / [-39]
+KUNAI1005ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: bc4a.56fa.f0bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 23 / [-38]
+KUNAI1005ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: bc4a.56fa.f0bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 24 / [-37]
+KUNAI1016ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4c42.1ea1.33bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 25 / [-36]
+KUNAI1016ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4c42.1ea1.33bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 26 / [-35]
+KUNAI1017ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4cec.0fbe.c2bf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 27 / [-34]
+KUNAI1017ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 4cec.0fbe.c2bf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 28 / [-33]
+MRDN162ZZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: c4b2.39cd.023f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 29 / [-32]
+MRDN162ZZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: c4b2.39cd.023f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 30 / [-31]
+MRDNI1011ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 7488.bbdb.ac3f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 31 / [-30]
+MRDNI1011ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 7488.bbdb.ac3f
+  Port Number: 00A
+  Port Priority: 000
+  Neighbor Number: 32 / [-29]
+MRDN163ZZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 3890.a502.373f
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 33 / [-28]
+MRDN163ZZG001, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 3890.a502.373f
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 34 / [-27]
+NMPBIDBAZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: f80b.cb8f.7bbf
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 35 / [-26]
+NMPBIDBAZG001, Te0/0/26 (Intermediate)
+  Alternate Port, some vlans blocked
+  Bridge MAC: f80b.cb8f.7bbf
+  Port Number: 021
+  Port Priority: 040
+  Neighbor Number: 36 / [-25]
+NMPA162PZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: a03d.6fe9.77bf
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 37 / [-24]
+NMPA162PZG001, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: a03d.6fe9.77bf
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 38 / [-23]
+NMPAI1020ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: cc7f.762e.0abf
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 39 / [-22]
+NMPAI1020ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: cc7f.762e.0abf
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 40 / [-21]
+NMPAI1068ZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 5856.9fd2.783f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 41 / [-20]
+NMPAI1068ZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 5856.9fd2.783f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 42 / [-19]
+NMPA160AW2001, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 24e9.b3e6.ab00
+  Port Number: 01A
+  Port Priority: 000
+  Neighbor Number: 43 / [-18]
+NMPA160AW2001, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 24e9.b3e6.ab00
+  Port Number: 019
+  Port Priority: 000
+  Neighbor Number: 44 / [-17]
+NMPAIDHHZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 549f.c689.063f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 45 / [-16]
+NMPAIDHHZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 549f.c689.063f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 46 / [-15]
+NMPA1636W2001, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 24e9.b3e6.fc00
+  Port Number: 01A
+  Port Priority: 000
+  Neighbor Number: 47 / [-14]
+NMPA1636W2001, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 24e9.b3e6.fc00
+  Port Number: 019
+  Port Priority: 000
+  Neighbor Number: 48 / [-13]
+MRDN163CW2001, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: a46c.2a8d.6f00
+  Port Number: 013
+  Port Priority: 000
+  Neighbor Number: 49 / [-12]
+MRDN163CW2001, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: a46c.2a8d.6f00
+  Port Number: 012
+  Port Priority: 000
+  Neighbor Number: 50 / [-11]
+MRDN163QZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 2cd0.2dba.263f
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 51 / [-10]
+MRDN163QZG001, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 2cd0.2dba.263f
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 52 / [-9]
+MRDN163KW2001, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 74a2.e603.e400
+  Port Number: 013
+  Port Priority: 000
+  Neighbor Number: 53 / [-8]
+MRDN163KW2001, Te0/1 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 74a2.e603.e400
+  Port Number: 012
+  Port Priority: 000
+  Neighbor Number: 54 / [-7]
+GRCYIDAYZG001, Te0/0/5 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 84eb.ef59.743f
+  Port Number: 00C
+  Port Priority: 000
+  Neighbor Number: 55 / [-6]
+GRCYIDAYZG001, Te0/0/4 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: 84eb.ef59.743f
+  Port Number: 00B
+  Port Priority: 000
+  Neighbor Number: 56 / [-5]
+BOIU161PZG001, Te0/0/27 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: f80b.cb8c.edbf
+  Port Number: 022
+  Port Priority: 000
+  Neighbor Number: 57 / [-4]
+BOIU161PZG001, Te0/0/26 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: f80b.cb8c.edbf
+  Port Number: 021
+  Port Priority: 000
+  Neighbor Number: 58 / [-3]
+BOIS1646W2001, Te0/2 (Intermediate)
+  Open Port, all vlans forwarding
+  Bridge MAC: a89d.214f.4f00
+  Port Number: 013
+  Port Priority: 000
+  Neighbor Number: 59 / [-2]
+BOIS1646W2001, Te0/1 (Secondary Edge No-Neighbor)
+  Open Port, all vlans forwarding
+  Bridge MAC: a89d.214f.4f00
+  Port Number: 012
+  Port Priority: 010
+  Neighbor Number: 60 / [-1]
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..9ae8a01c0b
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,38 @@
+expected_output = {
+    "oper_state": "UP",
+    "admin_state": "UP",
+    "personality": "vedge",
+    "omp_uptime": "8:13:09:13",
+    "routes_received": 3500,
+    "routes_installed": 574,
+    "routes_sent": 3264,
+    "tlocs_received": 276,
+    "tlocs_installed": 70,
+    "tlocs_sent": 24,
+    "services_received": 66,
+    "services_installed": 0,
+    "services_sent": 264,
+    "mcast_routes_received": 54,
+    "mcast_routes_sent": 8,
+    "l2_services_received": 42,
+    "l2_services_installed": 0,
+    "l2_services_sent": 168,
+    "l2_routes_received": 162,
+    "l2_routes_installed": 28,
+    "l2_routes_sent": 168,
+    "hello_sent": 29566,
+    "hello_received": 29540,
+    "handshake_sent": 4,
+    "handshake_received": 4,
+    "alert_sent": 0,
+    "alert_received": 0,
+    "inform_sent": 63,
+    "inform_received": 64,
+    "update_sent": 208712,
+    "update_received": 222534,
+    "policy_sent": 0,
+    "policy_received": 8,
+    "total_packets_sent": 238801,
+    "vsmart_peers": 4,
+    "transport_gateway": "enabled",
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..d2fbe3f4c6
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowSdwanOmpSummary/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,41 @@
+
+    #show sdwan omp summary 
+oper-state             UP
+admin-state            UP
+personality            vedge
+device-role            Edge-Router
+omp-uptime             8:13:09:13
+routes-received        3500
+routes-installed       574
+routes-sent            3264
+tlocs-received         276
+tlocs-installed        70
+tlocs-sent             24
+services-received      66
+services-installed     0
+services-sent          264
+mcast-routes-received  54
+mcast-routes-installed 10
+mcast-routes-sent      8
+l2-services-received   42
+l2-services-installed  0
+l2-services-sent       168
+l2-routes-received     162
+l2-routes-installed    28
+l2-routes-sent         168
+hello-sent             29566
+hello-received         29540
+handshake-sent         4
+handshake-received     4
+alert-sent             0
+alert-received         0
+inform-sent            63
+inform-received        64
+update-sent            208712
+update-received        222534
+policy-sent            0
+policy-received        8
+total-packets-sent     238801
+total-packets-received 252154
+vsmart-peers           4
+transport-gateway      enabled
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..c528f41938
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_expected.py
@@ -0,0 +1,21 @@
+expected_output = {
+    'backbonefast': False,
+    'etherchannel_misconfig_guard': True,
+    'extended_system_id': True,
+    'loopguard': False,
+    'mode': 'rapid-pvst',
+    'portfast': False,
+    'portfast_edge_bpdu_filter': False,
+    'portfast_edge_bpdu_guard': False,
+    'root_bridge': 'none',
+    'spannig_tree_name': {
+        '300_vlans': {
+            'blocking': 300,
+            'forwarding': 600,
+            'learning': 0,
+            'listening': 0,
+            'stp_active': 900,
+        },
+    },
+    'uplinkfast': False,
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..e3a42af812
--- /dev/null
+++ b/src/genie/libs/parser/iosxe/tests/ShowSpanningTreeSummaryTotals/cli/equal/golden_output1_output.txt
@@ -0,0 +1,18 @@
+Switch is in rapid-pvst mode
+Root bridge for: none
+Extended system ID                      is enabled
+Portfast Default                        is disabled
+Portfast Edge BPDU Guard Default        is disabled
+Portfast Edge BPDU Filter Default       is disabled
+Loopguard Default                       is disabled
+BPDU sender conflict                    is enabled
+PVST Simulation Default                 is enabled but inactive in rapid-pvst mode
+Bridge Assurance                        is disabled
+EtherChannel misconfig guard            is enabled
+UplinkFast                              is disabled
+BackboneFast                            is disabled
+Configured Pathcost method used is long
+
+Name                   Blocking Listening Learning Forwarding STP Active
+---------------------- -------- --------- -------- ---------- ----------
+300 vlans                  300         0        0        600        900
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_expected.py
index dcfa92e1db..56e7f28950 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_expected.py
+++ b/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_expected.py
@@ -12,7 +12,8 @@
                 "power_stack_detail":{
                     "stack_mode":"Power sharing",
                     "stack_topology":"Standalone",
-                    "stack_ecomode":"Enable",
+                    "Stack_total_input_power": 4400,
+                    "power_supply_auto_off":"Enable",
                     "switch":{
                         3:{
                             "power_budget":955,
@@ -24,7 +25,7 @@
                             "port_2_status":"Shut",
                             "neighbor_on_port_1":"0000.0000.0000",
                             "neighbor_on_port_2":"0000.0000.0000",
-                            "ecomode":"FEP B auto offlined",
+                            "auto_off":"FEP B auto offlined",
                             "capacity":"350"
                         }
                     }
@@ -42,7 +43,8 @@
                 "power_stack_detail":{
                     "stack_mode":"Power sharing",
                     "stack_topology":"Standalone",
-                    "stack_ecomode":"Enable",
+                    "Stack_total_input_power": 4400,
+                    "power_supply_auto_off":"Enable",
                     "switch":{
                         1:{
                             "power_budget":1100,
@@ -54,7 +56,7 @@
                             "port_2_status":"Shut",
                             "neighbor_on_port_1":"0000.0000.0000",
                             "neighbor_on_port_2":"0000.0000.0000",
-                            "ecomode":"FEP B auto offlined",
+                            "auto_off":"FEP B auto offlined",
                             "capacity":"1100"
                         }
                     }
@@ -72,7 +74,8 @@
                 "power_stack_detail":{
                     "stack_mode":"Power sharing",
                     "stack_topology":"Standalone",
-                    "stack_ecomode":"Enable",
+                    "Stack_total_input_power": 4400,
+                    "power_supply_auto_off":"Enable",
                     "switch":{
                         2:{
                             "power_budget":1100,
@@ -84,7 +87,7 @@
                             "port_2_status":"Shut",
                             "neighbor_on_port_1":"0000.0000.0000",
                             "neighbor_on_port_2":"0000.0000.0000",
-                            "ecomode":"FEP B auto offlined",
+                            "auto_off":"FEP B auto offlined",
                             "capacity":"1100"
                         }
                     }
diff --git a/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_output.txt
index bb60ccc812..434b851c3f 100644
--- a/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_output.txt
+++ b/src/genie/libs/parser/iosxe/tests/ShowStackPowerDetail/cli/equal/golden_output1_output.txt
@@ -8,7 +8,8 @@ Power Stack                      Stack   Stack    Total   Rsvd    Alloc   Sw_Ava
 Power stack name: Powerstack-Ring-1
     Stack mode: Power sharing
     Stack topology: Standalone
-    Stack Ecomode: Enable
+    Stack total input power: 4400
+    Power Supply auto-off: Enable
     Switch 3:
         Power budget: 955
         Power allocated: 235
@@ -19,12 +20,13 @@ Power stack name: Powerstack-Ring-1
         Port 2 status: Shut
         Neighbor on port 1: 0000.0000.0000
         Neighbor on port 2: 0000.0000.0000
-        Ecomode: FEP B auto offlined, capacity: 350 
+        Auto off: FEP B auto offlined, capacity: 350 
 
 Power stack name: Powerstack-Ring-1-1
     Stack mode: Power sharing
     Stack topology: Standalone
-    Stack Ecomode: Enable
+    Stack total input power: 4400
+    Power Supply auto-off: Enable
     Switch 1:
         Power budget: 1100
         Power allocated: 575
@@ -35,12 +37,13 @@ Power stack name: Powerstack-Ring-1-1
         Port 2 status: Shut
         Neighbor on port 1: 0000.0000.0000
         Neighbor on port 2: 0000.0000.0000
-        Ecomode: FEP B auto offlined, capacity: 1100 
+        Auto off: FEP B auto offlined, capacity: 1100 
 
 Power stack name: Powerstack-Ring-1-2
     Stack mode: Power sharing
     Stack topology: Standalone
-    Stack Ecomode: Enable
+    Stack total input power: 4400
+    Power Supply auto-off: Enable
     Switch 2:
         Power budget: 1100
         Power allocated: 365
@@ -51,4 +54,4 @@ Power stack name: Powerstack-Ring-1-2
         Port 2 status: Shut
         Neighbor on port 1: 0000.0000.0000
         Neighbor on port 2: 0000.0000.0000
-        Ecomode: FEP B auto offlined, capacity: 1100 
+        Auto off: FEP B auto offlined, capacity: 1100 
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/show_interface.py b/src/genie/libs/parser/iosxr/show_interface.py
index 347de2a8b2..253b3ab64a 100644
--- a/src/genie/libs/parser/iosxr/show_interface.py
+++ b/src/genie/libs/parser/iosxr/show_interface.py
@@ -2143,7 +2143,7 @@ def cli(self, interface='', output=None):
                              ' +(?P<rewrite_num_of_tags_push>\d+)$')
             m = p1.match(line)
             if m:
-                interface = Common.convert_intf_name(m.groupdict()['interface'])
+                interface = Common.convert_intf_name(m.groupdict()['interface'], os="iosxr")
                 status = m.groupdict()['status']
                 outer_vlan = m.groupdict()['outer_vlan']
                 mtu = m.groupdict()['mtu']
diff --git a/src/genie/libs/parser/iosxr/show_lag.py b/src/genie/libs/parser/iosxr/show_lag.py
index ca057f1111..96aeed7484 100755
--- a/src/genie/libs/parser/iosxr/show_lag.py
+++ b/src/genie/libs/parser/iosxr/show_lag.py
@@ -1,10 +1,10 @@
 """show_lag.py
    supported commands:
      *  show lacp system-id
-     *  show bundle 
+     *  show bundle
      *  show bundle <interface>
      *  show bundle reasons
-     *  show bundle <interface> reasons 
+     *  show bundle <interface> reasons
      *  show lacp
      *  show lacp <interface>
 """
@@ -13,7 +13,7 @@
 
 # Metaparser
 from genie.metaparser import MetaParser
-from genie.metaparser.util.schemaengine import Schema, Any, Optional
+from genie.metaparser.util.schemaengine import Any, Optional, Or
 
 # import parser utils
 from genie.libs.parser.utils.common import Common
@@ -85,7 +85,7 @@ class ShowBundleSchema(MetaParser):
                 'min_active_link': int,
                 'min_active_bw_kbps': int,
                 'max_active_link': int,
-                'wait_while_timer_ms': int,
+                'wait_while_timer_ms': Or(int, str),
                 Optional('load_balance'): {
                     Optional('load_balance'): str,
                     Optional('link_order_signaling'): str,
@@ -146,7 +146,7 @@ class ShowBundleSchema(MetaParser):
 class ShowBundle(ShowBundleSchema):
     """Parser for show bundle"""
 
-    cli_command = ['show bundle {interface}','show bundle']
+    cli_command = ['show bundle {interface}', 'show bundle']
 
     def cli(self, interface='', output=None):
         if output is None:
@@ -171,7 +171,7 @@ def cli(self, interface='', output=None):
 
         # Local links <active/standby/configured>:  2 / 0 / 2
         p3 = re.compile(r'^Local +links.*: *(?P<active>[\d]+)'
-                         ' *\/ *(?P<standby>[\d]+) *\/ *(?P<configured>[\d]+)$')
+                        r' *\/ *(?P<standby>[\d]+) *\/ *(?P<configured>[\d]+)$')
 
         # Local bandwidth <effective/available>:  2000000 (2000000) kbps
         # Local bandwidth <effective/available>:  100000 / 100000 kbps
@@ -185,7 +185,7 @@ def cli(self, interface='', output=None):
 
         # Minimum active links / bandwidth:  1 / 1 kbps
         p7 = re.compile(r'^Minimum +active +links.*: *(?P<min_active_link>[\d]+)'
-                         ' *\/ *(?P<min_active_bw_kbps>[\d]+).*$')
+                        r' *\/ *(?P<min_active_bw_kbps>[\d]+).*$')
 
         # Maximum active links:  8
         # Maximum active links:  32 (from partner)
@@ -193,7 +193,8 @@ def cli(self, interface='', output=None):
 
         # Wait while timer:  2000 ms
         # Wait-while timer:  2000 ms
-        p9 = re.compile(r'^Wait( +|-)while +timer: *(?P<wait_while_timer_ms>[\d]+).*$')
+        # Wait while timer:                          Off
+        p9 = re.compile(r'^Wait( +|-)while +timer: *(?P<wait_while_timer_ms>(\d|\w)+).*$')
 
         # Load balancing:
         # Load-balancing:  Default
@@ -234,7 +235,7 @@ def cli(self, interface='', output=None):
 
         # Foreign links <active/configured>:  1 / 1
         p12_3 = re.compile(r'^Foreign +links.*: *(?P<foreign_links_active>[\d]+)'
-                            ' *\/ *(?P<foreign_links_configured>[\d]+)$')
+                           r' *\/ *(?P<foreign_links_configured>[\d]+)$')
 
         # Switchover type:  Revertive
         p12_4 = re.compile(r'^Switchover +type: *(?P<switchover_type>[\w\s\-]+)$')
@@ -273,7 +274,7 @@ def cli(self, interface='', output=None):
         # Port                  Device           State        Port ID         B/W, kbps
         # Gi0/0/0/0             Local            Active       0x000a, 0x0001     1000000
         p14 = re.compile(r'^(?P<interface>[\S]+) +(?P<device>[\S]+) +(?P<state>[\w]+)'
-                          ' +(?P<port_id>[\w]+, *[\w]+) +(?P<bw_kbps>[\d]+)$')
+                         r' +(?P<port_id>[\w]+, *[\w]+) +(?P<bw_kbps>[\d]+)$')
 
         # Link is Active
         # Link is Standby due to maximum-active links configuration
@@ -361,10 +362,14 @@ def cli(self, interface='', output=None):
                 continue
 
             # Wait while timer:  2000 ms
+            # Wait while timer:                          Off
             m = p9.match(line)
             if m:
                 group = m.groupdict()
-                bundle_dict.update({'wait_while_timer_ms': int(group['wait_while_timer_ms'])})
+                try:
+                    bundle_dict.update({'wait_while_timer_ms': int(group['wait_while_timer_ms'])})
+                except ValueError:
+                    bundle_dict.update({'wait_while_timer_ms': group['wait_while_timer_ms']})
                 continue
 
             # Load balancing:
diff --git a/src/genie/libs/parser/iosxr/show_rpl.py b/src/genie/libs/parser/iosxr/show_rpl.py
index 991a704ff9..b7fa860301 100755
--- a/src/genie/libs/parser/iosxr/show_rpl.py
+++ b/src/genie/libs/parser/iosxr/show_rpl.py
@@ -514,9 +514,10 @@ def cli(self, output=None):
 
                     if 'as-path in' in m.groupdict()[cond]:
                         v = re.match('as-path in (?P<match_as_path_list>[0-9a-zA-Z-]+)', m.groupdict()[cond])
-                        match_as_path_list = v.groupdict()['match_as_path_list']
-                        rpl_route_policy_dict[name]['statements'][statements]['conditions'] \
-                            ['match_as_path_list'] = match_as_path_list
+                        if v:
+                            match_as_path_list = v.groupdict()['match_as_path_list']
+                            rpl_route_policy_dict[name]['statements'][statements]['conditions'] \
+                                ['match_as_path_list'] = match_as_path_list
 
                     if 'as-path length' in m.groupdict()[cond]:
                         v = re.match('as-path length (?P<match_as_path_length_oper>[\w\W]+)', m.groupdict()[cond])
diff --git a/src/genie/libs/parser/iosxr/show_xconnect.py b/src/genie/libs/parser/iosxr/show_xconnect.py
index 7cdea40014..6c7098d4ff 100644
--- a/src/genie/libs/parser/iosxr/show_xconnect.py
+++ b/src/genie/libs/parser/iosxr/show_xconnect.py
@@ -1230,7 +1230,7 @@ def cli(self, output=None):
 
         # BL-PE-BG   G1-1-1-23-311
         p1_2 = re.compile(r'^(?P<group>\S+) +(?P<name>\S+)$')
-        
+
         # LU = Local Up, RU = Remote Up, CO = Connected
         p1_3 = re.compile(r'^LU = Local Up, RU = Remote Up, CO = Connected$')
 
@@ -1242,52 +1242,53 @@ def cli(self, output=None):
                         r'+(?P<segment_2>[\S ]+) '
                         r'+(?P<status_seg2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
 
-        #                        UP   Gi0/2/0/1.2            UP       10.154.26.26     100    UP  
+        #                        UP   Gi0/2/0/1.2            UP       10.154.26.26     100    UP
+        #                       UR   Te0/1/0/11.100         UR       EVPN 100,100,None      DN(PP)
         p3 = re.compile(r'^(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) '
                         r'+(?P<segment_1>.*?) ' 
                         r'+(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) '
                         r'+(?P<segment_2>[\S ]+) '
-                        r'+(?P<status_seg2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
+                        r'+(?P<status_seg2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)(\(PP\))?)$')
 
-        #                        UP   Gi0/2/0/1.2            UP       10.154.26.26     100  
+        #                        UP   Gi0/2/0/1.2            UP       10.154.26.26     100
         p3_1 = re.compile(r'^(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) '
-                        r'+(?P<segment_1>.*?) ' 
-                        r'+(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) '
-                        r'+(?P<segment_2>[\S ]+)$')
-        
+                          r'+(?P<segment_1>\S*) ' 
+                          r'+(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) '
+                          r'+(?P<segment_2>[\S ]+)$')
+
         # T-0-5-0-0  UR   Te0/5/0/0              UR       10.154.219.75    4293089094
         p3_2 = re.compile(r'^(?P<name>\S+) +(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +'
-                r'(?P<segment_1>.*?) +(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +'
-                r'(?P<segment_2>[\S ]+)$')
-        
+                          r'(?P<segment_1>.*?) +(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +'
+                          r'(?P<segment_2>[\S ]+)$')
+
         # CRS-CRS    T-0-5-0-8  UP   Te0/5/0/8              UP       10.19.196.51   9651100
         p3_3 = re.compile(r'^(?P<group>\S+) +(?P<name>\S+) +'
-                r'(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>.*?) +'
-                r'(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_2>[\S ]+)$')
+                          r'(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>.*?) +'
+                          r'(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_2>[\S ]+)$')
 
         # vpws       vpws       UR   Te0/2/1/0              UR       EVPN 302,302,0.0.0.0   DN
         p3_4 = re.compile(r'^(?P<group>\S+) +(?P<name>\S+) +'
-                r'(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>.*?) +'
-                r'(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_2>[\S ]+)'
-                r' +(?P<status_segment2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
+                          r'(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>.*?) +'
+                          r'(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_2>[\S ]+)'
+                          r' +(?P<status_segment2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
 
-        #                                                             UP  
+        #                                                             UP
         p4 = re.compile(r'^(?P<status_segment2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
 
         # UP       10.19.196.10   1152   DN
         p5 = re.compile(r'^(?P<status_seg1>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))'
-                r' +(?P<segment_2>[\S ]+) +(?P<status_seg2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
+                        r' +(?P<segment_2>[\S ]+) +(?P<status_seg2>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO))$')
 
         # UR   10.154.219.75    2015030201
-        p6 = re.compile(r'^(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>[\S ]+)$')
+        p6 = re.compile(r'^(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +(?P<segment_1>[\s\d\.]+)$')
 
         # T-0-4-0-2  UR   10.154.219.98    4293089094
         p7 = re.compile(r'^(?P<name>\S+) +(?P<status_group>(UP|DN|AD|UR|SB|SR|\(PP\)|LU|RU|CO)) +'
-                r'(?P<segment_1>[\S ]+)$')
+                        r'(?P<segment_1>[\S ]+)$')
 
         for line in out.splitlines():
             line = line.strip()
-            
+
             if '--------' in line:
                 continue
 
@@ -1311,11 +1312,11 @@ def cli(self, output=None):
                         .setdefault(str(group['group']), {})
                     flag_group = True
                 continue
-            
+
             m = p1_1.match(line)
             if m:
                 continue
-            
+
             # BL-PE-BG   G1-1-1-23-311
             m = p1_2.match(line)
             if m:
@@ -1325,7 +1326,7 @@ def cli(self, output=None):
                 name_dict = group_dict.setdefault('name', {}) \
                         .setdefault(group['name'], {})
                 continue
-            
+
             m = p1_3.match(line)
             if m:
                 continue
@@ -1336,7 +1337,7 @@ def cli(self, output=None):
                 name_dict = group_dict.setdefault('name', {}) \
                     .setdefault(str(group['name']), {})
                 flag_group = True
-            
+
             m3 = p3.match(line)
             if m3:
                 group = m3.groupdict()
@@ -1360,7 +1361,7 @@ def cli(self, output=None):
                 segment1_dict['status'] = str(group['status_seg1'])
                 segment2_dict = segment1_dict.setdefault('segment2', {}) \
                     .setdefault(str(group['segment_2'].strip()), {})
-            
+
             # T-0-5-0-0  UR   Te0/5/0/0              UR       10.154.219.75    4293089094
             m = p3_2.match(line)
             if m:
@@ -1417,7 +1418,7 @@ def cli(self, output=None):
                     .setdefault(str(group['segment_2'].strip()), {})
                 segment2_dict['status'] = str(group['status_seg2'])
                 continue
-            
+
             # UR   10.154.219.75    2015030201
             m = p6.match(line)
             if m:
@@ -1426,7 +1427,7 @@ def cli(self, output=None):
                 segment1_dict = name_dict.setdefault('segment1',{}) \
                     .setdefault(Common.convert_intf_name(group['segment_1'].strip()), {})
                 continue
-            
+
             # T-0-4-0-2  UR   10.154.219.98    4293089094
             m = p7.match(line)
             if m:
@@ -1437,6 +1438,7 @@ def cli(self, output=None):
                 segment1_dict = name_dict.setdefault('segment1',{}) \
                     .setdefault(Common.convert_intf_name(group['segment_1'].strip()), {})
                 continue
+
         return ret_dict
 
 """Schema for 'show l2vpn xconnect summary'"""
diff --git a/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_arguments.json b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_arguments.json
new file mode 100644
index 0000000000..a859a66c32
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_arguments.json
@@ -0,0 +1,3 @@
+{
+    "interface": "bundle-ether 98"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_expected.py b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_expected.py
new file mode 100644
index 0000000000..17238cc6ae
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_expected.py
@@ -0,0 +1,133 @@
+expected_output = {
+    "interfaces": {
+        "Bundle-Ether98": {
+            "name": "Bundle-Ether98",
+            "bundle_id": 98,
+            "oper_status": "up",
+            "local_links": {
+                "active": 5,
+                "standby": 0,
+                "configured": 5
+            },
+            "local_bandwidth_kbps": {
+                "effective": 50000000,
+                "available": 50000000
+            },
+            "mac_address": "dada.dada.dada",
+            "mac_address_source": "Configured",
+            "inter_chassis_link": "No",
+            "min_active_link": 1,
+            "min_active_bw_kbps": 1,
+            "max_active_link": 64,
+            "wait_while_timer_ms": "Off",
+            "load_balance": {
+                "link_order_signaling": "Not configured",
+                "hash_type": "Default",
+                "locality_threshold": "None"
+            },
+            "lacp": {
+                "lacp": "Operational",
+                "flap_suppression_timer": "100 ms",
+                "cisco_extensions": "Disabled",
+                "non_revertive": "Disabled"
+            },
+            "mlacp": {
+                "mlacp": "Operational",
+                "role": "Active",
+                "foreign_links_active": 0,
+                "foreign_links_configured": 5,
+                "switchover_type": "Non-revertive",
+                "recovery_delay": "60 s",
+                "maximize_threshold": "1 link"
+            },
+            "ipv4_bfd": {
+                "ipv4_bfd": "Not configured"
+            },
+            "ipv6_bfd": {
+                "ipv6_bfd": "Not configured"
+            },
+            "port": {
+                "TenGigabitEthernet0/0/0/16": {
+                    "interface": "TenGigabitEthernet0/0/0/16",
+                    "bw_kbps": 10000000,
+                    "device": "Local",
+                    "state": "Active",
+                    "port_id": "0x00db, 0xa001",
+                    "link_state": "Link is Active"
+                },
+                "TenGigabitEthernet0/7/0/7": {
+                    "interface": "TenGigabitEthernet0/7/0/7",
+                    "bw_kbps": 10000000,
+                    "device": "Local",
+                    "state": "Active",
+                    "port_id": "0x00db, 0xa005",
+                    "link_state": "Link is Active"
+                },
+                "TenGigabitEthernet0/7/0/13": {
+                    "interface": "TenGigabitEthernet0/7/0/13",
+                    "bw_kbps": 10000000,
+                    "device": "Local",
+                    "state": "Active",
+                    "port_id": "0x00db, 0xa004",
+                    "link_state": "Link is Active"
+                },
+                "TenGigabitEthernet0/7/0/14": {
+                    "interface": "TenGigabitEthernet0/7/0/14",
+                    "bw_kbps": 10000000,
+                    "device": "Local",
+                    "state": "Active",
+                    "port_id": "0x00db, 0xa002",
+                    "link_state": "Link is Active"
+                },
+                "TenGigabitEthernet0/7/0/15": {
+                    "interface": "TenGigabitEthernet0/7/0/15",
+                    "bw_kbps": 10000000,
+                    "device": "Local",
+                    "state": "Active",
+                    "port_id": "0x00db, 0xa003",
+                    "link_state": "Link is Active"
+                },
+                "TenGigabitEthernet0/4/0/12": {
+                    "interface": "TenGigabitEthernet0/4/0/12",
+                    "bw_kbps": 10000000,
+                    "device": "193.126.0.87",
+                    "state": "Standby",
+                    "port_id": "0x00dc, 0x9009",
+                    "link_state": "Link is marked as Standby by mLACP peer"
+                },
+                "TenGigabitEthernet0/4/0/13": {
+                    "interface": "TenGigabitEthernet0/4/0/13",
+                    "bw_kbps": 10000000,
+                    "device": "193.126.0.87",
+                    "state": "Standby",
+                    "port_id": "0x00dc, 0x900a",
+                    "link_state": "Link is marked as Standby by mLACP peer"
+                },
+                "TenGigabitEthernet0/4/0/7": {
+                    "interface": "TenGigabitEthernet0/4/0/7",
+                    "bw_kbps": 10000000,
+                    "device": "193.126.0.87",
+                    "state": "Standby",
+                    "port_id": "0x00dc, 0x9006",
+                    "link_state": "Link is marked as Standby by mLACP peer"
+                },
+                "TenGigabitEthernet0/4/0/8": {
+                    "interface": "TenGigabitEthernet0/4/0/8",
+                    "bw_kbps": 10000000,
+                    "device": "193.126.0.87",
+                    "state": "Standby",
+                    "port_id": "0x00dc, 0x9007",
+                    "link_state": "Link is marked as Standby by mLACP peer"
+                },
+                "TenGigabitEthernet0/4/0/9": {
+                    "interface": "TenGigabitEthernet0/4/0/9",
+                    "bw_kbps": 10000000,
+                    "device": "193.126.0.87",
+                    "state": "Standby",
+                    "port_id": "0x00dc, 0x9008",
+                    "link_state": "Link is marked as Standby by mLACP peer"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_output.txt b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_output.txt
new file mode 100644
index 0000000000..f911fa9d03
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowBundle/cli/equal/golden_output_5_output.txt
@@ -0,0 +1,52 @@
+---------------------------------
+Thu Aug 29 16:44:53.231 WEST
+ 
+Bundle-Ether98
+  Status:                                    Up
+  Local links <active/standby/configured>:   5 / 0 / 5
+  Local bandwidth <effective/available>:     50000000 (50000000) kbps
+  MAC address (source):                      dada.dada.dada (Configured)
+  Inter-chassis link:                        No
+  Minimum active links / bandwidth:          1 / 1 kbps
+  Maximum active links:                      64
+  Wait while timer:                          Off
+  Load balancing:                            
+    Link order signaling:                    Not configured
+    Hash type:                               Default
+    Locality threshold:                      None
+  LACP:                                      Operational
+    Flap suppression timer:                  100 ms
+    Cisco extensions:                        Disabled
+    Non-revertive:                           Disabled
+  mLACP:                                     Operational
+    ICCP Group:                              98
+    Role:                                    Active
+    Foreign links <active/configured>:       0 / 5
+    Switchover type:                         Non-revertive
+    Recovery delay:                          60 s
+    Maximize threshold:                      1 link
+  IPv4 BFD:                                  Not configured
+  IPv6 BFD:                                  Not configured
+ 
+  Port                  Device           State        Port ID         B/W, kbps
+  --------------------  ---------------  -----------  --------------  ----------
+  Te0/0/0/16            Local            Active       0x00db, 0xa001    10000000
+      Link is Active
+  Te0/7/0/7             Local            Active       0x00db, 0xa005    10000000
+      Link is Active
+  Te0/7/0/13            Local            Active       0x00db, 0xa004    10000000
+      Link is Active
+  Te0/7/0/14            Local            Active       0x00db, 0xa002    10000000
+      Link is Active
+  Te0/7/0/15            Local            Active       0x00db, 0xa003    10000000
+      Link is Active
+  Te0/4/0/12            193.126.0.87     Standby      0x00dc, 0x9009    10000000
+      Link is marked as Standby by mLACP peer
+  Te0/4/0/13            193.126.0.87     Standby      0x00dc, 0x900a    10000000
+      Link is marked as Standby by mLACP peer
+  Te0/4/0/7             193.126.0.87     Standby      0x00dc, 0x9006    10000000
+      Link is marked as Standby by mLACP peer
+  Te0/4/0/8             193.126.0.87     Standby      0x00dc, 0x9007    10000000
+      Link is marked as Standby by mLACP peer
+  Te0/4/0/9             193.126.0.87     Standby      0x00dc, 0x9008    10000000
+      Link is marked as Standby by mLACP peer
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/empty/empty_output_output.txt b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/empty/empty_output_output.txt
@@ -0,0 +1 @@
+
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_expected.py b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_expected.py
new file mode 100644
index 0000000000..a72594c036
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_expected.py
@@ -0,0 +1,66 @@
+expected_output = {
+    "GigabitEthernet0/0/0/0.501": {
+        "status": "up",
+        "outer_vlan": ".1Q:501",
+        "vlan_id": "501",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.502": {
+        "status": "up",
+        "outer_vlan": ".1Q:502",
+        "vlan_id": "502",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.503": {
+        "status": "up",
+        "outer_vlan": ".1Q:503",
+        "vlan_id": "503",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.504": {
+        "status": "up",
+        "outer_vlan": ".1Q:504",
+        "vlan_id": "504",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.505": {
+        "status": "up",
+        "outer_vlan": ".1Q:505",
+        "vlan_id": "505",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.510": {
+        "status": "up",
+        "outer_vlan": ".1Q:510",
+        "vlan_id": "510",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/0.511": {
+        "status": "up",
+        "outer_vlan": ".1Q:511",
+        "vlan_id": "511",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+    "GigabitEthernet0/0/0/1.501": {
+        "status": "up",
+        "outer_vlan": ".1Q:501",
+        "vlan_id": "501",
+        "mtu": 1518,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0,
+    },
+}
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_output.txt b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_output.txt
new file mode 100644
index 0000000000..97b9684777
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output1_output.txt
@@ -0,0 +1,14 @@
+        St:    AD - Administratively Down, Dn - Down, Up - Up
+        Ly:    L2 - Switched layer 2 service, L3 = Terminated layer 3 service,
+        Xtra   C - Match on Cos, E  - Match on Ethertype, M - Match on source MAC
+        -,+:   Ingress rewrite operation; number of tags to pop and push respectively
+
+        Interface               St  MTU  Ly Outer            Inner            Xtra -,+
+        Gi0/0/0/0.501           Up  1518 L3 .1Q:501          -                -    1 0
+        Gi0/0/0/0.502           Up  1518 L3 .1Q:502          -                -    1 0
+        Gi0/0/0/0.503           Up  1518 L3 .1Q:503          -                -    1 0
+        Gi0/0/0/0.504           Up  1518 L3 .1Q:504          -                -    1 0
+        Gi0/0/0/0.505           Up  1518 L3 .1Q:505          -                -    1 0
+        Gi0/0/0/0.510           Up  1518 L3 .1Q:510          -                -    1 0
+        Gi0/0/0/0.511           Up  1518 L3 .1Q:511          -                -    1 0
+        Gi0/0/0/1.501           Up  1518 L3 .1Q:501          -                -    1 0
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_expected.py b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_expected.py
new file mode 100644
index 0000000000..0f54e3e6f3
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_expected.py
@@ -0,0 +1,10 @@
+expected_output = {
+        "GigabitEthernet0/0/0/1.501": {
+            "status": "up",
+            "outer_vlan": ".1Q:501",
+            "vlan_id": "501",
+            "mtu": 1518,
+            "rewrite_num_of_tags_pop": 1,
+            "rewrite_num_of_tags_push": 0,
+        }
+    }
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_output.txt b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_output.txt
new file mode 100644
index 0000000000..03a57f7ef1
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output2_output.txt
@@ -0,0 +1,7 @@
+        St:    AD - Administratively Down, Dn - Down, Up - Up
+        Ly:    L2 - Switched layer 2 service, L3 = Terminated layer 3 service,
+        Xtra   C - Match on Cos, E  - Match on Ethertype, M - Match on source MAC
+        -,+:   Ingress rewrite operation; number of tags to pop and push respectively
+
+        Interface               St  MTU  Ly Outer            Inner            Xtra -,+
+        Gi0/0/0/1.501           Up  1518 L3 .1Q:501          -                -    1 0
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_expected.py b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_expected.py
new file mode 100644
index 0000000000..7316e0f243
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_expected.py
@@ -0,0 +1,116 @@
+expected_output = {
+    "GigabitEthernet0/0/0/0.200": {
+        "status": "ad",
+        "outer_vlan": ".1Q:200",
+        "vlan_id": "200",
+        "mtu": 1522,
+        "inner_vlan": ".1Q:200-300",
+        "rewrite_num_of_tags_pop": 0,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1000": {
+        "status": "up",
+        "outer_vlan": ".1Q:1000",
+        "vlan_id": "1000",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1001": {
+        "status": "up",
+        "outer_vlan": ".1Q:1001",
+        "vlan_id": "1001",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1002": {
+        "status": "up",
+        "outer_vlan": ".1Q:1002",
+        "vlan_id": "1002",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1003": {
+        "status": "up",
+        "outer_vlan": ".1Q:1003",
+        "vlan_id": "1003",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1004": {
+        "status": "up",
+        "outer_vlan": ".1Q:1004",
+        "vlan_id": "1004",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1005": {
+        "status": "up",
+        "outer_vlan": ".1Q:1005",
+        "vlan_id": "1005",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1006": {
+        "status": "up",
+        "outer_vlan": ".1Q:1006",
+        "vlan_id": "1006",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1007": {
+        "status": "up",
+        "outer_vlan": ".1Q:1007",
+        "vlan_id": "1007",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1008": {
+        "status": "up",
+        "outer_vlan": ".1Q:1008",
+        "vlan_id": "1008",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1009": {
+        "status": "up",
+        "outer_vlan": ".1Q:1009",
+        "vlan_id": "1009",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1010": {
+        "status": "up",
+        "outer_vlan": ".1Q:1010",
+        "vlan_id": "1010",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1011": {
+        "status": "up",
+        "outer_vlan": ".1Q:1011",
+        "vlan_id": "1011",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    },
+    "TenGigE0/0/0/18.1012": {
+        "status": "up",
+        "outer_vlan": ".1Q:1012",
+        "vlan_id": "1012",
+        "mtu": 9220,
+        "rewrite_num_of_tags_pop": 1,
+        "rewrite_num_of_tags_push": 0
+    }
+}
+
diff --git a/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_output.txt b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_output.txt
new file mode 100644
index 0000000000..cd277ad70a
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowEthernetTags/cli/equal/golden_output3_output.txt
@@ -0,0 +1,21 @@
+Mon Aug 19 03:56:39.363 MDT
+St:    AD - Administratively Down, Dn - Down, Up - Up
+Ly:    L2 - Switched layer 2 service, L3 = Terminated layer 3 service,
+Xtra   C - Match on Cos, E  - Match on Ethertype, M - Match on source MAC
+-,+:   Ingress rewrite operation; number of tags to pop and push respectively
+
+Interface               St  MTU  Ly Outer            Inner            Xtra -,+
+Gi0/0/0/0.200           AD  1522 L2 .1Q:200          .1Q:200-300      -    0 0
+Te0/0/0/18.1000         Up  9220 L2 .1Q:1000         -                -    1 0
+Te0/0/0/18.1001         Up  9220 L2 .1Q:1001         -                -    1 0
+Te0/0/0/18.1002         Up  9220 L2 .1Q:1002         -                -    1 0
+Te0/0/0/18.1003         Up  9220 L2 .1Q:1003         -                -    1 0
+Te0/0/0/18.1004         Up  9220 L2 .1Q:1004         -                -    1 0
+Te0/0/0/18.1005         Up  9220 L2 .1Q:1005         -                -    1 0
+Te0/0/0/18.1006         Up  9220 L2 .1Q:1006         -                -    1 0
+Te0/0/0/18.1007         Up  9220 L2 .1Q:1007         -                -    1 0
+Te0/0/0/18.1008         Up  9220 L2 .1Q:1008         -                -    1 0
+Te0/0/0/18.1009         Up  9220 L2 .1Q:1009         -                -    1 0
+Te0/0/0/18.1010         Up  9220 L2 .1Q:1010         -                -    1 0
+Te0/0/0/18.1011         Up  9220 L2 .1Q:1011         -                -    1 0
+Te0/0/0/18.1012         Up  9220 L2 .1Q:1012         -                -    1 0
diff --git a/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_expected.py b/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_expected.py
new file mode 100644
index 0000000000..17555c77ed
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_expected.py
@@ -0,0 +1,106 @@
+expected_output = {
+    "groups": {
+        "paltel_type5": {
+            "name": {
+                "paltel_type5": {
+                    "status": "DN",
+                    "segment1": {
+                        "TenGigabitEthernet0/1/0/11.57": {
+                            "status": "UP",
+                            "segment2": {
+                                "10.100.0.6      1111": {
+                                    "status": "DN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "aa_evpn_he_104": {
+            "name": {
+                "aa_evpn_he_104": {
+                    "status": "DN",
+                    "segment1": {
+                        "PE104": {
+                            "status": "UP",
+                            "segment2": {
+                                "EVPN 104,104,None": {
+                                    "status": "DN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "pa_evpn_he_106": {
+            "name": {
+                "pa_evpn_he_106": {
+                    "status": "DN",
+                    "segment1": {
+                        "PE106": {
+                            "status": "UP",
+                            "segment2": {
+                                "EVPN 106,106,None": {
+                                    "status": "DN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "sa_evpn_he_105": {
+            "name": {
+                "sa_evpn_he_105": {
+                    "status": "DN",
+                    "segment1": {
+                        "PE105": {
+                            "status": "UP",
+                            "segment2": {
+                                "EVPN 105,105,None": {
+                                    "status": "DN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "evpn_vpws_sa_100": {
+            "name": {
+                "evpn_vpws_sa_100": {
+                    "status": "UR",
+                    "segment1": {
+                        "TenGigabitEthernet0/1/0/11.100": {
+                            "status": "UR",
+                            "segment2": {
+                                "EVPN 100,100,None": {
+                                    "status": "DN(PP)"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "p2p_vpws_seam_mig": {
+            "name": {
+                "p2p_vpws_seam_mig": {
+                    "status": "UR",
+                    "segment1": {
+                        "TenGigabitEthernet0/1/0/11.1979": {
+                            "status": "UR",
+                            "segment2": {
+                                "10.100.0.1      1979": {
+                                    "status": "DN"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_output.txt b/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_output.txt
new file mode 100644
index 0000000000..b677ff5d1a
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowL2vpnXconnect/cli/equal/golden_output_7_output.txt
@@ -0,0 +1,32 @@
+Thu Sep  5 15:14:55.283 GMT+4
+Legend: ST = State, UP = Up, DN = Down, AD = Admin Down, UR = Unresolved,
+        SB = Standby, SR = Standby Ready, (PP) = Partially Programmed,
+        LU = Local Up, RU = Remote Up, CO = Connected, (SI) = Seamless Inactive
+
+XConnect                   Segment 1                       Segment 2                
+Group      Name       ST   Description            ST       Description            ST    
+------------------------   -----------------------------   -----------------------------
+paltel_type5
+           paltel_type5
+                      DN   Te0/1/0/11.57          UP       10.100.0.6      1111   DN    
+----------------------------------------------------------------------------------------
+aa_evpn_he_104
+           aa_evpn_he_104
+                      DN   PE104                  UP       EVPN 104,104,None      DN    
+----------------------------------------------------------------------------------------
+pa_evpn_he_106
+           pa_evpn_he_106
+                      DN   PE106                  UP       EVPN 106,106,None      DN    
+----------------------------------------------------------------------------------------
+sa_evpn_he_105
+           sa_evpn_he_105
+                      DN   PE105                  UP       EVPN 105,105,None      DN    
+----------------------------------------------------------------------------------------
+evpn_vpws_sa_100
+           evpn_vpws_sa_100
+                      UR   Te0/1/0/11.100         UR       EVPN 100,100,None      DN(PP)
+----------------------------------------------------------------------------------------
+p2p_vpws_seam_mig
+           p2p_vpws_seam_mig
+                      UR   Te0/1/0/11.1979        UR       10.100.0.1      1979   DN    
+----------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_expected.py b/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_expected.py
new file mode 100644
index 0000000000..9965ddcd08
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_expected.py
@@ -0,0 +1,42 @@
+expected_output ={
+    "DENY_ALL": {
+        "statements": {
+            10: {
+                "actions": {
+                    "actions": "drop"
+                },
+                "conditions": {}
+            }
+        }
+    },
+    "PASS_ALL": {
+        "statements": {
+            10: {
+                "actions": {
+                    "actions": "pass"
+                },
+                "conditions": {}
+            }
+        }
+    },
+    "V002:EXPORT": {
+        "statements": {
+            10: {
+                "actions": {
+                    "actions": "drop"
+                },
+                "conditions": {}
+            },
+            20: {
+                "actions": {
+                    "set_ext_community_rt": [
+                        "64911:303712001"
+                    ],
+                    "set_ext_community_rt_additive": True
+                },
+                "conditions": {}
+            }
+        }
+    }
+}
+
diff --git a/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_output.txt b/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_output.txt
new file mode 100644
index 0000000000..f38109b886
--- /dev/null
+++ b/src/genie/libs/parser/iosxr/tests/ShowRplRoutePolicy/cli/equal/golden6_output.txt
@@ -0,0 +1,21 @@
+show rpl route-policy
+
+Wed Aug 28 08:45:38.904 UTC
+Listing for all Route Policy objects
+
+route-policy DENY_ALL
+  drop
+end-policy
+!
+route-policy PASS_ALL
+  pass
+end-policy
+!
+route-policy V002:EXPORT
+  if (as-path in aspath_20_deny) then
+    drop
+  else
+    set extcommunity rt (64911:303712001) additive
+  endif
+end-policy
+!
diff --git a/src/genie/libs/parser/nxos/show_interface.py b/src/genie/libs/parser/nxos/show_interface.py
index c52d009887..356b8aef29 100755
--- a/src/genie/libs/parser/nxos/show_interface.py
+++ b/src/genie/libs/parser/nxos/show_interface.py
@@ -185,7 +185,7 @@ class ShowInterfaceSchema(MetaParser):
 class ShowInterface(ShowInterfaceSchema):
     """Parser for show interface, show interface <interface>"""
 
-    cli_command = ['show interface', 'show interface {interface}']
+    cli_command = ['show interface', 'show interface {interface}', 'show interface {interface} | include {include}', 'show interface | include {include}']
     exclude = [
         'in_unicast_pkts',
         'out_unicast_pkts',
@@ -218,9 +218,13 @@ class ShowInterface(ShowInterfaceSchema):
         'in_crc_errors',
         'reliability']
 
-    def cli(self, interface="", output=None):
+    def cli(self, interface='', include='', output=None):
         if output is None:
-            if interface:
+            if interface and include:
+                cmd = self.cli_command[2].format(interface=interface, include=include)
+            elif include:
+                cmd = self.cli_command[3].format(include=include)
+            elif interface:
                 cmd = self.cli_command[1].format(interface=interface)
             else:
                 cmd = self.cli_command[0]
@@ -1949,11 +1953,11 @@ def cli(self, interface='', vrf='', output=None):
             # Ethernet2/5               default                              1  --
             # Ethernet2/6               default                              1  --
             # port-channel1101          default                              1  --
-
+            # Vlan3960                  KVTC_TEST_SU_KLAIDA                 31  --
             p1 = re.compile(r'^\s*(?P<interface>[a-zA-Z0-9\.\/\-]+)'
-                            ' *(?P<vrf>[a-zA-Z0-9]+)'
-                            ' *(?P<vrf_id>[0-9]+)'
-                            ' *(?P<site_of_origin>[a-zA-Z\-]+)$')
+                            r' *(?P<vrf>[a-zA-Z0-9_]+)'
+                            r' *(?P<vrf_id>[0-9]+)'
+                            r' *(?P<site_of_origin>[a-zA-Z\-]+)$')
 
             m = p1.match(line)
             if m:
diff --git a/src/genie/libs/parser/nxos/show_vxlan.py b/src/genie/libs/parser/nxos/show_vxlan.py
index bc791afd3f..ba7d9e957c 100644
--- a/src/genie/libs/parser/nxos/show_vxlan.py
+++ b/src/genie/libs/parser/nxos/show_vxlan.py
@@ -5,6 +5,7 @@
     * show nve interface <nve> detail
     * show nve ethernet-segment
     * show nve vni
+    * show nve vni <vni>
     * show nve vni summary
     * show nve multisite dci-links
     * show nve multisite fabric-links
@@ -24,7 +25,7 @@
 
 # Metaparser
 from genie.metaparser import MetaParser
-from genie.metaparser.util.schemaengine import Schema, Any, Optional
+from genie.metaparser.util.schemaengine import Any, Optional
 
 from genie.libs.parser.utils.common import Common
 
@@ -245,14 +246,16 @@ def cli(self, output=None):
 
         return result_dict
 
+
 # ====================================================
 #  schema for show nve vni
 # ====================================================
 class ShowNveVniSchema(MetaParser):
     """Schema for:
-        show nve vni"""
+        show nve vni
+        show nve vni <vni>"""
 
-    schema ={
+    schema = {
         Any(): {
             'vni': {
                 Any(): {
@@ -267,19 +270,24 @@ class ShowNveVniSchema(MetaParser):
         }
     }
 
+
 # ====================================================
 #  Parser for show nve vni
 # ====================================================
 class ShowNveVni(ShowNveVniSchema):
     """parser for:
-        show nve vni"""
+        show nve vni
+        show nve vni <vni>"""
 
-    cli_command = 'show nve vni'
+    cli_command = ['show nve vni', 'show nve vni {vni}']
 
-    def cli(self, output=None):
+    def cli(self, vni=None, output=None):
         # excute command to get output
         if output is None:
-            out = self.device.execute(self.cli_command)
+            if vni:
+                out = self.device.execute(self.cli_command[1].format(vni=vni))
+            else:
+                out = self.device.execute(self.cli_command[0])
         else:
             out = output
 
@@ -292,6 +300,7 @@ def cli(self, output=None):
         p1 = re.compile(r'^(?P<nve_name>[\w\/]+) +(?P<vni>[\d]+) +(?P<mcast>[\w\.\/]+) +'
                         r'(?P<vni_state>[\w]+) +(?P<mode>[\w]+) +(?P<type>\w+ +\[[\w\-]+\])'
                         r'(?: +(?P<flags>[\w\-\s]+))?$')
+
         for line in out.splitlines():
             line = line.strip()
 
@@ -300,7 +309,7 @@ def cli(self, output=None):
                 group = m.groupdict()
                 nve_name = group.pop('nve_name')
                 vni = int(group.pop('vni'))
-                nve_dict = result_dict.setdefault(nve_name,{}).setdefault('vni',{}).setdefault(vni,{})
+                nve_dict = result_dict.setdefault(nve_name, {}).setdefault('vni', {}).setdefault(vni, {})
                 nve_dict.update({'vni': vni})
                 nve_dict.update({'mcast': group.pop('mcast').lower()})
                 nve_dict.update({'vni_state': group.pop('vni_state').lower()})
diff --git a/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_arguments.json b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_arguments.json
new file mode 100644
index 0000000000..6c9abbe6f1
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_arguments.json
@@ -0,0 +1,3 @@
+{
+	"include": "\" is (up|down)|Hardware:|BW\""
+}
diff --git a/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_expected.py b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_expected.py
new file mode 100644
index 0000000000..e7997b05da
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_expected.py
@@ -0,0 +1,1072 @@
+expected_output = {
+    "mgmt0": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "types": "GigabitEthernet",
+        "mac_address": "3c13.cc2e.9580",
+        "phys_address": "3c13.cc2e.9580",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Ethernet1/1": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9588",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/2": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9589",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/3": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958a",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/4": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958b",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/5": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958c",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/6": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": False,
+        "admin_state": "down",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958d",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/7": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": False,
+        "admin_state": "down",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958e",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/8": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.958f",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/9": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9590",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/10": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9591",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/11": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9592",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/12": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9593",
+        "phys_address": "3c13.cc2e.9593",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/13": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9594",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/14": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9595",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/15": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9596",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/16": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9597",
+        "phys_address": "3c13.cc2e.9597",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/17": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9598",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/18": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.9599",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/19": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.959a",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/20": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.959b",
+        "phys_address": "3c13.cc2e.959b",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/21": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.959c",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/22": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.959d",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/23": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.959e",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/24": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.959f",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/25": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.95a0",
+        "phys_address": "3c13.cc2e.95a0",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/26": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a1",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/27": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a2",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/28": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a3",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/29": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a4",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/30": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a5",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/31": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a6",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/32": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a7",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/33": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a8",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/34": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95a9",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/35": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95aa",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/36": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95ab",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/37": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95ac",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/38": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95ad",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/39": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95ae",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/40": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95af",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/41": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b0",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/42": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b1",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/43": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b2",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/44": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b3",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/45": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b4",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/46": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b5",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/47": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b6",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 25000000
+    },
+    "Ethernet1/48": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b7",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/48.2": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "parent_interface": "Ethernet1/48",
+        "types": "100/1000/10000/25000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b7",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 10000000
+    },
+    "Ethernet1/49": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95b8",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000000
+    },
+    "Ethernet1/50": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95bc",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000000
+    },
+    "Ethernet1/51": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95c0",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000000
+    },
+    "Ethernet1/52": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95c4",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000000
+    },
+    "Ethernet1/53": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95c8",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 40000000
+    },
+    "Ethernet1/54": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "dedicated_interface": True,
+        "types": "1000/10000/25000/40000/50000/100000 Ethernet",
+        "mac_address": "3c13.cc2e.9587",
+        "phys_address": "3c13.cc2e.95cc",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000000
+    },
+    "port-channel8": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 100000
+    },
+    "port-channel12": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": False,
+        "admin_state": "down",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000
+    },
+    "port-channel25": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 100000
+    },
+    "port-channel50": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 10,
+        "mtu": 9216,
+        "bandwidth": 100000
+    },
+    "port-channel200": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 20000000
+    },
+    "loopback0": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 5000,
+        "mtu": 1500,
+        "bandwidth": 8000000
+    },
+    "loopback2": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 5000,
+        "mtu": 1500,
+        "bandwidth": 8000000
+    },
+    "loopback254": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "admin_state": "up",
+        "delay": 5000,
+        "mtu": 1500,
+        "bandwidth": 8000000
+    },
+    "Vlan1": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "down",
+        "oper_status": "down",
+        "enabled": False,
+        "line_protocol": "down",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Vlan200": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "line_protocol": "up",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Vlan201": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "line_protocol": "up",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Vlan2303": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "line_protocol": "up",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Vlan2304": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "line_protocol": "up",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    },
+    "Vlan2305": {
+        "port_channel": {
+            "port_channel_member": False
+        },
+        "link_state": "up",
+        "oper_status": "up",
+        "enabled": True,
+        "line_protocol": "up",
+        "autostate": True,
+        "delay": 10,
+        "mtu": 1500,
+        "bandwidth": 1000000
+    }
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_output.txt b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_output.txt
new file mode 100644
index 0000000000..bbe7d42e41
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowInterface/cli/equal/golden14_output.txt
@@ -0,0 +1,268 @@
+mgmt0 is up
+admin state is up,
+  Hardware: GigabitEthernet, address: 3c13.cc2e.9580 (bia 3c13.cc2e.9580)
+  MTU 1500 bytes, BW 1000000 Kbit , DLY 10 usec
+Ethernet1/1 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9588)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/2 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9589)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/3 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958a)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/4 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958b)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/5 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958c)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/6 is down (Administratively down)
+admin state is down, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958d)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/7 is down (Administratively down)
+admin state is down, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958e)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/8 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.958f)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/9 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9590)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/10 is down (Channel admin down)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9591)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/11 is down (Channel admin down)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9592)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/12 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9593 (bia 3c13.cc2e.9593)
+  MTU 1500 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/13 is down (suspended(no LACP PDUs))
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9594)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/14 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9595)
+  MTU 1500 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/15 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9596)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/16 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9597 (bia 3c13.cc2e.9597)
+  MTU 1500 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/17 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9598)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/18 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9599)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/19 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.959a)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/20 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.959b (bia 3c13.cc2e.959b)
+  MTU 1500 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/21 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.959c)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/22 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.959d)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/23 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.959e)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/24 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.959f)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/25 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.95a0 (bia 3c13.cc2e.95a0)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/26 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a1)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/27 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a2)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/28 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a3)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/29 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a4)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/30 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a5)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/31 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a6)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/32 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a7)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/33 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a8)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/34 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95a9)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/35 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95aa)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/36 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95ab)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/37 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95ac)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/38 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95ad)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/39 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95ae)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/40 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95af)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/41 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b0)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/42 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b1)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/43 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b2)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/44 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b3)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/45 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b4)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/46 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b5)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/47 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b6)
+  MTU 9216 bytes, BW 25000000 Kbit , DLY 10 usec
+Ethernet1/48 is up
+admin state is up, Dedicated Interface
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b7)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/48.2 is up
+admin state is up, Dedicated Interface, [parent interface is Ethernet1/48]
+  Hardware: 100/1000/10000/25000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b7)
+  MTU 9216 bytes, BW 10000000 Kbit , DLY 10 usec
+Ethernet1/49 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95b8)
+  MTU 9216 bytes, BW 100000000 Kbit , DLY 10 usec
+Ethernet1/50 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95bc)
+  MTU 9216 bytes, BW 100000000 Kbit , DLY 10 usec
+Ethernet1/51 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95c0)
+  MTU 9216 bytes, BW 100000000 Kbit , DLY 10 usec
+Ethernet1/52 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95c4)
+  MTU 9216 bytes, BW 100000000 Kbit , DLY 10 usec
+Ethernet1/53 is up
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95c8)
+  MTU 9216 bytes, BW 40000000 Kbit , DLY 10 usec
+Ethernet1/54 is down (XCVR not inserted)
+admin state is up, Dedicated Interface
+  Hardware: 1000/10000/25000/40000/50000/100000 Ethernet, address: 3c13.cc2e.9587 (bia 3c13.cc2e.95cc)
+  MTU 9216 bytes, BW 100000000 Kbit , DLY 10 usec
+port-channel8 is down (No operational members)
+admin state is up,
+  Hardware: Port-Channel, address: 3c13.cc2e.9587 (bia 0000.0000.0000)
+  MTU 1500 bytes, BW 100000 Kbit , DLY 10 usec
+port-channel12 is down (Administratively down)
+admin state is down,
+  Hardware: Port-Channel, address: 3c13.cc2e.9587 (bia 0000.0000.0000)
+  MTU 9216 bytes, BW 100000 Kbit , DLY 10 usec
+port-channel25 is down (No operational members)
+admin state is up,
+  Hardware: Port-Channel, address: 3c13.cc2e.9587 (bia 0000.0000.0000)
+  MTU 1500 bytes, BW 100000 Kbit , DLY 10 usec
+port-channel50 is down (No operational members)
+admin state is up,
+  Hardware: Port-Channel, address: 3c13.cc2e.9587 (bia 3c13.cc2e.9594)
+  MTU 9216 bytes, BW 100000 Kbit , DLY 10 usec
+port-channel200 is up
+admin state is up,
+  Hardware: Port-Channel, address: 3c13.cc2e.9597 (bia 3c13.cc2e.9597)
+  MTU 1500 bytes, BW 20000000 Kbit , DLY 10 usec
+loopback0 is up
+admin state is up,
+  Hardware: Loopback
+  MTU 1500 bytes, BW 8000000 Kbit , DLY 5000 usec
+loopback2 is up
+admin state is up,
+  Hardware: Loopback
+  MTU 1500 bytes, BW 8000000 Kbit , DLY 5000 usec
+loopback254 is up
+admin state is up,
+  Hardware: Loopback
+  MTU 1500 bytes, BW 8000000 Kbit , DLY 5000 usec
+Vlan1 is down (Administratively down), line protocol is down, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
+Vlan200 is up, line protocol is up, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
+Vlan201 is up, line protocol is up, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
+Vlan2303 is up, line protocol is up, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
+Vlan2304 is up, line protocol is up, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
+Vlan2305 is up, line protocol is up, autostate enabled
+  MTU 1500 bytes, BW 1000000 Kbit, DLY 10 usec,
\ No newline at end of file
diff --git a/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/empty/empty_output_output.txt b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/empty/empty_output_output.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_arguments.json b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_arguments.json
new file mode 100644
index 0000000000..4dc3afb1b0
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_arguments.json
@@ -0,0 +1,3 @@
+{
+    "vni": "3003960"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..cfc0300828
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,14 @@
+expected_output = {
+    "nve1": {
+        "vni": {
+            3003960: {
+                "vni": 3003960,
+                "mcast": "n/a",
+                "vni_state": "down",
+                "mode": "CP",
+                "type": "L3 [KVTC_TEST_SU_KLAIDA]",
+                "flags": ""
+            }
+        }
+    }
+}
diff --git a/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..039c5f0b03
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowNveVni/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,10 @@
+Codes: CP - Control Plane        DP - Data Plane
+       UC - Unconfigured         SA - Suppress ARP
+       SU - Suppress Unknown Unicast
+       Xconn - Crossconnect
+       MS-IR - Multisite Ingress Replication
+       HYB - Hybrid IRB mode
+
+Interface VNI      Multicast-group   State Mode Type [BD/VRF]      Flags
+--------- -------- ----------------- ----- ---- ------------------ -----
+nve1      3003960  n/a               Down  CP   L3 [KVTC_TEST_SU_KLAIDA]
\ No newline at end of file
diff --git a/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_arguments.json b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_arguments.json
new file mode 100644
index 0000000000..0b07a17d96
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_arguments.json
@@ -0,0 +1,3 @@
+{
+    "vrf": "KVTC_TEST_SU_KLAIDA"
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_expected.py b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_expected.py
new file mode 100644
index 0000000000..53cd5394a2
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_expected.py
@@ -0,0 +1,22 @@
+expected_output = {
+    "Vlan1199": {
+        "vrf": "KVTC_TEST_SU_KLAIDA",
+        "vrf_id": 31,
+        "site_of_origin": "--"
+    },
+    "Vlan1999": {
+        "vrf": "KVTC_TEST_SU_KLAIDA",
+        "vrf_id": 31,
+        "site_of_origin": "--"
+    },
+    "Vlan3959": {
+        "vrf": "KVTC_TEST_SU_KLAIDA",
+        "vrf_id": 31,
+        "site_of_origin": "--"
+    },
+    "Vlan3960": {
+        "vrf": "KVTC_TEST_SU_KLAIDA",
+        "vrf_id": 31,
+        "site_of_origin": "--"
+    }
+}
diff --git a/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_output.txt b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_output.txt
new file mode 100644
index 0000000000..28d685d136
--- /dev/null
+++ b/src/genie/libs/parser/nxos/tests/ShowVrfAllInterface/cli/equal/golden2_output.txt
@@ -0,0 +1,4 @@
+Vlan1199                  KVTC_TEST_SU_KLAIDA                 31  --
+Vlan1999                  KVTC_TEST_SU_KLAIDA                 31  --
+Vlan3959                  KVTC_TEST_SU_KLAIDA                 31  --
+Vlan3960                  KVTC_TEST_SU_KLAIDA                 31  --
\ No newline at end of file
diff --git a/src/genie/libs/parser/viptela/show_omp.py b/src/genie/libs/parser/viptela/show_omp.py
index 98584cf799..80a037352c 100644
--- a/src/genie/libs/parser/viptela/show_omp.py
+++ b/src/genie/libs/parser/viptela/show_omp.py
@@ -28,12 +28,38 @@ class ShowOmpSummarySchema(MetaParser):
         'routes_installed': int,
         'routes_received': int,
         'routes_sent': int,
+        Optional('routes_ipv6_installed'): int,
+        Optional('routes_ipv6_sent'): int,
+        Optional('routes_ipv6_received'): int,
         'services_installed': int,
         'services_received': int,
         'services_sent': int,
+        Optional('services_installed_ipv6'): int,
+        Optional('services_sent_ipv6'): int, 
+        Optional('services_received_ipv6'): int,
         'tlocs_installed': int,
         'tlocs_received': int,
         'tlocs_sent': int,
+        Optional('l2_services_installed'): int,
+        Optional('l2_services_received'): int,
+        Optional('l2_services_sent'): int,
+        Optional('l2_routes_installed'): int,
+        Optional('l2_routes_received'): int,
+        Optional('l2_routes_sent'): int,
+        Optional('l2_statuses_installed'): int,
+        Optional('l2_statuses_received'): int,
+        Optional('l2_statuses_sent'): int,
+        Optional('transport_gateway'): str,
+        Optional('link_routes_received'): int, 
+        Optional('link_routes_sent'): int, 
+        Optional('cap_update_received'): int, 
+        Optional('cap_update_sent'): int,
+        Optional('ribout_generation_paused'): str,
+        Optional('peers_down_in_gr'): int, 
+        Optional('vedge_peers'): int, 
+        Optional('ro_te_routes_sent',): int,
+        Optional('ro-te-routes-ipv6-sent'): int,
+        Optional('topology'): str,
         'total_packets_sent': int,
         'update_received': int,
         'update_sent': int,
diff --git a/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_expected.py b/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_expected.py
new file mode 100644
index 0000000000..4e4f7a11ba
--- /dev/null
+++ b/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_expected.py
@@ -0,0 +1,51 @@
+expected_output = {
+    "oper_state": "UP",
+    "admin_state": "UP",
+    "personality": "vsmart",
+    "omp_uptime": "8:12:33:58",
+    "routes_received": 15433,
+    "routes_installed": 0,
+    "routes_sent": 33553,
+    "ro_te_routes_sent": 5688,
+    "routes_ipv6_received": 2722,
+    "routes_ipv6_sent": 4841,
+    "link_routes_received": 0,
+    "link_routes_sent": 0,
+    "tlocs_received": 302,
+    "tlocs_installed": 78,
+    "tlocs_sent": 776,
+    "services_received": 2968,
+    "services_installed": 744,
+    "services_sent": 2220,
+    "services_sent_ipv6": 2220,
+    "mcast_routes_received": 68,
+    "mcast_routes_sent": 228,
+    "l2_services_received": 464,
+    "l2_services_installed": 0,
+    "l2_services_sent": 348,
+    "l2_routes_received": 408,
+    "l2_routes_installed": 0,
+    "l2_routes_sent": 402,
+    "l2_statuses_received": 104,
+    "l2_statuses_installed": 0,
+    "l2_statuses_sent": 102,
+    "hello_sent": 162071,
+    "hello_received": 162313,
+    "handshake_sent": 53,
+    "handshake_received": 50,
+    "alert_sent": 24,
+    "alert_received": 0,
+    "inform_sent": 774,
+    "inform_received": 712,
+    "update_sent": 988555,
+    "update_received": 530886,
+    "policy_sent": 81,
+    "policy_received": 2,
+    "cap_update_sent": 0,
+    "cap_update_received": 37,
+    "total_packets_sent": 1151975,
+    "vsmart_peers": 3,
+    "vedge_peers": 19,
+    "peers_down_in_gr": 0,
+    "ribout_generation_paused": "False",
+}
\ No newline at end of file
diff --git a/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_output.txt b/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_output.txt
new file mode 100644
index 0000000000..763d918915
--- /dev/null
+++ b/src/genie/libs/parser/viptela/tests/ShowOmpSummary/cli/equal/golden_output_1_output.txt
@@ -0,0 +1,60 @@
+
+    #show omp summary 
+summary 
+oper-state             UP
+admin-state            UP
+personality            vsmart
+omp-uptime             8:12:33:58
+routes-received        15433
+routes-installed       0
+routes-sent            33553
+ro-te-routes-sent      5688
+routes-ipv6-received   2722
+routes-ipv6-sent       4841
+ro-te-routes-ipv6-sent 2320
+route-prefixes-received 1230
+route-ipv6-prefixes-received 86
+link-routes-received   0
+link-routes-sent       0
+tlocs-received         302
+tlocs-installed        78
+tlocs-sent             776
+services-received      2968
+services-received-ipv6 2960
+services-installed     744
+services-installed-ipv6 740
+services-sent          2220
+services-sent-ipv6     2220
+mcast-routes-received  68
+mcast-routes-installed 0
+mcast-routes-sent      228
+l2-services-received   464
+l2-services-installed  0
+l2-services-sent       348
+l2-routes-received     408
+l2-routes-installed    0
+l2-routes-sent         402
+l2-statuses-received   104
+l2-statuses-installed  0
+l2-statuses-sent       102
+hello-sent             162071
+hello-received         162313
+handshake-sent         53
+handshake-received     50
+alert-sent             24
+alert-received         0
+inform-sent            774
+inform-received        712
+update-sent            988555
+update-received        530886
+policy-sent            81
+policy-received        2
+cap-update-sent        0
+cap-update-received    37
+total-packets-sent     1151975
+total-packets-received 694000
+vsmart-peers           3
+vedge-peers            19
+peers-down-in-gr       0
+topology               Hub-and-Spoke
+ribout-generation-paused  False