Merge branch 'develop' into arp-vrf

napalm/_SUPPORTED_DRIVERS.py

@@ -1,4 +1,5 @@
 SUPPORTED_DRIVERS = [
+    "base",
     "eos",
     "ios",
     "iosxr",

napalm/base/validate.py

@@ -48,7 +48,7 @@ def _compare_getter_list(src, dst, mode):
         i = 0
         while True:
             try:
-                intermediate_match = _compare_getter(src_element, dst[i])
+                intermediate_match = compare(src_element, dst[i])
                 if isinstance(intermediate_match, dict) and intermediate_match["complies"] or \
                    not isinstance(intermediate_match, dict) and intermediate_match:
                     found = True
@@ -79,7 +79,7 @@ def _compare_getter_dict(src, dst, mode):
         try:
             dst_element = dst.pop(key)
             result["present"][key] = {}
-            intermediate_result = _compare_getter(src_element, dst_element)
+            intermediate_result = compare(src_element, dst_element)
 
             if isinstance(intermediate_result, dict):
                 nested = True
@@ -111,7 +111,7 @@ def _compare_getter_dict(src, dst, mode):
     return result
 
 
-def _compare_getter(src, dst):
+def compare(src, dst):
     if isinstance(src, py23_compat.string_types):
         src = py23_compat.text_type(src)
 
@@ -127,7 +127,7 @@ def _compare_getter(src, dst):
 
     elif isinstance(src, py23_compat.string_types):
         if src.startswith('<') or src.startswith('>'):
-            cmp_result = compare_numeric(src, dst)
+            cmp_result = _compare_numeric(src, dst)
             return cmp_result
         else:
             m = re.search(src, py23_compat.text_type(dst))
@@ -147,7 +147,7 @@ def _compare_getter(src, dst):
         return src == dst
 
 
-def compare_numeric(src_num, dst_num):
+def _compare_numeric(src_num, dst_num):
     """Compare numerical values. You can use '<%d','>%d'."""
     dst_num = float(dst_num)
 
@@ -191,7 +191,7 @@ def compliance_report(cls, validation_file=None, validation_source=None):
                 try:
                     kwargs = expected_results.pop('_kwargs', {})
                     actual_results = getattr(cls, getter)(**kwargs)
-                    report[key] = _compare_getter(expected_results, actual_results)
+                    report[key] = compare(expected_results, actual_results)
                 except NotImplementedError:
                     report[key] = {"skipped": True, "reason": "NotImplemented"}
 

test/base/validate/test_unit.py

@@ -282,21 +282,21 @@ class TestValidate:
     @pytest.mark.parametrize('src, dst, result', _compare_getter)
     def test__compare_getter_list(self, src, dst, result):
         """Test for _compare_getter_list."""
-        assert validate._compare_getter(src, dst) == result
+        assert validate.compare(src, dst) == result
 
     def test_numeric_comparison(self):
-        assert validate.compare_numeric("<2", 1)
-        assert not validate.compare_numeric("<2", 3)
-        assert validate.compare_numeric("<=2", 2)
-        assert validate.compare_numeric("<3", "2")
-        assert validate.compare_numeric("!=3", "2")
+        assert validate._compare_numeric("<2", 1)
+        assert not validate._compare_numeric("<2", 3)
+        assert validate._compare_numeric("<=2", 2)
+        assert validate._compare_numeric("<3", "2")
+        assert validate._compare_numeric("!=3", "2")
         with pytest.raises(ValueError):
-            assert validate.compare_numeric("a2a", 2)
+            assert validate._compare_numeric("a2a", 2)
         with pytest.raises(ValueError):
-            assert validate.compare_numeric("<1a1", 2)
+            assert validate._compare_numeric("<1a1", 2)
         with pytest.raises(ValueError):
-            assert validate.compare_numeric("a<1", 2)
+            assert validate._compare_numeric("a<1", 2)
         with pytest.raises(ValueError):
-            assert validate.compare_numeric("<1", "asdasd2")
+            assert validate._compare_numeric("<1", "asdasd2")
         with pytest.raises(ValueError):
-            assert validate.compare_numeric("<1", "2asdasd")
+            assert validate._compare_numeric("<1", "2asdasd")

test/eos/utils/textfsm_templates

@@ -0,0 +1 @@
+../../../napalm/eos/utils/textfsm_templates

test/nxos/utils/textfsm_templates

@@ -0,0 +1 @@
+../../../napalm/nxos/utils/textfsm_templates

test/nxos_ssh/utils/textfsm_templates

@@ -0,0 +1 @@
+../../../napalm/nxos_ssh/utils/textfsm_templates