commit dcdedd884fa2d80491f4ea8bc0e74ee4137c9ef3
author Pavel Cizinsky <pcizinsky@mirantis.com> Mon Mar 18 09:13:42 2019 +0000
committer Gerrit Code Review <mail@domain.com> Mon Mar 18 09:13:42 2019 +0000
tree 9c5a196b6e1013730018caf6ab983f883f5a5e62
parent 950f88e83aca95c507deece1646ba2054c284460
parent 1b3624a5b6825699df6ad8c57b539c5b575f8c74

Merge "Drop testing of SaltStack 2016.3"

_modules/netutils.py

diff --git a/_modules/netutils.py b/_modules/netutils.py
index 6cc8e83..2be6079 100644
--- a/_modules/netutils.py
+++ b/_modules/netutils.py
@@ -1,10 +1,17 @@
 from itertools import chain
-from netaddr import iter_iprange, IPAddress, IPNetwork
+
+try:
+    from netaddr import iter_iprange, IPAddress, IPNetwork
+    HAS_NETADDR = True
+except ImportError:
+    HAS_NETADDR = False
 
 __virtualname__ = 'netutils'
 
 
 def __virtual__():
+    if not HAS_NETADDR:
+        return False, "'netaddr' python library is unavailable"
     return __virtualname__
 
 

_modules/reclass.py

diff --git a/_modules/reclass.py b/_modules/reclass.py
index 46b2b86..e9880c5 100644
--- a/_modules/reclass.py
+++ b/_modules/reclass.py
@@ -364,7 +364,7 @@
                 file_read = yaml.load(file_handle.read())
             file_data = file_read or {}
             classes = file_data.get('classes', [])
-            parameters = file_data.get('parameters', {}).get('_param', [])
+            parameters = file_data.get('parameters', {}).get('_param', {})
             name = fl.replace('.yml', '')
             host_name = name.split('.')[0]
             domain_name = '.'.join(name.split('.')[1:])