Fixed imports for projects without client-side filtering support.

Author: chsou

integration_tests/test_devicegroups.py

@@ -151,7 +151,7 @@ def test_select(live_c8y: CumulocityApi, safe_executor):
         # 4)  select with client-side filtering
         filtered_roots_1 = live_c8y.group_inventory.get_all(
             type=DeviceGroup.ROOT_TYPE,
-            include="starts_with(name, 'Root-')",
+            include="name matches 'Root-.*'",
             as_values='name')
         filtered_roots_2 = [
             x for x in live_c8y.group_inventory.get_all(type=DeviceGroup.ROOT_TYPE, as_values='name')

integration_tests/test_global_roles.py

@@ -61,12 +61,12 @@ def test_select(live_c8y: CumulocityApi, safe_create):
         assert role.id in [x.id for x in selected_roles]
 
     # (4) select with filter
-    filtered_1 = live_c8y.global_roles.get_all(include="contains(name, 'Global')")
+    filtered_1 = live_c8y.global_roles.get_all(include="name contains Global")
     filtered_2 = [x for x in live_c8y.global_roles.get_all() if 'Global' in x.name]
     assert {x.name for x in filtered_1} == {x.name for x in filtered_2}
 
     # (5) select by user with filter
-    filtered_1 = live_c8y.global_roles.get_all(username=username, include="contains(name, 'a')")
+    filtered_1 = live_c8y.global_roles.get_all(username=username, include="name contains a")
     filtered_2 = [x for x in live_c8y.global_roles.get_all(username=username) if 'a' in x.name]
     assert {x.name for x in filtered_1} == {x.name for x in filtered_2}
 

integration_tests/test_inventoryroles.py

@@ -4,6 +4,7 @@
 
 from c8y_api import CumulocityApi
 from c8y_api.model import User, InventoryRole, Permission, ReadPermission, WritePermission, AnyPermission
+from c8y_api.model.matcher import jmespath
 
 from util.testing_util import RandomNameGenerator
 
@@ -82,7 +83,7 @@ def test_select_inventory_roles(live_c8y: CumulocityApi):
     assert live_c8y.inventory_roles.get_all()
 
     # (2) filter
-    filtered_1 = live_c8y.inventory_roles.get_all(include='description != null')
+    filtered_1 = live_c8y.inventory_roles.get_all(include=jmespath('description != null'))
     filtered_2 = [x for x in live_c8y.inventory_roles.get_all() if x.description]
     assert {x.id for x in filtered_1} == {x.id for x in filtered_2}
 

integration_tests/test_users.py

@@ -12,6 +12,7 @@
 
 from c8y_api import CumulocityApi
 from c8y_api.model import User
+from c8y_api.model.matcher import jmespath
 
 from util.testing_util import RandomNameGenerator
 
@@ -76,7 +77,7 @@ def test_select(live_c8y: CumulocityApi, safe_create):
         assert '2' in live_c8y.users.get(user.username).global_role_ids
 
     # test getting with a client-side-filter
-    admin_users_2 = live_c8y.users.get_all(include="contains(groups.references[].group.id, `2`)")
+    admin_users_2 = live_c8y.users.get_all(include=jmespath("contains(groups.references[].group.id, `2`)"))
     assert {x.id for x in admin_users} == {x.id for x in admin_users_2}