From c76ee7bc9e3929a72337c2e8ec848d4646b1aa57 Mon Sep 17 00:00:00 2001 From: Jeremy Schulman Date: Mon, 30 Dec 2013 09:56:40 -0500 Subject: [PATCH] updates --- examples/connect.py | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/examples/connect.py b/examples/connect.py index b60cf7fc5..a06b536b5 100644 --- a/examples/connect.py +++ b/examples/connect.py @@ -1,36 +1,12 @@ import sys from pprint import pprint as pp import jnpr.junos as junos - -# if len(sys.argv) < 3: -# # argv[1] = user-name -# # argv[2] = host-name -# print "you must provide a Junos user and target hostname" -# sys.exit(1) - -def sshconf_find(host): - import os, paramiko - - # going to use paramiko SSHConfig to retrieve the port parameters for a given - # host. Doing this because I tend to use jumphosts to get to devices behind - # firewalls/etc. This is a pretty useful technique to illustrate: - config_file = os.path.join(os.getenv('HOME'),'.ssh/config') - ssh_config = paramiko.SSHConfig() - ssh_config.parse(open(config_file,'r')) - return ssh_config.lookup( host ) +from os import getenv def connect(host, user, password=None): - from getpass import getpass - - got_lkup = sshconf_find( host ) + from getpass import getpass if password is None: password = getpass('password: ') - - login = dict( - host=got_lkup['hostname'], - port=got_lkup.get('port',830), - user=user, password=password - ) - return junos.Device(**login).open() + return junos.Device(host, user=user, password=password).open() if len(sys.argv) > 1: dev = connect(sys.argv[2], sys.argv[1])