Merge pull request #117 from CiscoTestAutomation/release_25.9

Release 25.9

Author: omehrabi

docs/changelog/2025/september.rst

@@ -0,0 +1,39 @@
+September 2025
+==========
+
+September 30 - Unicon v25.9 
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v25.9 
+        ``unicon``, v25.9 
+
+
+
+
+Changelogs
+^^^^^^^^^^
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* backend/spawn
+    * Modified backend spawn implementation, updated logic to optimize buffer matching
+
+
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* generic/service_statements
+    * Fixed the copy_overwrite_handler prompt
+
+* iosxe/stack
+    * Added pattern for install image to match
+    * Fixed the stack reload for the return_output true condition
+
+

docs/changelog/index.rst

@@ -4,6 +4,7 @@ Changelog
 .. toctree::
    :maxdepth: 2
 
+   2025/september
    2025/august
    2025/july
    2025/june

docs/changelog_plugins/2025/september.rst

@@ -0,0 +1,41 @@
+September 2025
+==========
+
+September 30 - Unicon v25.9
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v25.9 
+        ``unicon``, v25.9 
+
+
+
+
+Changelogs
+^^^^^^^^^^
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* generic
+    * Update config error pattern
+
+* iosxe
+    * Updated disable_prompt to ensure no false positives
+    * Added support to syntax prompt
+
+* pid tokens
+    * Updated PID tokens to support C9500X-60L4D devices
+
+
+--------------------------------------------------------------------------------
+                                      New                                       
+--------------------------------------------------------------------------------
+
+* iosxe/cat9k add rommon variable support in reload service
+
+

docs/changelog_plugins/index.rst

@@ -4,6 +4,7 @@ Plugins Changelog
 .. toctree::
    :maxdepth: 2
 
+   2025/september
    2025/august
    2025/july
    2025/june

src/unicon/plugins/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "25.8"
+__version__ = "25.9"
 
 supported_chassis = [
     'single_rp',

src/unicon/plugins/generic/service_statements.py

@@ -170,9 +170,9 @@ def copy_handler_1(spawn, context, send_key):
 
 def copy_overwrite_handler(spawn, context):
     if context['overwrite'] == 'False':
-        spawn.sendline('n')
+        spawn.send('n')
     else:
-        spawn.sendline('y')
+        spawn.send('y')
 
 def copy_error_handler(context, retry=False):
     if retry:

src/unicon/plugins/generic/settings.py

@@ -149,7 +149,8 @@ def __init__(self):
                                         r'subinterface is already configured as part of an IEEE 802.10, IEEE 802.1Q, '
                                         r'or ISL vLAN.',
                                         r'% OSPF: Please enable segment-routing globally',
-                                        r"% Invalid input detected at '^' marker"
+                                        r"% Invalid input detected at '^' marker",
+                                        r"%ERROR:"
                                         ]
 
         # Number of times to retry for config mode by configure service.

src/unicon/plugins/iosxe/__init__.py

@@ -30,6 +30,7 @@ def __init__(self):
         self.rommon = svc.Rommon
         self.tclsh = svc.Tclsh
         self.maintenance_mode = svc.MaintenanceMode
+        self.config_syntax = svc.ConfigSyntax
 
 
 class HAIosXEServiceList(HAServiceList):
@@ -48,6 +49,7 @@ def __init__(self):
         self.reset_standby_rp = svc.ResetStandbyRP
         self.rommon = svc.HARommon
         self.tclsh = svc.Tclsh
+        self.config_syntax = svc.ConfigSyntax
 
 
 class IosXESingleRpConnection(BaseSingleRpConnection):

src/unicon/plugins/iosxe/cat9k/c9500x/stackwise_virtual/service_implementation.py

@@ -1,4 +1,6 @@
 """ Stack based IOS-XE/cat9k/c9500X service implementations. """
+import io
+import logging
 from time import sleep
 from collections import namedtuple
 from datetime import timedelta
