Merge pull request #68 from CiscoTestAutomation/release_22.10

Releasing v22.10
CiscoTestAutomation · Oct 31, 2022 · 4dda85a · 4dda85a
2 parents 7d80dc9 + 94f0016
commit 4dda85a
Show file tree

Hide file tree

Showing 17 changed files with 178 additions and 25 deletions.
diff --git a/docs/changelog/2022/august.rst b/docs/changelog/2022/august.rst
@@ -1,5 +1,38 @@
+August 2022
+==========
+
+August 30 - Unicon v22.8
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v22.8
+        ``unicon``, v22.8
+
+Install Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install unicon.plugins
+    bash$ pip install unicon
+
+Upgrade Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install --upgrade unicon.plugins
+    bash$ pip install --upgrade unicon
+
+Features and Bug Fixes:
+^^^^^^^^^^^^^^^^^^^^^^^
+
 --------------------------------------------------------------------------------
-                                      Fix                                       
+                                      Fix
 --------------------------------------------------------------------------------
 
 * connection parse_spawn_command

diff --git a/docs/changelog/2022/july.rst b/docs/changelog/2022/july.rst
@@ -1,16 +1,16 @@
-›July 2022
+July 2022
 ==========
 
-June 28 - Unicon v22.7 
+July 26 - Unicon v22.7
 ------------------------
 
 
 
 .. csv-table:: Module Versions
     :header: "Modules", "Versions"
 
-        ``unicon.plugins``, v22.7 
-        ``unicon``, v22.7 
+        ``unicon.plugins``, v22.7
+        ``unicon``, v22.7
 
 Install Instructions
 ^^^^^^^^^^^^^^^^^^^^

diff --git a/docs/changelog/2022/october.rst b/docs/changelog/2022/october.rst
diff --git a/docs/changelog/2022/september.rst b/docs/changelog/2022/september.rst
@@ -1,5 +1,38 @@
+September 2022
+==========
+
+September 27 - Unicon v22.9
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v22.9
+        ``unicon``, v22.9
+
+Install Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install unicon.plugins
+    bash$ pip install unicon
+
+Upgrade Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install --upgrade unicon.plugins
+    bash$ pip install --upgrade unicon
+
+Features and Bug Fixes:
+^^^^^^^^^^^^^^^^^^^^^^^
+
 --------------------------------------------------------------------------------
-                                      New                                       
+                                      New
 --------------------------------------------------------------------------------
 
 * connection base
@@ -8,7 +41,7 @@
 
 
 --------------------------------------------------------------------------------
-                                      Fix                                       
+                                      Fix
 --------------------------------------------------------------------------------
 
 * mock_device

diff --git a/docs/changelog/index.rst b/docs/changelog/index.rst
@@ -4,6 +4,8 @@ Changelog
 .. toctree::
    :maxdepth: 2
 
+   2022/september
+   2022/august
    2022/july
    2022/june
    2022/may

diff --git a/docs/changelog_plugins/2022/august.rst b/docs/changelog_plugins/2022/august.rst
@@ -1,5 +1,38 @@
+August 2022
+==========
+
+August 30 - Unicon.Plugins v22.8
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v22.8
+        ``unicon``, v22.8
+
+Install Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install unicon.plugins
+    bash$ pip install unicon
+
+Upgrade Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install --upgrade unicon.plugins
+    bash$ pip install --upgrade unicon
+
+Features and Bug Fixes:
+^^^^^^^^^^^^^^^^^^^^^^^
+
 --------------------------------------------------------------------------------
-                                      Fix                                       
+                                      Fix
 --------------------------------------------------------------------------------
 
 * generic

diff --git a/docs/changelog_plugins/2022/july.rst b/docs/changelog_plugins/2022/july.rst
@@ -1,16 +1,16 @@
-july 2022
+July 2022
 ==========
 
