Update opMulti operations of the filter

[pti/o2.git] / o2ims / views / ocloud_view.py

diff --git a/o2ims/views/ocloud_view.py b/o2ims/views/ocloud_view.py
index e99279c..eb6c79f 100644 (file)
--- a/o2ims/views/ocloud_view.py
+++ b/o2ims/views/ocloud_view.py
@@ -45,11 +45,11 @@ def ocloud_one(ocloudid: str, uow: unit_of_work.AbstractUnitOfWork):
 
 def resource_types(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
     pagination = Pagination(**kwargs)
-    filter_kwargs = pagination.get_filter()
+    query_kwargs = pagination.get_pagination()
     args = gen_filter(ocloud.ResourceType,
                       kwargs['filter']) if 'filter' in kwargs else []
     with uow:
-        li = uow.resource_types.list_with_count(*args, **filter_kwargs)
+        li = uow.resource_types.list_with_count(*args, **query_kwargs)
     return pagination.get_result(li)
 
 
@@ -62,11 +62,11 @@ def resource_type_one(resourceTypeId: str,
 
 def resource_pools(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
     pagination = Pagination(**kwargs)
-    filter_kwargs = pagination.get_filter()
+    query_kwargs = pagination.get_pagination()
     args = gen_filter(ocloud.ResourcePool,
                       kwargs['filter']) if 'filter' in kwargs else []
     with uow:
-        li = uow.resource_pools.list_with_count(*args, **filter_kwargs)
+        li = uow.resource_pools.list_with_count(*args, **query_kwargs)
     return pagination.get_result(li)
 
 
@@ -81,7 +81,7 @@ def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork,
               **kwargs):
     pagination = Pagination(**kwargs)
     # filter key should be the same with database name
-    filter_kwargs = pagination.get_filter()
+    query_kwargs = pagination.get_pagination()
     if 'resourceTypeName' in kwargs:
         resource_type_name = kwargs['resourceTypeName']
         with uow:
@@ -92,20 +92,20 @@ def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork,
             # restype_id = '' if len(restype_ids) == 0 else restype_ids[0]
             res_type = uow.resource_types.get_by_name(resource_type_name)
             restype_id = '' if res_type is None else res_type.resourceTypeId
-        filter_kwargs['resourceTypeId'] = restype_id
+        query_kwargs['resourceTypeId'] = restype_id
     args = gen_filter(
         ocloud.Resource, kwargs['filter']) if 'filter' in kwargs else []
     args.append(ocloud.Resource.resourcePoolId == resourcePoolId)
     # args.append(ocloud.Resource.parentId == None)
 
     if 'parentId' in kwargs:
-        filter_kwargs['parentId'] = kwargs['parentId']
+        query_kwargs['parentId'] = kwargs['parentId']
     if 'sort' in kwargs:
-        filter_kwargs['sort'] = kwargs['sort']
+        query_kwargs['sort'] = kwargs['sort']
 
     with uow:
         ret = uow.resources.list_with_count(
-            resourcePoolId, *args, **filter_kwargs)
+            resourcePoolId, *args, **query_kwargs)
 
     return pagination.get_result(ret)
 
@@ -118,11 +118,11 @@ def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork):
 
 def deployment_managers(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
     pagination = Pagination(**kwargs)
-    filter_kwargs = pagination.get_filter()
+    query_kwargs = pagination.get_pagination()
     args = gen_filter(ocloud.DeploymentManager,
                       kwargs['filter']) if 'filter' in kwargs else []
     with uow:
-        li = uow.deployment_managers.list_with_count(*args, **filter_kwargs)
+        li = uow.deployment_managers.list_with_count(*args, **query_kwargs)
     return pagination.get_result(li)
 
 
@@ -200,11 +200,11 @@ def _gen_kube_config(dmId: str, kubeconfig: dict) -> dict:
 
 def subscriptions(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
     pagination = Pagination(**kwargs)
-    filter_kwargs = pagination.get_filter()
-    args = gen_filter(ocloud.DeploymentManager,
+    query_kwargs = pagination.get_pagination()
+    args = gen_filter(Subscription,
                       kwargs['filter']) if 'filter' in kwargs else []
     with uow:
-        li = uow.subscriptions.list_with_count(*args, **filter_kwargs)
+        li = uow.subscriptions.list_with_count(*args, **query_kwargs)
     return pagination.get_result(li)