Merge pull request #946 from CiscoTestAutomation/release_25.5

Release 25.5

Author: omehrabi

changelog/2025/may.rst

@@ -0,0 +1,6 @@
+--------------------------------------------------------------------------------
+                            New
+--------------------------------------------------------------------------------
+* IOSXE
+    * Added ShowIpv6MfibInterface
+    * 'show ipv6 mfib interface'

changelog/changelog_show_mfib_20250514091043.rst

@@ -8,7 +8,7 @@
 '''
 
 # metadata
-__version__ = '25.4'
+__version__ = "25.5"
 __author__ = 'Cisco Systems Inc.'
 __contact__ = ['[email protected]', '[email protected]']
 __copyright__ = 'Copyright (c) 2018, Cisco Systems Inc.'

sdk_generator/outputs/github_parser.json

@@ -154,6 +154,9 @@ def cli(self, output=None):
         # BOOTLDR: System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)
         p5 = re.compile(r'^BOOTLDR: +(?P<bootldr_version>[\S\s]+)$')
 
+        # ROM: IOS-XE ROMMONBOOTLDR: System Bootstrap, Version 17.11.0.1r, DEVELOPMENT SOFTWARE
+        p4and5 = re.compile(r'^ROM: +(?P<rom>.+)BOOTLDR: +(?P<bootldr>[\S\s]+)$')
+
         # SF2 uptime is 1 day, 18 hours, 48 minutes
         p6 = re.compile(r'^(?P<hostname>.+) +uptime +is +(?P<uptime>.+)$')
 
@@ -312,8 +315,9 @@ def cli(self, output=None):
             m = p4.match(line)
             if m:
                 rom = m.groupdict()['rom']
-                version_dict['rom'] = rom
-                continue
+                if "ROMMONBOOTLDR" not in rom:
+                    version_dict['rom'] = rom
+                    continue
 
             # BOOTLDR: System Bootstrap, Version 17.1.1[FC2], RELEASE SOFTWARE (P)
             m = p5.match(line)
@@ -322,6 +326,14 @@ def cli(self, output=None):
                 version_dict['bootldr'] = m.groupdict()['bootldr_version']
                 continue
 
+            # ROM: IOS-XE ROMMONBOOTLDR: System Bootstrap, Version 17.11.0.1r, DEVELOPMENT SOFTWARE
+            m = p4and5.match(line)
+            if m:
+                version_dict['bootldr_version'] = m.groupdict()['bootldr']
+                version_dict['bootldr'] = m.groupdict()['bootldr']
+                version_dict['rom'] = m.groupdict()['rom']
+                continue
+
             # SF2 uptime is 1 day, 18 hours, 48 minutes
             m = p6.match(line)
             if m:

src/genie/libs/parser/__init__.py

@@ -0,0 +1,48 @@
+expected_output = {
+    'version': {
+        'bootldr': 'System Bootstrap, Version 17.11.0.1r, DEVELOPMENT SOFTWARE',
+        'bootldr_version': 'System Bootstrap, Version 17.11.0.1r, DEVELOPMENT SOFTWARE',
+        'chassis': 'C9500X-60L4D',
+        'code_name': 'IOSXE',
+        'compiled_by': 'mcpre',
+        'compiled_date': 'Thu 24-Apr-25 21:57',
+        'disks': {
+            'bootflash:': {
+                'disk_size': '11161600',
+            },
+            'crashinfo:': {
+                'disk_size': '1638400',
+            },
+        },
+        'hostname': 'ott-c9500x-16',
+        'image_id': 'CAT9K_IOSXE',
+        'label': '[BLD_POLARIS_DEV_LATEST_20250425_043858:/nobackup/mcpre/s2c-build-ws 101]',
+        'last_reload_reason': 'Image Install',
+        'mac_address': 'b0:8d:57:9e:28:00',
+        'main_mem': '5769295',
+        'mb_assembly_num': '4DBE',
+        'mb_rev_num': '3',
+        'mb_sn': 'FDO28020Q8G',
+        'mem_size': {
+            'non_volatile_memory': '32768',
+            'physical_memory': '33554432',
+        },
+        'model_num': 'C9500X-60L4D',
+        'model_rev_num': 'V02',
+        'os': 'IOS-XE',
+        'platform': 'Catalyst L3 Switch',
+        'processor_board_id': 'FDO28021F19',
+        'processor_type': 'X86',
+        'returned_to_rom_by': 'Image Install  at 04:19:26 UTC Sat Apr 26 2025',
+        'revision': 'V01',
+        'rom': 'IOS-XE ROMMON',
+        'smart_licensing_status': 'Smart Licensing Using Policy',
+        'system_image': 'bootflash:packages.conf',
+        'system_sn': 'FDO28021F19',
+        'uptime': '3 days, 28 minutes',
+        'uptime_this_cp': '3 days, 30 minutes',
+        'version': '17.19.20250425:045711',
+        'version_short': '17.19',
+        'xe_version': 'BLD_POLARIS_DEV_LATEST_20250425_043858',
+    },
+}

src/genie/libs/parser/iosxe/cat9k/c9500/show_platform.py

@@ -0,0 +1,74 @@
+Cisco IOS XE Software, Version BLD_POLARIS_DEV_LATEST_20250425_043858
+Cisco IOS Software [IOSXE], Catalyst L3 Switch Software (CAT9K_IOSXE), Experimental Version 17.19.20250425:045711 [BLD_POLARIS_DEV_LATEST_20250425_043858:/nobackup/mcpre/s2c-build-ws 101]
+Copyright (c) 1986-2025 by Cisco Systems, Inc.
+Compiled Thu 24-Apr-25 21:57 by mcpre
+
+
+Cisco IOS-XE software, Copyright (c) 2005-2025 by cisco Systems, Inc.
+All rights reserved.  Certain components of Cisco IOS-XE software are
+licensed under the GNU General Public License ("GPL") Version 2.0.  The
+software code licensed under GPL Version 2.0 is free software that comes
+with ABSOLUTELY NO WARRANTY.  You can redistribute and/or modify such
+GPL code under the terms of GPL Version 2.0.  For more details, see the
+documentation or "License Notice" file accompanying the IOS-XE software,
+or the applicable URL provided on the flyer accompanying the IOS-XE
+software.
+
+
+ROM: IOS-XE ROMMONBOOTLDR: System Bootstrap, Version 17.11.0.1r, DEVELOPMENT SOFTWARE
+ott-c9500x-16 uptime is 3 days, 28 minutes
+Uptime for this control processor is 3 days, 30 minutes
+System returned to ROM by Image Install  at 04:19:26 UTC Sat Apr 26 2025
+System restarted at 04:46:59 UTC Sat Apr 26 2025
+System image file is "bootflash:packages.conf"
+Last reload reason: Image Install
+
+
+
+This product contains cryptographic features and is subject to United
+States and local country laws governing import, export, transfer and
+use. Delivery of Cisco cryptographic products does not imply
+third-party authority to import, export, distribute or use encryption.
+Importers, exporters, distributors and users are responsible for
+compliance with U.S. and local country laws. By using this product you
+agree to comply with applicable laws and regulations. If you are unable
+to comply with U.S. and local laws, return this product immediately.
+
+A summary of U.S. laws governing Cisco cryptographic products may be found at:
+http://www.cisco.com/wwl/export/crypto/tool/stqrg.html
+
+If you require further assistance please contact us by sending email to
+[email protected].
+
+
+Technology Package License Information:
+
+------------------------------------------------------------------------------
+Technology-package                                     Technology-package
+Current                        Type                       Next reboot
+------------------------------------------------------------------------------
+network-advantage       Smart License                      network-advantage
+dna-advantage           Subscription Smart License         dna-advantage
+
+
+Smart Licensing Status: Smart Licensing Using Policy
+
+cisco C9500X-60L4D (X86) processor (revision V01) with 5769295K/6147K bytes of memory.
+Processor board ID FDO28021F19
+1 Virtual Ethernet interface
+60 Fifty Gigabit Ethernet interfaces
+4 Four Hundred Gigabit Ethernet interfaces
+32768K bytes of non-volatile configuration memory.
+33554432K bytes of physical memory.
+11161600K bytes of Bootflash at bootflash:.
+1638400K bytes of Crash Files at crashinfo:.
+234430023K bytes of SATA hard disk at disk0:.
+
+Base Ethernet MAC Address          : b0:8d:57:9e:28:00
+
+Motherboard Assembly Number        : 4DBE
+Motherboard Serial Number          : FDO28020Q8G
+Model Revision Number              : V02
+Motherboard Revision Number        : 3
+Model Number                       : C9500X-60L4D
+System Serial Number               : FDO28021F19

src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_5_expected.py

@@ -68,7 +68,7 @@ def cli(self, output=None):
         p6 = re.compile(r"^(?P<protocol>\S+)\s+(?P<action>\S+)\s+(?P<shutdown_threshold>[\d\-]+)\s+(?P<drop_threshold>[\d\-]+)$")
 
         ret_dict = {}
-        last_port = None  # Track the last port parsed
+        port_dict = {}
         for line in output.splitlines():
             line = line.strip()
 
@@ -104,8 +104,9 @@ def cli(self, output=None):
             m = p5.match(line)
             if m:
                 dict_val = m.groupdict()
-                last_port = Common.convert_intf_name(dict_val["port"])
-                port_dict = ret_dict.setdefault("port", {}).setdefault(last_port, {})
+                port_dict = ret_dict.setdefault("port", {}).setdefault(
+                    Common.convert_intf_name(dict_val["port"]), {}
+                )
                 port_dict["status"] = dict_val["status"]
 
                 protocol_dict = port_dict.setdefault("protocol", {}).setdefault(

src/genie/libs/parser/iosxe/cat9k/c9500/tests/ShowVersion/cli/equal/golden_output_c9500_5_output.txt

@@ -0,0 +1,144 @@
+
+# Metaparser
+import re
+from genie.metaparser import MetaParser
+from genie.metaparser.util.schemaengine import Schema, Optional, ListOf
+
+# pyATS
+from pyats.utils.exceptions import SchemaTypeError
+
+class ShowSoftwareAuthenticityKeysSchema(MetaParser):
+    """Schema for show software authenticity keys"""
+    schema = {
+        'public_key': {
+            int: {
+                'key_type': str,
+                'key_type_note': str,
+                'key_algorithm': str,
+                'modulus_size': int,
+                'modulus': str,
+                'exponent_size': int,
+                'exponent': int,
+                'key_version': str,
+                'product_name': str
+            }
+        }
+    }
+
+class ShowSoftwareAuthenticityKeys(ShowSoftwareAuthenticityKeysSchema):
+    """Parser for show software authenticity keys"""
+
+    cli_command = 'show software authenticity keys'
+
+    def cli(self, output=None):
+        if output is None:
+            output = self.device.execute(self.cli_command)
+        
+        ret_dict = {}
+        current_dict = None
+        
+        # Public Key #1 Information
+        p1 = re.compile(r'^Public Key #(?P<key_number>\d+) Information$')
+
+        # Key Type                  : Production  (Primary)                                                                                   
+        p2 = re.compile(
+            r'^Key Type +: (?P<key_type>\w+) +\((?P<key_type_note>\w+)\)$'
+        )
+        
+        # Public Key Algorithm : RSA
+        p3 = re.compile(r'^Public Key Algorithm : (?P<key_algorithm>\w+)$')
+
+        # Modulus (512 bytes)   : 
+        p4 = re.compile(
+            r'^Modulus \((?P<modulus_size>\d+) bytes\) +: *$'
+        )
+
+        # d8:1f:8e:b1:49:7c:bd:83:20:5f:25:43:d9:32:5a:b5:
+        p5 = re.compile(
+            r'^(?P<modulus>[0-9a-f:]+|[0-9a-f:]+[0-9a-f])$'
+        )
+
+        # Exponent (4 bytes)   : 10001
+        p6 = re.compile(
+            r'^Exponent \((?P<exponent_size>\d+) bytes\) +: (?P<exponent>\d+)$'
+        )
+
+        # Key Version          : A
+        p7 = re.compile(r'^Key Version +: (?P<key_version>\w+)$')
+
+        # Product Name         : IOS-XE
+        p8 = re.compile(r'^Product Name +: (?P<product_name>.*)$')
+
+        for line in output.splitlines():
+            line = line.strip()
+
+            # Public Key #1 Information
+            if p1.match(line):
+                key_number = int(p1.match(line).group(1))
+                current_dict = ret_dict.setdefault('public_key', {}).setdefault(
+                    key_number, {}
+                )
+                continue
+
+            # Key Type                  : Production  (Primary)
+            match = p2.match(line)
+            if match:
+                group = match.groupdict()
+                key_type = group['key_type']
+                key_type_note = group['key_type_note']
+                current_dict['key_type'] = key_type
+                current_dict['key_type_note'] = key_type_note
+                continue
+
+            # Public Key Algorithm : RSA
+            match = p3.match(line)
+            if match:
+                group = match.groupdict()
+                key_algorithm = group['key_algorithm']
+                current_dict['key_algorithm'] = key_algorithm
+                continue
+
+            # Modulus (512 bytes)   : 
+            match = p4.match(line)
+            if match:
+                group = match.groupdict()
+                modulus_size = int(group['modulus_size'])
+                current_dict['modulus_size'] = modulus_size
+                continue
+
+            # d8:1f:8e:b1:49:7c:bd:83:20:5f:25:43:d9:32:5a:b5:
+            match = p5.match(line)
+            if match:
+                group = match.groupdict()
+                modulus = group['modulus']
+                current_dict.setdefault('modulus', '')
+                current_dict['modulus'] += modulus
+                continue
+
+            # Exponent (4 bytes)   : 10001
+            match = p6.match(line)
+            if match:
+                group = match.groupdict()
+                exponent_size = int(group['exponent_size'])
+                exponent = int(group['exponent'])
+                current_dict['exponent_size'] = exponent_size
+                current_dict['exponent'] = exponent
+                continue
+
+            # Key Version          : A
+            match = p7.match(line)
+            if match:
+                group = match.groupdict()
+                key_version = group['key_version']
+                current_dict['key_version'] = key_version
+                continue
+
+            # Product Name         : IOS-XE
+            match = p8.match(line)
+            if match:
+                group = match.groupdict()
+                product_name = group['product_name']
+                current_dict['product_name'] = product_name
+                continue
+
+        return ret_dict