F filter now supports any for non-list values (#608)

* F filter now supports any for non-list values

* fix tests

* fix tests

* fixed tests

docs/howto/handling_connections.ipynb

@@ -138,6 +138,7 @@
       "    password: a_password\r\n",
       "    platform: eos\r\n",
       "    data:\r\n",
+      "        some_string_to_test_any_all: prefix\r\n",
       "        my_var: comes_from_dev1.group_1\r\n",
       "        www_server: nginx\r\n",
       "        role: www\r\n",
@@ -169,7 +170,7 @@
     }
    ],
    "source": [
-    "!sed '2,35!d' ../../tests/inventory_data/hosts.yaml"
+    "!sed '2,36!d' ../../tests/inventory_data/hosts.yaml"
    ]
   }
  ],

nornir/core/filter.py

@@ -77,9 +77,16 @@ def _verify_rules(data: Any, rule: List[str], value: Any) -> bool:
             elif rule == ["in"]:
                 return bool(data in value)
             elif rule == ["any"]:
-                return any([x in data for x in value])
+                if isinstance(data, list):
+                    return any([x in data for x in value])
+                else:
+                    return any([x == data for x in value])
             elif rule == ["all"]:
-                return all([x in data for x in value])
+                if isinstance(data, list):
+                    return all([x in data for x in value])
+                else:
+                    # it doesn't make sense to check a single value meets more than one case
+                    return False
             else:
                 return bool(data.get(rule[0]) == value)
 

tests/core/test_filter.py

@@ -141,6 +141,12 @@ def test_filtering_string_in_list(self, nornir):
             "dev6.group_3",
         ]
 
+    def test_filtering_string_any(self, nornir):
+        f = F(some_string_to_test_any_all__any=["prefix", "other_prefix"])
+        filtered = sorted(list((nornir.inventory.filter(f).hosts.keys())))
+
+        assert filtered == ["dev1.group_1", "dev3.group_2", "dev4.group_2"]
+
     def test_filtering_list_any(self, nornir):
         f = F(nested_data__a_list__any=[1, 3])
         filtered = sorted(list((nornir.inventory.filter(f).hosts.keys())))

tests/core/test_inventory.py

@@ -106,7 +106,10 @@ def test_inventory_dict(self, inv):
                 },
                 "group_2": {
                     "connection_options": {},
-                    "data": {"site": "site2"},
+                    "data": {
+                        "some_string_to_test_any_all": "other_prefix",
+                        "site": "site2",
+                    },
                     "groups": [],
                     "hostname": None,
                     "name": "group_2",
@@ -191,6 +194,7 @@ def test_inventory_dict(self, inv):
                         },
                     },
                     "data": {
+                        "some_string_to_test_any_all": "prefix",
                         "my_var": "comes_from_dev1.group_1",
                         "nested_data": {
                             "a_dict": {"a": 1, "b": 2},
@@ -228,6 +232,7 @@ def test_inventory_dict(self, inv):
                         },
                     },
                     "data": {
+                        "some_string_to_test_any_all": "prefix_longer",
                         "nested_data": {
                             "a_dict": {"b": 2, "c": 3},
                             "a_list": [2, 3],
@@ -329,13 +334,15 @@ def test_extended_data(self, inv):
             "only_default": "only_defined_in_default",
             "role": "www",
             "site": "site1",
+            "some_string_to_test_any_all": "prefix",
             "www_server": "nginx",
         }
         assert inv.hosts["dev3.group_2"].extended_data() == {
             "my_var": "comes_from_defaults",
             "only_default": "only_defined_in_default",
             "role": "www",
             "site": "site2",
+            "some_string_to_test_any_all": "other_prefix",
             "www_server": "apache",
         }
         assert inv.hosts["dev5.no_group"].extended_data() == {

tests/inventory_data/groups.yaml

@@ -47,6 +47,7 @@ group_2:
     password:
     platform:
     data:
+        some_string_to_test_any_all: other_prefix
         site: site2
     groups: []
     connection_options: {}

tests/inventory_data/hosts.yaml

@@ -6,6 +6,7 @@ dev1.group_1:
     password: a_password
     platform: eos
     data:
+        some_string_to_test_any_all: prefix
         my_var: comes_from_dev1.group_1
         www_server: nginx
         role: www
@@ -40,6 +41,7 @@ dev2.group_1:
     password:
     platform: junos
     data:
+        some_string_to_test_any_all: prefix_longer
         role: db
         nested_data:
             a_dict: