From ca6d8efd7d090434bd91a4a24b0dfa4e1d46ee69 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 20 Dec 2018 15:27:37 +0100
Subject: [PATCH] added ssh username to external config
---
inventory_provider/config.py | 1 +
inventory_provider/juniper.py | 2 +-
inventory_provider/pyez_test.py | 2 +-
test/conftest.py | 1 +
test/data/update_netconf_data.py | 2 +-
test/data/update_test_data.py | 5 +++--
6 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/inventory_provider/config.py b/inventory_provider/config.py
index 101f60e3..5dd0019a 100644
--- a/inventory_provider/config.py
+++ b/inventory_provider/config.py
@@ -31,6 +31,7 @@ CONFIG_SCHEMA = {
"ssh": {
"type": "object",
"properties": {
+ "username": {"type": "string"},
"private-key": {"type": "string"},
"known-hosts": {"type": "string"}
},
diff --git a/inventory_provider/juniper.py b/inventory_provider/juniper.py
index d801c8d3..b63adf50 100644
--- a/inventory_provider/juniper.py
+++ b/inventory_provider/juniper.py
@@ -60,7 +60,7 @@ def ssh_connection(hostname, ssh_params):
ssh.load_host_keys(known_hosts)
ssh.connect(
hostname=hostname,
- username="Monit0r",
+ username=ssh_params['username'],
pkey=k)
yield ssh
diff --git a/inventory_provider/pyez_test.py b/inventory_provider/pyez_test.py
index e62495e5..00813413 100644
--- a/inventory_provider/pyez_test.py
+++ b/inventory_provider/pyez_test.py
@@ -9,7 +9,7 @@ def load_config(hostname, ssh_params):
dev = Device(
host=hostname,
- user="Monit0r",
+ user=ssh_params['username'],
ssh_private_key_file=ssh_params['private-key'])
dev.open()
# data = dev.rpc.get_config(options={'format': 'json'})
diff --git a/test/conftest.py b/test/conftest.py
index 2789c343..1a9764c3 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -88,6 +88,7 @@ def data_config_filename(tmp_dir_name):
tmp_dir_name,
"routers_community.conf"),
"ssh": {
+ "username": "uSeR-NaMe",
"private-key": "private-key-filename",
"known-hosts": "known-hosts=filename"
},
diff --git a/test/data/update_netconf_data.py b/test/data/update_netconf_data.py
index 1975f94d..e6c766ee 100644
--- a/test/data/update_netconf_data.py
+++ b/test/data/update_netconf_data.py
@@ -10,7 +10,7 @@ def _load_netconf(hostname, ssh_params):
dev = Device(
host=hostname,
- user="Monit0r",
+ user=ssh_params['username'],
ssh_private_key_file=ssh_params['private-key'])
dev.open()
print(dev.facts)
diff --git a/test/data/update_test_data.py b/test/data/update_test_data.py
index d8ee14cd..393877a7 100644
--- a/test/data/update_test_data.py
+++ b/test/data/update_test_data.py
@@ -18,8 +18,9 @@ SSH_DIR = os.path.join(
"ssh")
SSH_PARAMS = {
- "private-key": os.path.join(SSH_DIR, "monitor_dsa"),
- "known-hosts": os.path.join(SSH_DIR, "monitor_known_hosts")
+ 'username': 'Monit0r',
+ 'private-key': os.path.join(SSH_DIR, 'monitor_dsa'),
+ 'known-hosts': os.path.join(SSH_DIR, 'monitor_known_hosts')
}
SHELL_COMMANDS = []
--
GitLab