merge conflict

PLATFORMS.md

@@ -3,7 +3,6 @@
 ###### Regularly tested
 
 - Arista vEOS
-- Cisco ASA
 - Cisco IOS
 - Cisco IOS-XE
 - Cisco IOS-XR
@@ -17,19 +16,22 @@
 
 - 6Wind
 - Adtran OS
-- Adva AOS FSP150
+- Adva AOS FSP150 F2 & F3
 - Alcatel AOS6/AOS8
 - Apresia Systems AEOS
 - AudioCodes Gateways & Controllers
 - Broadcom ICOS
 - Calix B6
 - Centec Networks
 - Cisco AireOS (Wireless LAN Controllers)
+- Cisco ASA
+- Cisco S200
 - CloudGenix ION
 - Dell OS9 (Force10)
 - Dell OS10
 - Dell PowerConnect
 - Ericsson IPOS
+- Ericsson MINI-LINK 66XX & 63XX
 - Extreme ERS (Avaya)
 - Extreme MLX/NetIron (Brocade/Foundry)
 - Extreme TierraOS
@@ -55,6 +57,7 @@
 - Ruckus ICX/FastIron
 - Ruijie Networks
 - Supermicro SMIS
+- Teldat CIT
 - TPLink JetStream
 - Ubiquiti EdgeSwitch
 - Vyatta VyOS
@@ -118,6 +121,9 @@
 - aruba_os
 - aruba_osswitch
 - aruba_procurve
+- audiocode_66
+- audiocode_72
+- audiocode_shell
 - avaya_ers
 - avaya_vsp
 - broadcom_icos
@@ -137,6 +143,7 @@
 - cisco_ftd
 - cisco_ios
 - cisco_nxos
+- cisco_s200
 - cisco_s300
 - cisco_tp
 - cisco_viptela
@@ -159,6 +166,8 @@
 - endace
 - enterasys
 - ericsson_ipos
+- ericsson_mltn63
+- ericsson_mltn66
 - extreme
 - extreme_ers
 - extreme_exos
@@ -182,6 +191,7 @@
 - huawei
 - huawei_olt
 - huawei_smartax
+- huawei_vrp
 - huawei_vrpv8
 - ipinfusion_ocnos
 - juniper
@@ -199,8 +209,8 @@
 - netapp_cdot
 - netgear_prosafe
 - netscaler
-- nokia_sros
 - nokia_srl
+- nokia_sros
 - oneaccess_oneos
 - ovs_linux
 - paloalto_panos
@@ -213,6 +223,7 @@
 - sixwind_os
 - sophos_sfos
 - supermicro_smis
+- teldat_cit
 - tplink_jetstream
 - ubiquiti_edge
 - ubiquiti_edgerouter
@@ -231,13 +242,17 @@
 - apresia_aeos_telnet
 - arista_eos_telnet
 - aruba_procurve_telnet
+- audiocode_72_telnet
+- audiocode_66_telnet
+- audiocode_shell_telnet
 - brocade_fastiron_telnet
 - brocade_netiron_telnet
 - calix_b6_telnet
 - centec_os_telnet
 - ciena_saos_telnet
 - cisco_ios_telnet
 - cisco_xr_telnet
+- cisco_s200_telnet
 - cisco_s300_telnet
 - dell_dnos6_telnet
 - dell_powerconnect_telnet
@@ -261,6 +276,7 @@
 - ruckus_fastiron_telnet
 - ruijie_os_telnet
 - supermicro_smis_telnet
+- teldat_cit_telnet
 - tplink_jetstream_telnet
 - yamaha_telnet
 - zte_zxros_telnet
@@ -279,4 +295,4 @@
 - juniper_junos
 - linux
 - nokia_sros
-
+- ubiquiti_edgerouter

_release.sh

@@ -20,7 +20,7 @@ while true; do
     esac
 done
 
-pylama
+pylama .
 if [ $? -eq 0 ]; then
     echo
     echo "pylama ... [OK]"
@@ -32,7 +32,7 @@ else
 fi
 
 echo
-python setup.py sdist bdist_wheel > /dev/null
+poetry build > /dev/null
 if [ $? -eq 0 ]; then
     echo "creating distribution ... [OK]"
     ls -ltr $DIR_PACKAGE

release_process.txt

@@ -13,13 +13,13 @@ $ pdoc3 --html --output-dir docs netmiko --force
 
 # Merge into master / checkout master (use PR in GitHub for this)
 
