commit save

Author: lvrfrc87

netcompare/check_type.py

@@ -4,8 +4,6 @@
 from .evaluator import diff_generator
 from .runner import extract_values_from_output
 
-sys.path.append(".")
-
 
 class CheckType:
     """Check Type Class."""

netcompare/runner.py

@@ -3,9 +3,10 @@
 import jmespath
 from typing import Mapping, List, Union
 from .utils.jmspath_parsers import jmspath_value_parser, jmspath_refkey_parser
-from .utils.filter_parsers import exclude_filter, get_values
-from .utils.refkey_utils import keys_cleaner, keys_values_zipper
-
+from .utils.filter_parsers import exclude_filter
+from .utils.refkey import keys_cleaner, keys_values_zipper, associate_key_of_my_value
+from .utils.flatten import flatten_list
+import pdb
 
 def extract_values_from_output(value: Mapping, path: Mapping, exclude: List) -> Union[Mapping, List, int, str, bool]:
     """Return data from output depending on the check path. See unit text for complete example.
@@ -26,24 +27,45 @@ def extract_values_from_output(value: Mapping, path: Mapping, exclude: List) ->
     Return:
         [{'7.7.7.7': {'prefixesReceived': 101}}, {'10.1.0.0': {'prefixesReceived': 120}}, ...
     """
-    # Get the wanted values to be evaluated if jmspath expression is defined.
+    # Get the wanted values to be evaluated if jmspath expression is defined, otherwise
+    # use the entire output if jmespath is not defined in check. This cover the "raw" diff type.
     if path:
-        wanted_value = jmespath.search(jmspath_value_parser(path), value)
-    # Take all the entir output if jmespath is not defined in check. This cover the "raw" diff type.
-    else:
-        wanted_value = value
+        value = jmespath.search(jmspath_value_parser(path), value)
 
     # Exclude filter implementation.
     if exclude:
-        # Update list in place but assign to a new var for name consistency.
-        exclude_filter(wanted_value, exclude)
-        filtered_value = wanted_value
+        exclude_filter(value, exclude)
+
 
-    filtered_value = get_values(path, wanted_value)
+    # check if list of lists
+    if not any(isinstance(i, list) for i in value):
+        raise TypeError(
+            "Catching value must be defined as list in jmespath expression i.e. result[*].state -> result[*].[state]. You have {}'.".format(
+                path
+            )
+        )
+
+    for element in value:
+        for item in element:
+            if isinstance(item, dict):
+                raise TypeError(
+                    'Must be list of lists i.e. [["Idle", 75759616], ["Idle", 75759620]]. You have {}\'.'.format(
+                        value
+                    )
+                )
+            elif isinstance(item, list):
+                flatten_list(value)
+                break
+    
+    if path:
+        paired_key_value = associate_key_of_my_value(jmspath_value_parser(path), value)
+    else:
+        paired_key_value = value
 
+    pdb.set_trace()
     if path and re.search(r"\$.*\$", path):
         wanted_reference_keys = jmespath.search(jmspath_refkey_parser(path), value)
         list_of_reference_keys = keys_cleaner(wanted_reference_keys)
-        return keys_values_zipper(list_of_reference_keys, filtered_value)
+        return keys_values_zipper(list_of_reference_keys, paired_key_value)
     else:
-        return filtered_value
+        return paired_key_value

netcompare/utils/filter_parsers.py

@@ -1,8 +1,4 @@
 from typing import Mapping, List
-from .jmspath_parsers import jmspath_value_parser
-from .flatten_utils import flatten_list
-from .refkey_utils import associate_key_of_my_value
-
 
 def exclude_filter(data: Mapping, exclude: List):
     """
@@ -41,30 +37,3 @@ def exclude_filter(data: Mapping, exclude: List):
         for element in data:
             if isinstance(element, dict) or isinstance(element, list):
                 exclude_filter(element, exclude)
-
-
-def get_values(path: Mapping, wanted_value):
-    if path:
-        # check if list of lists
-        if not any(isinstance(i, list) for i in wanted_value):
-            raise TypeError(
-                "Catching value must be defined as list in jmespath expression i.e. result[*].state -> result[*].[state]. You have {}'.".format(
-                    path
-                )
-            )
-        for element in wanted_value:
-            for item in element:
-                if isinstance(item, dict):
-                    raise TypeError(
-                        'Must be list of lists i.e. [["Idle", 75759616], ["Idle", 75759620]]. You have {}\'.'.format(
-                            wanted_value
-                        )
-                    )
-                elif isinstance(item, list):
-                    wanted_value = flatten_list(wanted_value)
-                    break
-
-        filtered_value = associate_key_of_my_value(jmspath_value_parser(path), wanted_value)
-    else:
-        filtered_value = wanted_value
-    return filtered_value

netcompare/utils/flatten_utils.py renamed to netcompare/utils/flatten.py

@@ -47,15 +47,15 @@
 
 eval_tests = [
     exact_match_of_global_peers_via_napalm_getter,
-    exact_match_of_bgpPeerCaps_via_api,
-    exact_match_of_bgp_neigh_via_textfsm,
-    raw_diff_of_interface_ma1_via_api_value_exclude,
-    raw_diff_of_interface_ma1_via_api_novalue_exclude,
-    raw_diff_of_interface_ma1_via_api_novalue_noexclude,
-    exact_match_missing_item,
-    exact_match_additional_item,
-    exact_match_changed_item,
-    exact_match_multi_nested_list,
+    # exact_match_of_bgpPeerCaps_via_api,
+    # exact_match_of_bgp_neigh_via_textfsm,
+    # raw_diff_of_interface_ma1_via_api_value_exclude,
+    # raw_diff_of_interface_ma1_via_api_novalue_exclude,
+    # raw_diff_of_interface_ma1_via_api_novalue_noexclude,
+    # exact_match_missing_item,
+    # exact_match_additional_item,
+    # exact_match_changed_item,
+    # exact_match_multi_nested_list,
 ]
 
 

netcompare/utils/refkey_utils.py renamed to netcompare/utils/refkey.py

@@ -1,5 +1,5 @@
 import pytest
-from netcompare.utils.refkey_utils import keys_cleaner, keys_values_zipper, associate_key_of_my_value
+from netcompare.utils.refkey import keys_cleaner, keys_values_zipper, associate_key_of_my_value
 
 
 assertion_failed_message = """Test output is different from expected output.

tests/test_diff_generator.py

@@ -3,8 +3,6 @@
 from .utility import load_json_file
 from netcompare.check_type import CheckType, ExactMatchType, ToleranceType
 
-sys.path.append("..")
-
 
 @pytest.mark.parametrize(
     "args, expected_class",