remove inner boolean from operator

Author: lvrfrc87

netcompare/check_types.py

@@ -324,7 +324,7 @@ def validate(**kwargs) -> None:
     def evaluate(self, value_to_compare: Any, params: Any) -> Tuple[Mapping, bool]:
         """Operator evaluator implementation."""
         self.validate(**params)
-        # For naming consistency
+        # For name consistency.
         reference_data = params
         evaluation_result = operator_evaluator(reference_data["params"], value_to_compare)
-        return evaluation_result, not evaluation_result
+        return evaluation_result[1], not evaluation_result[0]

tests/test_operators.py

@@ -9,8 +9,6 @@
     {"params": {"mode": "all-same", "operator_data": True}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,peerGroup,vrf,state]",
     (
-        (
-            False,
             [
                 {
                     "7.7.7.7": {
@@ -41,31 +39,28 @@
                     }
                 },
             ],
-        ),
-        False,
+        True,
     ),
 )
 operator_contains = (
     "pre.json",
     "operator",
     {"params": {"mode": "contains", "operator_data": "EVPN"}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,peerGroup]",
-    ((True, [{"7.7.7.7": {"peerGroup": "EVPN-OVERLAY-SPINE"}}]), False),
+    ([{"7.7.7.7": {"peerGroup": "EVPN-OVERLAY-SPINE"}}], False),
 )
 operator_not_contains = (
     "pre.json",
     "operator",
     {"params": {"mode": "not-contains", "operator_data": "EVPN"}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,peerGroup]",
     (
-        (
-            True,
+        
             [
                 {"10.1.0.0": {"peerGroup": "IPv4-UNDERLAY-SPINE"}},
                 {"10.2.0.0": {"peerGroup": "IPv4-UNDERLAY-SPINE"}},
                 {"10.64.207.255": {"peerGroup": "IPv4-UNDERLAY-MLAG-PEER"}},
             ],
-        ),
         False,
     ),
 )
@@ -75,15 +70,12 @@
     {"params": {"mode": "is-gt", "operator_data": 20}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )
@@ -93,15 +85,12 @@
     {"params": {"mode": "is-lt", "operator_data": 60}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )
@@ -111,15 +100,12 @@
     {"params": {"mode": "is-in", "operator_data": [20, 40, 50]}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )
@@ -129,15 +115,12 @@
     {"params": {"mode": "not-in", "operator_data": [20, 40, 60]}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )
@@ -147,15 +130,12 @@
     {"params": {"mode": "in-range", "operator_data": (20, 60)}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )
@@ -165,15 +145,12 @@
     {"params": {"mode": "not-range", "operator_data": (20, 40)}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     (
-        (
-            True,
             [
                 {"7.7.7.7": {"prefixesSent": 50}},
                 {"10.1.0.0": {"prefixesSent": 50}},
                 {"10.2.0.0": {"prefixesSent": 50}},
                 {"10.64.207.255": {"prefixesSent": 50}},
             ],
-        ),
         False,
     ),
 )