@@ -7,6 +9,7 @@
 from unicon.eal.dialogs import Dialog
 from unicon.core.errors import SubCommandFailure
 from unicon.bases.routers.services import BaseService
+from unicon.logs import UniconStreamHandler, UNICON_LOG_FORMAT
 
 from unicon.plugins.iosxe.stack.utils import StackUtils
 from unicon.plugins.generic.statements import custom_auth_statements
@@ -44,6 +47,7 @@ def __init__(self, connection, context, *args, **kwargs):
         self.end_state = 'enable'
         self.timeout = connection.settings.STACK_RELOAD_TIMEOUT
         self.reload_command = "redundancy reload shelf"
+        self.log_buffer = io.StringIO()
         self.dialog = Dialog(stack_reload_stmt_list)
 
     def call_service(self,
@@ -82,6 +86,20 @@ def call_service(self,
             if not isinstance(append_error_pattern, list):
                 raise ValueError('append_error_pattern should be a list')
             self.error_pattern += append_error_pattern
+
+        # Connecting to the log handler to capture the buffer output
+        lb = UniconStreamHandler(self.log_buffer)
+        lb.setFormatter(logging.Formatter(fmt=UNICON_LOG_FORMAT))
+        self.connection.log.addHandler(lb)
+
+        # logging the output to subconnections
+        for subcon in self.connection.subconnections:
+            subcon.log.addHandler(lb)
+
+        # Clear log buffer
+        self.log_buffer.seek(0)
+        self.log_buffer.truncate()
+
         # update all subconnection context with image_to_boot
         if image_to_boot:
             for subconn in self.connection.subconnections:
@@ -243,12 +261,23 @@ def boot(con):
         self.connection.connection_provider.init_connection()
 
         self.connection.log.info("+++ Reload Completed Successfully +++")
+
+        # Read the log buffer 
+        self.log_buffer.seek(0)
+        reload_output = self.log_buffer.read()
+        # clear buffer
+        self.log_buffer.truncate()
+
+        # Remove the handler
+        self.connection.log.removeHandler(lb)
+        for subcon in self.connection.subconnections:
+            subcon.log.removeHandler(lb)
+
         self.result = True
 
         if return_output:
             Result = namedtuple('Result', ['result', 'output'])
-            self.result = Result(self.result, reload_cmd_output.match_output.replace(reload_cmd, '', 1))
-
+            self.result = Result(self.result, reload_output.replace(reload_cmd, '', 1))
 
 class SVLStackSwitchover(BaseService):
     """ Get Rp state
@@ -355,3 +384,4 @@ def call_service(self, command=None,
         else:
             self.connection.log.info('Switchover failed')
             self.result = False
+

src/unicon/plugins/iosxe/cat9k/service_implementation.py

@@ -41,6 +41,8 @@ def call_service(self, *args, **kwargs):
         # assume the device is in rommon if image_to_boot is passed
         # update reload command to use rommon boot syntax
         if "image_to_boot" in kwargs:
+            if 'rommon_vars' in kwargs and self.connection.state_machine.current_state == 'rommon':
+                self.connection.execute([f'set {k}={v}' for k, v in kwargs['rommon_vars'].items()])
             self.context["image_to_boot"] = kwargs["image_to_boot"]
             reload_command = "boot {}".format(
                 self.context['image_to_boot']).strip()
@@ -63,6 +65,9 @@ def __init__(self, connection, context, **kwargs):
 
     def pre_service(self, *args, **kwargs):
         if "image_to_boot" in kwargs:
+            if 'rommon_vars' in kwargs and all(con.state_machine.current_state == 'rommon' for con in self.connection._subconnections):
+                for con in self.connection._subconnections:
+                    con.execute([f'set {k}={v}' for k, v in kwargs['rommon_vars'].items()])
             self.start_state = 'rommon'
             if 'image_to_boot' in self.context:
                 self.context['orig_image_to_boot'] = self.context['image_to_boot']