master: Compatibility with operator was dropped from catalog

  Reference commit erp5@455b24e5

master/bt5/slapos_accounting/SkinTemplateItem/portal_skins/slapos_accounting/OrderBuilder_generateSlapOSAggregatedMovementList.py

@@ -20,7 +20,7 @@ select_kw.update(
   select_dict=select_dict,
   left_join_list=select_dict.keys(),
   default_aggregate_portal_type=ComplexQuery(NegatedQuery(Query(default_aggregate_portal_type='Computer')),
-    Query(default_aggregate_portal_type=None), operator="OR"),
+    Query(default_aggregate_portal_type=None),logical_operator="OR"),
   grouping_reference=None,
   sort_on=(('modification_date', 'ASC'),) # the highest chance to find movement which can be delivered
 )

master/product/SlapOS/SlapOSMachineAuthenticationPlugin.py

@@ -79,7 +79,7 @@ def getUserByLogin(portal, login):
   person_query = Query(portal_type=["Person"],
       reference=dict(query=login, key='ExactMatch'))
   result = portal.portal_catalog.unrestrictedSearchResults(
-    query=ComplexQuery(machine_query, person_query, operator="OR"),
+    query=ComplexQuery(machine_query, person_query,logical_operator="OR"),
     select_expression='reference')
   result = [x for x in result if \
     (x.getPortalType() == 'Person' and x.getValidationState() != 'deleted') or \

master/product/SlapOS/SlapOSShadowAuthenticationPlugin.py

@@ -90,7 +90,7 @@ def getUserByLogin(portal, login):
   person_query = Query(portal_type=["Person"],
       reference=dict(query=login, key='ExactMatch'))
   result = portal.portal_catalog.unrestrictedSearchResults(
-    query=ComplexQuery(machine_query, person_query, operator="OR"),
+    query=ComplexQuery(machine_query, person_query,logical_operator="OR"),
     select_expression='reference')
   result = [x for x in result if \
     (x.getPortalType() == 'Person' and x.getValidationState() != 'deleted') or \

master/product/Vifib/tests/testVifibSlapWebService.py

@@ -533,7 +533,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
       default_aggregate_uid=ComplexQuery(
          Query(default_aggregate_uid=sequence['computer_partition_uid']),
          Query(default_aggregate_uid=sequence['software_instance_uid']),
-         operator="AND"),
+        logical_operator="AND"),
       portal_type=self.sale_packing_list_line_portal_type,
       simulation_state=state,
       resource_relative_url=resource)[0][0])
@@ -2834,7 +2834,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     query = ComplexQuery(
         Query(aggregate_uid=sequence['computer_partition_uid']),
         Query(aggregate_portal_type=self.software_instance_portal_type),
-        operator="AND")
+       logical_operator="AND")
     software_instance = self.portal.portal_catalog.getResultValue(
         portal_type="Sale Packing List Line",
         sort_on=(('movement.start_date', 'DESC'),),
@@ -2845,7 +2845,7 @@ class TestVifibSlapWebServiceMixin(testVifibMixin):
     query = ComplexQuery(
         Query(aggregate_uid=sequence['computer_partition_uid']),
         Query(aggregate_portal_type=self.slave_instance_portal_type),
-        operator="AND")
+       logical_operator="AND")
     slave_instance = self.portal.portal_catalog.getResultValue(
         portal_type="Sale Packing List Line",
         query=query).getAggregateValue(portal_type=self.slave_instance_portal_type)