From e775695a38c641de4f0efa044c96fd2b960f4bc4 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 11 Oct 2019 16:35:56 +0200
Subject: [PATCH] try raising a built-in error rather than juniper ez class
---
inventory_provider/juniper.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/inventory_provider/juniper.py b/inventory_provider/juniper.py
index d7eca477..ef0b5ee0 100644
--- a/inventory_provider/juniper.py
+++ b/inventory_provider/juniper.py
@@ -3,6 +3,7 @@ import re
import ipaddress
from jnpr.junos import Device
+from jnpr.junos import exception as EzErrors
from lxml import etree
import netifaces
import requests
@@ -156,7 +157,10 @@ def _rpc(hostname, ssh):
host=hostname,
user=ssh['username'],
ssh_private_key_file=ssh['private-key'])
- dev.open()
+ try:
+ dev.open()
+ except EzErrors.ConnectError as e:
+ raise ConnectionError(str(e))
return dev.rpc
--
GitLab