-# python setup.py sdist bdist_wheel
+# poetry build
 
 # Run ./_release.sh
 
 # Create a tag for the version
-git tag -a v4.1.0 -m "Version 4.1.0 Release"
-git push origin_ssh v4.1.0
+git tag -a v4.2.0 -m "Version 4.2.0 Release"
+git push origin_ssh v4.2.0
 
 # Make sure to run the performance tests for the new release and to update the graphs!
 

tests/performance/netmiko_performance.csv

@@ -68,5 +68,11 @@ date,netmiko_version,device_name,connect,send_command_simple,send_config_simple,
 2022-4-27 14:26:2,4.1.0,arista1,0:00:01.788259,0:00:02.563968,0:00:02.715299,0:00:28.072290
 2022-4-27 14:26:34,4.1.0,juniper_vmx,0:00:03.491516,0:00:03.979298,0:00:03.606049,0:00:17.841704
 2022-4-27 14:29:21,4.1.0,hp_procurve,0:00:01.873823,0:00:02.322253,0:00:02.099819,0:00:10.649204
-2022-5-20 11:38:5,4.1.0,linux_srv1,0:00:03.349217,0:00:03.523378,0:00:04.188625,0:00:10.252565
-2022-5-20 13:8:5,4.1.1-a1,linux_srv1,0:00:01.082305,0:00:01.244256,0:00:01.651606,0:00:07.775715
+2023-5-5 10:41:36,4.2.0,cisco1,0:00:00.950239,0:00:01.018443,0:00:01.222409,0:00:04.190270
+2023-5-5 10:41:49,4.2.0,cisco3,0:00:00.794856,0:00:00.889877,0:00:00.923853,0:00:09.778762
+2023-5-5 10:42:7,4.2.0,cisco5,0:00:01.488929,0:00:01.200243,0:00:01.568345,0:00:12.064722
+2023-5-5 10:42:50,4.2.0,nxos1,0:00:02.870104,0:00:02.917957,0:00:04.182973,0:00:28.401443
+2023-5-5 10:43:12,4.2.0,cisco_xr_azure,0:00:02.106241,0:00:02.385522,0:00:03.130367,0:00:11.635060
+2023-5-5 10:43:22,4.2.0,arista1,0:00:00.959298,0:00:01.146205,0:00:01.126909,0:00:05.723498
+2023-5-5 10:43:55,4.2.0,juniper_vmx,0:00:03.352394,0:00:03.991835,0:00:03.718561,0:00:18.232042
+2023-5-5 10:46:42,4.2.0,hp_procurve,0:00:01.922824,0:00:02.093454,0:00:02.080615,0:00:10.503179

tests/performance/performance_report.md

@@ -1,10 +1,10 @@
 
 # Netmiko performance
 ![](graphs/netmiko_arista_eos.svg)
-![](graphs/netmiko_cisco_xr.svg)
-![](graphs/netmiko_cisco_xe.svg)
-![](graphs/netmiko_cisco_ios.svg)
 ![](graphs/netmiko_cisco_asa.svg)
-![](graphs/netmiko_juniper_junos.svg)
+![](graphs/netmiko_cisco_ios.svg)
 ![](graphs/netmiko_cisco_nxos.svg)
-![](graphs/netmiko_hp_procurve.svg)
+![](graphs/netmiko_cisco_xe.svg)
+![](graphs/netmiko_cisco_xr.svg)
+![](graphs/netmiko_hp_procurve.svg)
+![](graphs/netmiko_juniper_junos.svg)

tests/performance/requirements.txt

@@ -1,3 +1,2 @@
-pyaml
 pygal
 jinja2

tests/performance/test_netmiko.py

@@ -176,10 +176,8 @@ def main():
     for dev_name, params in devices.items():
         remove_old_data(dev_name)
         dev_dict = params["device"]
-        if dev_name != "linux_srv1":
+        if dev_name == "linux_srv1":
             continue
-        # if dev_name != "cisco_xr_azure":
-        #    continue
         print("-" * 80)
         print(f"Device name: {dev_name}")
         print("-" * 12)

tests/performance/test_performance.sh

@@ -2,7 +2,7 @@
 
 export PYTHONPATH=~/netmiko/tests
 
-pip show pyaml pygal jinja2
+pip show pygal jinja2
 if [ $? -eq 0 ]; then
     echo
     echo "Checking dependencies ... [OK]"