-July 26 - Unicon.Plugins v22.7 
+July 26 - Unicon.Plugins v22.7
 ------------------------
 
 
 
 .. csv-table:: Module Versions
     :header: "Modules", "Versions"
 
-        ``unicon.plugins``, v22.7 
-        ``unicon``, v22.7 
+        ``unicon.plugins``, v22.7
+        ``unicon``, v22.7
 
 Install Instructions
 ^^^^^^^^^^^^^^^^^^^^
@@ -38,7 +38,7 @@ Changelogs
 ^^^^^^^^^^
 
 --------------------------------------------------------------------------------
-                                      Fix                                       
+                                      Fix
 --------------------------------------------------------------------------------
 
 * general

diff --git a/docs/changelog_plugins/2022/october.rst b/docs/changelog_plugins/2022/october.rst
diff --git a/docs/changelog_plugins/2022/september.rst b/docs/changelog_plugins/2022/september.rst
@@ -1,5 +1,38 @@
+September 2022
+==========
+
+September 27 - Unicon.Plugins v22.9
+------------------------
+
+
+
+.. csv-table:: Module Versions
+    :header: "Modules", "Versions"
+
+        ``unicon.plugins``, v22.9
+        ``unicon``, v22.9
+
+Install Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install unicon.plugins
+    bash$ pip install unicon
+
+Upgrade Instructions
+^^^^^^^^^^^^^^^^^^^^
+
+.. code-block:: bash
+
+    bash$ pip install --upgrade unicon.plugins
+    bash$ pip install --upgrade unicon
+
+Features and Bug Fixes:
+^^^^^^^^^^^^^^^^^^^^^^^
+
 --------------------------------------------------------------------------------
-                                      Fix                                       
+                                      Fix
 --------------------------------------------------------------------------------
 
 * generic

diff --git a/docs/changelog_plugins/index.rst b/docs/changelog_plugins/index.rst
@@ -4,6 +4,8 @@ Plugins Changelog
 .. toctree::
    :maxdepth: 2
 
+   2022/september
+   2022/august
    2022/july
    2022/june
    2022/may

diff --git a/docs/user_guide/services/generic_services.rst b/docs/user_guide/services/generic_services.rst
@@ -478,7 +478,7 @@ This service takes no arguments.
 
 expect_log
 ----------
-This service is removed. Please use Connection logger setLevel API 
+This service is removed. Please use Connection logger setLevel API
 to enable/disable internal debug logging.
 
 .. code-block:: python
@@ -1283,9 +1283,9 @@ reload
 
 Service to reload the quad rp device.
 
-===============         =======================     ========================================
+====================    =======================     ========================================
 Argument                Type                        Description
-===============         =======================     ========================================
+====================    =======================     ========================================
 reload_command          str                         reload command to be issued on device.
                                                     default reload_command is "reload"
 reply                   Dialog                      additional dialogs/new dialogs which are not handled by default.

