implementation fixes as per comments

Author: lvrfrc87

netcompare/check_types.py

@@ -326,5 +326,4 @@ def evaluate(self, value_to_compare: Any, params: Any) -> Tuple[Mapping, bool]:
         self.validate(**params)
         # For name consistency.
         reference_data = params
-        evaluation_result = operator_evaluator(reference_data["params"], value_to_compare)
-        return evaluation_result[1], not evaluation_result[0]
+        return operator_evaluator(reference_data["params"], value_to_compare)

netcompare/operator.py

@@ -50,8 +50,8 @@ def _loop_through_wrapper(self, call_ops: str) -> Tuple[bool, List]:
                     elif ops[call_ops](evaluated_value, self.referance_data):
                         result.append(item)
         if result:
-            return (True, result)
-        return (False, result)
+            return (result, True)
+        return (result, False)
 
     def all_same(self) -> Tuple[bool, Any]:
         """All same operator implementation."""
@@ -70,12 +70,12 @@ def all_same(self) -> Tuple[bool, Any]:
                 result.append(True)
 
         if self.referance_data and not all(result):
-            return (False, self.value_to_compare)
+            return (self.value_to_compare, False)
         if self.referance_data:
-            return (True, self.value_to_compare)
+            return (self.value_to_compare, True)
         if not all(result):
-            return (True, self.value_to_compare)
-        return (False, self.value_to_compare)
+            return (self.value_to_compare, True)
+        return (self.value_to_compare, False)
 
     def contains(self) -> Tuple[bool, List]:
         """Contains operator implementation."""

tests/test_operators.py

@@ -39,15 +39,15 @@
                 }
             },
         ],
-        True,
+        False,
     ),
 )
 operator_contains = (
     "pre.json",
     "operator",
     {"params": {"mode": "contains", "operator_data": "EVPN"}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,peerGroup]",
-    ([{"7.7.7.7": {"peerGroup": "EVPN-OVERLAY-SPINE"}}], False),
+    ([{"7.7.7.7": {"peerGroup": "EVPN-OVERLAY-SPINE"}}], True),
 )
 operator_not_contains = (
     "pre.json",
@@ -60,7 +60,7 @@
             {"10.2.0.0": {"peerGroup": "IPv4-UNDERLAY-SPINE"}},
             {"10.64.207.255": {"peerGroup": "IPv4-UNDERLAY-MLAG-PEER"}},
         ],
-        False,
+        True,
     ),
 )
 operator_is_gt = (
@@ -75,7 +75,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )
 operator_is_lt = (
@@ -90,7 +90,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )
 operator_is_in = (
@@ -105,7 +105,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )
 operator_not_in = (
@@ -120,7 +120,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )
 operator_in_range = (
@@ -135,7 +135,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )
 operator_not_in_range = (
@@ -150,7 +150,7 @@
             {"10.2.0.0": {"prefixesSent": 50}},
             {"10.64.207.255": {"prefixesSent": 50}},
         ],
-        False,
+        True,
     ),
 )