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)
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)
**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:
# 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)
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)
if ocloud.DeploymentManagerProfileDefault == profile:
pass
elif ocloud.DeploymentManagerProfileSOL018 == profile:
- result['deploymentManagementServiceEndpoint'] = \
+ result['serviceUri'] = \
profile_data['cluster_api_endpoint']
result['profileData'] = profile_data
elif ocloud.DeploymentManagerProfileSOL018HelmCLI == profile:
- result['deploymentManagementServiceEndpoint'] = \
+ result['serviceUri'] = \
profile_data['cluster_api_endpoint']
helmcli_profile = 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)