diff --git a/src/unicon/plugins/__init__.py b/src/unicon/plugins/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '22.9'
+__version__ = '22.10'
 
 supported_chassis = [
     'single_rp',

diff --git a/src/unicon/plugins/generic/patterns.py b/src/unicon/plugins/generic/patterns.py
@@ -64,7 +64,10 @@ def __init__(self):
         # *Sep 6 23:18:11.702: %ENVIRONMENTAL-1-ALERT: Temp: Inlet 1, Location: R0, State: Warning, Reading: 45 Celsius
         # *Sep 6 17:43:41.291: %Cisco-SDWAN-RP_0-CFGMGR-4-WARN-300005: New admin password not set yet, waiting for daemons to read initial config.
         # Guestshell destroyed successfully
-        self.syslog_message_pattern = r'^.*?(%\w+(-\S+)?-\d+-\w+|Guestshell destroyed successfully).*$'
+        # %Error opening tftp://255.255.255.255/network-confg (Timed out)
+        # %Error opening tftp://255.255.255.255/cisconet.cfg (Timed out)
+        # %Error opening tftp://255.255.255.255/switch-confg (Timed out)
+        self.syslog_message_pattern = r'^.*?(%\w+(-\S+)?-\d+-\w+|Guestshell destroyed successfully|%Error opening tftp:\/\/255\.255\.255\.255).*$'
 
         self.config_locked = r'Configuration (mode )?(is )?locked|Config mode cannot be entered'
 

diff --git a/src/unicon/plugins/nxos/nxosv/patterns.py b/src/unicon/plugins/nxos/nxosv/patterns.py
@@ -3,8 +3,3 @@
 class NxosvPatterns(NxosPatterns):
     def __init__(self):
         super().__init__()
-
-        # Relaxing this prompt, saw the following line in the nxosv log:
-        # switch# 2016 Sep 28 18:37:47 switch %PLATFORM-2-MOD_DETECT: Module 3 detected (Serial number TM0024CC3FD) Module-Type NX-OSv Ethernet Module Model N7K-F248XP-25
-        self.enable_prompt = r'^(.*?)(Router|Router-stby|Router-sdby|RouterRP|RouterRP-standby|%N-standby|%N\(standby\)|%N-sdby|(S|s)witch|(S|s)witch\(standby\)|Controller|ios|-Slot[0-9]+|%N)(\(boot\))*#.*$'
-
diff --git a/src/unicon/plugins/nxos/patterns.py b/src/unicon/plugins/nxos/patterns.py
@@ -9,7 +9,7 @@ class NxosPatterns(GenericPatterns):
     def __init__(self):
         super().__init__()
         self.enable_prompt = r'^(.*?)([Rr]outer|[Ss]witch|%N)(\(standby\))?(\(maint-mode\))?#\s?$'
-        self.config_prompt = r'^(?P<hostname00>.*)(\(maint-mode\))?\(.*(con|cfg|ipsec-profile)\S*\)#\s?$'
+        self.config_prompt = r'^(?P<hostname00>.*)(\(maint-mode\))?\(.*(con|cfg|ipsec-profile)\S*\)#[\s\x07]*$'
         self.debug_prompt = r'^(.*?)Linux\(debug\)#\s*$'
         self.sqlite_prompt = r'^(.*?)sqlite>\s*$'
         self.reboot = r'This command will reboot the system. \(y\/n\)\?  \[n\]'

diff --git a/src/unicon/plugins/tests/mock_data/iosxe/iosxe_mock_data.yaml b/src/unicon/plugins/tests/mock_data/iosxe/iosxe_mock_data.yaml
@@ -1205,6 +1205,13 @@ endless_syslog:
     "": "%MY-1-MSG: never ending message"
 
 
+error_opening_syslog:
+  prompt: "%Error opening tftp://255.255.255.255/network-confg (Timed out)"
+  commands:
+    "":
+      new_state: general_exec
+
+
 enable_reload_config_dialog:
   prompt: "%N#"
   commands:

diff --git a/src/unicon/plugins/tests/test_plugin_iosxe.py b/src/unicon/plugins/tests/test_plugin_iosxe.py
@@ -961,6 +961,18 @@ def test_syslog_handler_timeout(self):
         finally:
             c.disconnect()
 
+    def test_syslog_handler_error_opening_pattern(self):
+        d = Connection(
+            hostname='Router',
+            start=['mock_device_cli --os iosxe --state error_opening_syslog --hostname Router'],
+            os='iosxe',
+            credentials=dict(default=dict(username='cisco', password='cisco')),
+            log_buffer=True
+        )
+
+        d.connect()
+        d.disconnect()
+
     def test_syslog_handler_guestshell(self):
         c = Connection(
             hostname='PE1',
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ Changelog @@
     .. toctree::
        :maxdepth: 2
+/september
+/august
 /july
 /june
 /may
@@ Expand Down @@