Merge branch 'develop' into nokia_isam

Author: Noppes

MANIFEST.in

@@ -32,6 +32,7 @@
 - Dell OS9 (Force10)
 - Dell OS10
 - Dell PowerConnect
+- Ekinops 360
 - Ericsson IPOS
 - Ericsson MINI-LINK 66XX & 63XX
 - Extreme ERS (Avaya)
@@ -46,6 +47,7 @@
 - Huawei
 - Huawei OLT
 - Huawei SmartAX
+- Infinera Packet
 - IP Infusion OcNOS
 - Juniper ScreenOS
 - Maipu
@@ -79,19 +81,25 @@
 - Arris CER
 - Aruba OS (Wireless Controllers/WAPs)
 - Aruba AOS-CX
+- AsterFusion AsterNOS SONiC
 - Bintec BOSS (Bintec/Funkwerk)
 - Brocade Fabric OS
 - C-DOT CROS
 - Ciena SAOS
+- Ciena SAOS10
+- Ciena Waveserver
 - Citrix Netscaler
 - Cisco APIC (Linux)
 - Cisco Telepresence
 - Cisco Viptela
 - Check Point GAiA
+- Corelight Linux
 - Coriant
+- Cumulus VX Linux
 - Dell OS6
 - Dell EMC Isilon
 - Digi TransPort Routers
+- Edgecore SONiC
 - Eltex
 - Enterasys
 - Endace
@@ -100,9 +108,12 @@
 - Extreme SLX (Brocade)
 - F5 TMSH
 - F5 Linux
+- Fiberstore NetworkOS
+- Fiberstore FS-OS (V2)
 - Fortinet
 - Garderos GRS
 - Genexis Saturn SOLT33 (telnet only)
+- Lancom LCOS SX4
 - MRV Communications OptiSwitch
 - MRV LX
 - Nokia/Alcatel SR-OS
@@ -111,7 +122,9 @@
 - QuantaMesh
 - Rad ETX
 - Raisecom ROAP
+- Silver Peak VXOA
 - Sophos SFOS
+- Telco Systems BiNOS
 - Ubiquiti Unifi Switch
 - Versa Networks FlexVNF
 - Vertiv MPH Power Distribution Units
@@ -138,6 +151,7 @@
 - aruba_os
 - aruba_osswitch
 - aruba_procurve
+- asterfusion_asternos
 - audiocode_66
 - audiocode_72
 - audiocode_shell
@@ -157,6 +171,8 @@
 - centec_os
 - checkpoint_gaia
 - ciena_saos
+- ciena_saos10
+- ciena_waveserver
 - cisco_apic
 - cisco_asa
 - cisco_ftd
@@ -170,7 +186,9 @@
 - cisco_xe
 - cisco_xr
 - cloudgenix_ion
+- corelight_linux
 - coriant
+- cumulus_linux
 - dell_dnos9
 - dell_force10
 - dell_isilon
@@ -181,6 +199,8 @@
 - dell_sonic
 - digi_transport
 - dlink_ds
+- edgecore_sonic
+- ekinops_ek360
 - eltex
 - eltex_esr
 - endace
@@ -202,25 +222,31 @@
 - f5_ltm
 - f5_tmsh
 - fiberstore_fsos
+- fiberstore_fsosv2
+- fiberstore_networkos
 - flexvnf
 - fortinet
 - garderos_grs
 - generic
 - generic_termserver
+- h3c_comware
 - hillstone_stoneos
 - hp_comware
 - hp_procurve
 - huawei
 - huawei_olt
 - huawei_smartax
+- huawei_smartaxmmi
 - huawei_vrp
 - huawei_vrpv8
+- infinera_packet
 - ipinfusion_ocnos
 - juniper
 - juniper_junos
 - juniper_screenos
 - keymile
 - keymile_nos
+- lancom_lcossx4
 - linux
 - maipu
 - mellanox
@@ -229,6 +255,7 @@
 - mikrotik_switchos
 - mrv_lx
 - mrv_optiswitch
+- nec_ix
 - netapp_cdot
 - netgear_prosafe
 - netscaler
@@ -243,9 +270,11 @@
 - raisecom_roap
 - ruckus_fastiron
 - ruijie_os
+- silverpeak_vxoa
 - sixwind_os
 - sophos_sfos
 - supermicro_smis
+- telcosystems_binos
 - teldat_cit
 - tplink_jetstream
 - ubiquiti_edge
@@ -276,6 +305,7 @@
 - centec_os_telnet
 - ciena_saos_telnet
 - cisco_ios_telnet
+- cisco_nxos_telnet
 - cisco_s200_telnet
 - cisco_s300_telnet
 - cisco_xr_telnet
@@ -285,25 +315,30 @@
 - extreme_exos_telnet
 - extreme_netiron_telnet
 - extreme_telnet
+- fiberstore_fsosv2_telnet
 - generic_telnet
 - generic_termserver_telnet
 - genexis_solt33_telnet
 - hp_comware_telnet
 - hp_procurve_telnet
 - huawei_olt_telnet
 - huawei_telnet
+- infinera_packet_telnet
 - ipinfusion_ocnos_telnet
 - juniper_junos_telnet
 - maipu_telnet
+- nec_ix_telnet
 - nokia_sros_telnet
 - oneaccess_oneos_telnet
+- optilink_eolt11444_telnet
 - optilink_eolt9702_telnet
 - paloalto_panos_telnet
 - rad_etx_telnet
 - raisecom_telnet
 - ruckus_fastiron_telnet
 - ruijie_os_telnet
 - supermicro_smis_telnet
+- telcosystems_binos_telnet
 - teldat_cit_telnet
 - tplink_jetstream_telnet
 - yamaha_telnet
@@ -320,9 +355,11 @@
 - cisco_xe
 - cisco_xr
 - dell_os10
+- dell_sonic
 - extreme_exos
 - juniper_junos
 - linux
-- mikrotik_routeros
 - nokia_sros
+- mikrotik_routeros
 - ubiquiti_edgerouter
+

PLATFORMS.md

@@ -1,6 +1,6 @@
 import sys
 
-__version__ = "4.6.0"
+__version__ = "4.6.1"
 PY_MAJ_VER = 3
 PY_MIN_VER = 9
 MIN_PYTHON_VER = "3.9"

netmiko/__init__.py

@@ -178,16 +178,16 @@ def __init__(
         #       --> Auth response (auth_timeout)
         # For telnet 'conn_timeout' is mapped to main telnet timeout (which is used for both the
         # telnet connection and for other blocking operations).
-        conn_timeout: int = 10,
+        conn_timeout: float = 10,
         # Timeout to wait for authentication response
-        auth_timeout: Optional[int] = None,
-        banner_timeout: int = 15,  # Timeout to wait for the banner to be presented
+        auth_timeout: Optional[float] = None,
+        banner_timeout: float = 15,  # Timeout to wait for the banner to be presented
         # Other timeouts
-        blocking_timeout: int = 20,  # Read blocking timeout
+        blocking_timeout: float = 20,  # Read blocking timeout
         timeout: int = 100,  # TCP connect timeout | overloaded to read-loop timeout
-        session_timeout: int = 60,  # Used for locking/sharing the connection
+        session_timeout: float = 60,  # Used for locking/sharing the connection
         read_timeout_override: Optional[float] = None,
-        keepalive: int = 0,
+        keepalive: float = 0,
         default_enter: Optional[str] = None,
         response_return: Optional[str] = None,
         serial_settings: Optional[Dict[str, Any]] = None,