Merge pull request #314 from networktocode/develop

Release 2.0.1

Author: jeffkala

docs/admin/release_notes/version_2_0.md

@@ -12,3 +12,11 @@
 - [308](https://github.com/networktocode/pyntc/pull/308) Deprecated netmiko argument `delay_factor` in favor of `read_timeout` as per changes in Netmiko 4.0.
 
   Refer to this blog post for more info about changes in netmiko 4.0: https://pynet.twb-tech.com/blog/netmiko-read-timeout.html
+
+
+## [2.0.1] 09-2024
+### Added
+- [311](https://github.com/networktocode/pyntc/pull/311) Extend cisco_ios set_boot_options method.
+
+### Fixed
+- [312](https://github.com/networktocode/pyntc/pull/312) Fix Arista EOS file copy issues.

poetry.lock

@@ -156,7 +156,7 @@ def _get_ipv4_addresses(self, host: str) -> Dict[str, List[IPv4Address]]:
         elif host == "peer":
             command = "failover exec mate show ip address"
 
-        show_ip_address = self.show(command)
+        show_ip_address = self.show(command)  # pylint: disable=possibly-used-before-assignment
         re_ip_addresses = RE_SHOW_IP_ADDRESS.findall(show_ip_address)
 
         results = {
@@ -188,7 +188,7 @@ def _get_ipv6_addresses(self, host: str) -> Dict[str, List[IPv6Address]]:
         elif host == "peer":
             command = "failover exec mate show ipv6 interface"
 
-        show_ipv6_interface = self.show(command)
+        show_ipv6_interface = self.show(command)  # pylint: disable=possibly-used-before-assignment
         show_ipv6_interface_lines: List[str] = show_ipv6_interface.strip().splitlines()
         first_line = show_ipv6_interface_lines.pop(0)
         interface: str = first_line.split()[0]

pyntc/devices/asa_device.py

@@ -73,7 +73,10 @@ def __init__(self, host, username, password, transport="http", port=None, timeou
         self._connected = False
         log.init(host=host)
 
-    def _file_copy_instance(self, src, dest=None, file_system="flash:"):
+    def _file_copy_instance(self, src, dest=None, file_system="/mnt/flash"):
+        # "flash:" is only valid locally, "/mnt/flash" is used externally
+        if file_system == "flash:":
+            file_system = "/mnt/flash"
         if dest is None:
             dest = os.path.basename(src)
 
@@ -175,7 +178,7 @@ def boot_options(self):
             dict: Key is ``sys`` with value being the image on the device.
         """
         image = self.show("show boot-config")["softwareImage"]
-        image = image.replace("flash:", "")
+        image = image.replace("flash:/", "")
         log.debug("Host %s: the boot options are %s", self.host, {"sys": image})
         return {"sys": image}
 
@@ -375,7 +378,7 @@ def file_copy(self, src, dest=None, file_system=None):
             file_copy = self._file_copy_instance(src, dest, file_system=file_system)
 
             try:
-                file_copy.enable_scp()
+                # file_copy.enable_scp()
                 file_copy.establish_scp_conn()
                 file_copy.transfer_file()
                 log.info("Host %s: File %s transferred successfully.", self.host, src)

pyntc/devices/eos_device.py

@@ -1029,6 +1029,11 @@ def set_boot_options(self, image_name, **vendor_specifics):
             ):  # TODO: Update to CommandError when deprecating config_list
                 command = f"boot system switch all {file_system}{image_name}"
                 self.config(["no boot system", command])
+
+            # If boot system is not found in the running config, but it exists in show boot or show bootvar
+            elif self.boot_options["sys"]:
+                command = f"boot system {file_system}/{image_name}"
+                self.config(command)
             else:
                 raise CommandError(
                     command=command,

pyntc/devices/ios_device.py

@@ -1,4 +1,5 @@
 """Module for using a Cisco IOSXE WLC device over SSH."""
+
 import time
 
 from pyntc import log

pyntc/devices/iosxewlc_device.py

@@ -1,4 +1,5 @@
 """Module for using a Juniper junOS device."""
+
 import hashlib
 import os
 import re

pyntc/devices/jnpr_device.py

@@ -1,4 +1,5 @@
 """Module for using an NXOS device over NX-API."""
+
 import os
 import re
 import time

pyntc/devices/nxos_device.py

@@ -1,4 +1,5 @@
 """Base Vlan checks."""
+
 from pyntc.errors import NTCError
 
 from ..base_feature import BaseFeature

pyntc/devices/system_features/vlans/base_vlans.py

@@ -1,4 +1,5 @@
 """pyntc custom exceptions."""
+
 import warnings