Releasing v24.4

.github/workflows/run_tests.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.8, 3.9, '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v2

pkgs/clean-pkg/changelog/2024/april.rst

@@ -0,0 +1,16 @@
+--------------------------------------------------------------------------------
+                                      Fix                                       
+--------------------------------------------------------------------------------
+
+* iosxe
+    * Change logic for copy_to_device to check for local file size before trying from remote server
+
+
+--------------------------------------------------------------------------------
+                                      New                                       
+--------------------------------------------------------------------------------
+
+* iosxe
+    * Added new clean stage `reset_configuration`
+
+

pkgs/clean-pkg/src/genie/libs/clean/__init__.py

@@ -8,13 +8,13 @@
 '''
 
 # metadata
-__version__ = '24.3'
+__version__ = '24.4'
 __author__ = 'Cisco Systems Inc.'
 __contact__ = ['asg-genie-support@cisco.com', 'pyats-support-ext@cisco.com']
 __copyright__ = 'Copyright (c) 2019, Cisco Systems Inc.'
 
 
 from genie import abstract
-abstract.declare_package(__name__)
+abstract.declare_package(feature="clean")
 
 from .clean import DeviceClean, PyatsDeviceClean, BaseStage

pkgs/clean-pkg/src/genie/libs/clean/recovery/iosxe/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='iosxe')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/iosxe/cat3k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat3k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/iosxe/sdwan/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='sdwan')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/iosxr/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='iosxr')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/nxos/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='nxos')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/nxos/n3k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='n3k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/nxos/n7k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='n7k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/nxos/n9k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='n9k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/recovery/recovery.py

@@ -80,7 +80,7 @@ def _recovery_steps(device, clear_line=True, powercycler=True,
     if clear_line:
         log.info(banner("Clearing the console port line"))
         try:
-            device.api.execute_clear_line()
+            device.api.execute_clear_console()
         except Exception as e:
             log.warning(str(e))
             log.warning("Unable to clear console port line")

pkgs/clean-pkg/src/genie/libs/clean/stages/aireos/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='aireos')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/apic/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='apic')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/cheetah/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='cheetah')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/cheetah/ap/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='ap')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/ios/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='ios')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(os='iosxe')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat3k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat3k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat9k/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat9k')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/c9800/__init__.py → pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat9k/c9500/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat9k', model='c9500')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/c9800/c9800_cl/__init__.py → pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat9k/c9800/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat9k', model='c9800')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat9500/__init__.py → pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/cat9k/c9800_cl/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='cat9k', submodel='c9800_cl')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/sdwan/__init__.py

@@ -1,7 +1,7 @@
 # Enable abstraction using this directory name as the abstraction token
 try:
     from genie import abstract
-    abstract.declare_token(__name__)
+    abstract.declare_token(platform='sdwan')
 except Exception as e:
     import warnings
     warnings.warn('Could not declare abstraction token: ' + str(e))

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/sdwan/stages.py

@@ -594,10 +594,6 @@ def reload_check(device, target):
                 'device_managed_mode': device_managed_mode
             }
             try:
-                abstract = Lookup.from_device(device,
-                                              packages={'clean': clean})
-                # Item is needed to be able to know in which parallel child
-
                 # device.start only gets filled with single rp devices
                 # for multiple rp devices we need to use subconnections
                 if device.is_ha and hasattr(device, 'subconnections'):

pkgs/clean-pkg/src/genie/libs/clean/stages/iosxe/sdwan/tests/__init__.py

@@ -1,7 +0,0 @@
-# Enable abstraction using this directory name as the abstraction token
-try:
-    from genie import abstract
-    abstract.declare_token(__name__)
-except Exception as e:
-    import warnings
-    warnings.warn('Could not declare abstraction token: ' + str(e))