Skip to content

Commit

Permalink
Merge pull request #423 from ktbyers/develop
Browse files Browse the repository at this point in the history
Netmiko 1.3.0 Release
  • Loading branch information
ktbyers authored Mar 24, 2017
2 parents 59d0c2d + 88f968c commit 23ff444
Show file tree
Hide file tree
Showing 56 changed files with 979 additions and 166 deletions.
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ python:
- "2.7"
- "3.4"
- "3.5"
before_install:
- openssl aes-256-cbc -K $encrypted_25c51ccabb0e_key -iv $encrypted_25c51ccabb0e_iv -in travis_test_env.tar.enc -out travis_test_env.tar -d
- tar xvf travis_test_env.tar
#before_install:
# - openssl aes-256-cbc -K $encrypted_25c51ccabb0e_key -iv $encrypted_25c51ccabb0e_iv -in travis_test_env.tar.enc -out travis_test_env.tar -d
# - tar xvf travis_test_env.tar
install:
- pip install -r requirements-dev.txt
script:
#- python travis_test.py
- pylama .
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ pytest (for unit tests)
Arista vEOS
Cisco ASA
Cisco IOS
Cisco IOS-XE
Cisco IOS-XR
Cisco NX-OS
Cisco SG300
HP Comware7
HP ProCurve
Expand All @@ -36,12 +38,13 @@ Avaya VSP
Brocade VDX
Brocade ICX/FastIron
Brocade MLX/NetIron
Cisco IOS-XE
Cisco NX-OS
Cisco WLC
Dell-Force10 DNOS9
Dell PowerConnect
Huawei
Mellanox
Palo Alto PAN-OS
Pluribus
Vyatta VyOS

###### Experimental
Expand Down
4 changes: 2 additions & 2 deletions VENDOR.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,5 @@ See netmiko/tests/test_cisco_ios.py and netmiko/tests/test_cisco_ios_enable.py.



Note, you will also need to update the 'packages' section of 'setup.py' file if you are adding a
completely new package.
# Note, you will also need to update the 'packages' section of 'setup.py' file if you are adding a
# completely new package.
7 changes: 5 additions & 2 deletions netmiko/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,25 @@

from netmiko.ssh_dispatcher import ConnectHandler
from netmiko.ssh_dispatcher import ssh_dispatcher
from netmiko.ssh_dispatcher import redispatch
from netmiko.ssh_dispatcher import platforms
from netmiko.scp_handler import SCPConn
from netmiko.scp_handler import FileTransfer
from netmiko.scp_handler import InLineTransfer
from netmiko.ssh_exception import NetMikoTimeoutException
from netmiko.ssh_exception import NetMikoAuthenticationException
from netmiko.ssh_autodetect import SSHDetect

# Alternate naming
NetmikoTimeoutError = NetMikoTimeoutException
NetmikoAuthError = NetMikoAuthenticationException

__version__ = '1.2.8'
__version__ = '1.3.0'

__all__ = ('ConnectHandler', 'ssh_dispatcher', 'platforms', 'SCPConn', 'FileTransfer',
'NetMikoTimeoutException', 'NetMikoAuthenticationException',
'NetmikoTimeoutError', 'NetmikoAuthError', 'InLineTransfer')
'NetmikoTimeoutError', 'NetmikoAuthError', 'InLineTransfer', 'redispatch',
'SSHDetect')

# Cisco cntl-shift-six sequence
CNTL_SHIFT_6 = chr(30)
1 change: 1 addition & 0 deletions netmiko/a10/a10_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ class A10SSH(CiscoSSHConnection):
"""A10 support."""
def session_preparation(self):
"""A10 requires to be enable mode to disable paging."""
self._test_channel_read()
self.set_base_prompt()
self.enable()
self.disable_paging(command="terminal length 0\n")
Expand Down
1 change: 1 addition & 0 deletions netmiko/alcatel/alcatel_sros_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
class AlcatelSrosSSH(CiscoSSHConnection):
"""Alcatel-Lucent SROS support."""
def session_preparation(self):
self._test_channel_read()
self.set_base_prompt()
self.disable_paging(command="environment no more\n")

Expand Down
10 changes: 1 addition & 9 deletions netmiko/arista/arista_ssh.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
from __future__ import unicode_literals
import time
from netmiko.cisco_base_connection import CiscoSSHConnection


class AristaSSH(CiscoSSHConnection):
def session_preparation(self):
"""Prepare the session after the connection has been established."""
self._test_channel_read(pattern=r'[>#]')
self.set_base_prompt()
self.disable_paging()
self.set_terminal_width(command='terminal width 511')

def special_login_handler(self, delay_factor=1):
"""
Arista adds a "Last login: " message that doesn't always have sufficient time to be handled
"""
delay_factor = self.select_delay_factor(delay_factor)
time.sleep(3 * delay_factor)
self.clear_buffer()

def check_config_mode(self, check_string=')#', pattern=''):
"""
Checks if the device is in configuration mode or not.
Expand Down
1 change: 1 addition & 0 deletions netmiko/aruba/aruba_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ def session_preparation(self):
"""Aruba OS requires enable mode to disable paging."""
delay_factor = self.select_delay_factor(delay_factor=0)
time.sleep(1 * delay_factor)
self._test_channel_read()
self.set_base_prompt()
self.enable()
self.disable_paging(command="no paging")
Expand Down
1 change: 1 addition & 0 deletions netmiko/avaya/avaya_vsp_ssh.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ class AvayaVspSSH(CiscoSSHConnection):
"""Avaya Virtual Services Platform Support."""
def session_preparation(self):
"""Prepare the session after the connection has been established."""
self._test_channel_read()
self.set_base_prompt()
self.disable_paging(command="terminal more disable\n")
Loading

0 comments on commit 23ff444

Please sign in to comment.