Implement ge and le operator type (#89)

* Release 0.0.2  (#88)

* Update readme to start with use cases (#84)

* Update readme to start with use cases

* Apply suggestions from code review

Co-authored-by: Patryk Szulczewski <[email protected]>
Co-authored-by: Stephen Corry <[email protected]>

* Update README.md

Co-authored-by: Patryk Szulczewski <[email protected]>
Co-authored-by: Stephen Corry <[email protected]>

* Doc update (#87)

* Fix operator checks to follow other check_type logic. (#85)

* Fix operator checks to follow other check_type logic.

* Add new release 0.0.2

Co-authored-by: Patryk Szulczewski <[email protected]>

Co-authored-by: Christian Adell <[email protected]>
Co-authored-by: Ken Celenza <[email protected]>
Co-authored-by: Patryk Szulczewski <[email protected]>
Co-authored-by: Stephen Corry <[email protected]>
Co-authored-by: Patryk Szulczewski <[email protected]>

* add operator ge and le

* fix validate tests

Co-authored-by: Christian Adell <[email protected]>
Co-authored-by: Ken Celenza <[email protected]>
Co-authored-by: Patryk Szulczewski <[email protected]>
Co-authored-by: Stephen Corry <[email protected]>
Co-authored-by: Patryk Szulczewski <[email protected]>

Author: 6 people

docs/usage.md

@@ -478,7 +478,12 @@ The `operator` check is a collection of more specific checks divided into catego
 2. `is-lt`: Check if the value of a specified element is lesser than a given numeric value.
     - `is-lt: 55`: checks if value is lower than 55 or not.  
 
+3. `is-ge`: Check if the value of a specified element is greater than or equal to a given numeric value.
+    - `is-ge: 2`: checks if value should be greater or equal than 2.
 
+4. `is-le`: Check if the value of a specified element is lesser than or equal a given numeric value.
+    - `is-le: 55`: checks if value is lower or equal than 55 or not.
+ 
 Examples:
 
 ```python

jdiff/check_types.py

@@ -176,7 +176,7 @@ def _validate(params) -> None:  # type: ignore[override]
         """Validate operator parameters."""
         in_operators = ("is-in", "not-in", "in-range", "not-in-range")
         bool_operators = ("all-same",)
-        number_operators = ("is-gt", "is-lt")
+        number_operators = ("is-gt", "is-lt", "is-ge", "is-le")
         string_operators = ("contains", "not-contains")
         valid_options = (
             in_operators,

jdiff/operator.py

@@ -51,7 +51,9 @@ def call_evaluation_logic():
 
         ops = {
             ">": operator.gt,
+            ">=": operator.ge,
             "<": operator.lt,
+            "<=": operator.le,
             "is_in": operator.contains,
             "not_in": operator.contains,
             "contains": operator.contains,
@@ -99,10 +101,18 @@ def is_gt(self) -> Tuple[List, bool]:
         """Is greather than operator caller."""
         return self._loop_through_wrapper(">")
 
+    def is_ge(self) -> Tuple[List, bool]:
+        """Is greather or equal than operator caller."""
+        return self._loop_through_wrapper(">=")
+
     def is_lt(self) -> Tuple[List, bool]:
         """Is lower than operator caller."""
         return self._loop_through_wrapper("<")
 
+    def is_le(self) -> Tuple[List, bool]:
+        """Is lower or equal than operator caller."""
+        return self._loop_through_wrapper("<=")
+
     def is_in(self) -> Tuple[List, bool]:
         """Is in operator caller."""
         return self._loop_through_wrapper("is_in")

tests/test_operators.py

@@ -75,13 +75,41 @@
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     ([], True),
 )
+operator_is_ge_equal = (
+    "pre.json",
+    "operator",
+    {"params": {"mode": "is-ge", "operator_data": 50}},
+    "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
+    ([], True),
+)
+operator_is_ge_greater = (
+    "pre.json",
+    "operator",
+    {"params": {"mode": "is-ge", "operator_data": 20}},
+    "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
+    ([], True),
+)
 operator_is_lt = (
     "pre.json",
     "operator",
     {"params": {"mode": "is-lt", "operator_data": 60}},
     "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
     ([], True),
 )
+operator_is_le_equal = (
+    "pre.json",
+    "operator",
+    {"params": {"mode": "is-le", "operator_data": 50}},
+    "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
+    ([], True),
+)
+operator_is_le_lower = (
+    "pre.json",
+    "operator",
+    {"params": {"mode": "is-le", "operator_data": 60}},
+    "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesSent]",
+    ([], True),
+)
 operator_is_in = (
     "pre.json",
     "operator",
@@ -132,7 +160,11 @@
     operator_contains,
     operator_not_contains,
     operator_is_gt,
+    operator_is_ge_equal,
+    operator_is_ge_greater,
     operator_is_lt,
+    operator_is_le_equal,
+    operator_is_le_lower,
     operator_is_in,
     operator_not_in,
     operator_in_range,

tests/test_validates.py

@@ -65,7 +65,7 @@
 operator_params_wrong_operator = (
     "operator",
     {"params": {"mode": "random", "operator_data": [20, 40, 60]}},
-    "'params' value must be one of the following: ['is-in', 'not-in', 'in-range', 'not-in-range', 'all-same', 'is-gt', 'is-lt', 'contains', 'not-contains']. You have: random",
+    "'params' value must be one of the following: ['is-in', 'not-in', 'in-range', 'not-in-range', 'all-same', 'is-gt', 'is-lt', 'is-ge', 'is-le', 'contains', 'not-contains']. You have: random",
 )
 operator_params_in = (
     "operator",
@@ -85,7 +85,7 @@
 operator_params_number = (
     "operator",
     {"params": {"mode": "is-gt", "operator_data": "1"}},
-    "check options ('is-gt', 'is-lt') must have value of type float or int. You have: 1 of type <class 'str'>",
+    "check options ('is-gt', 'is-lt', 'is-ge', 'is-le') must have value of type float or int. You have: 1 of type <class 'str'>",
 )
 operator_params_contains = (
     "operator",