import shutil
from o2common.service import unit_of_work
+from o2common.config import config
+from o2common.views.pagination_view import Pagination
+from o2common.views.view import gen_filter
+from o2ims.domain import ocloud
from o2ims.views.ocloud_dto import SubscriptionDTO
from o2ims.domain.subscription_obj import Subscription
from o2common.helper import o2logging
-from o2common.config import config
logger = o2logging.get_logger(__name__)
return first.serialize() if first is not None else None
-def resource_types(uow: unit_of_work.AbstractUnitOfWork):
+def resource_types(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
+ pagination = Pagination(**kwargs)
+ query_kwargs = pagination.get_pagination()
+ args = gen_filter(ocloud.ResourceType,
+ kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.resource_types.list()
- return [r.serialize() for r in li]
+ li = uow.resource_types.list_with_count(*args, **query_kwargs)
+ return pagination.get_result(li)
def resource_type_one(resourceTypeId: str,
return first.serialize() if first is not None else None
-def resource_pools(uow: unit_of_work.AbstractUnitOfWork):
+def resource_pools(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
+ pagination = Pagination(**kwargs)
+ query_kwargs = pagination.get_pagination()
+ args = gen_filter(ocloud.ResourcePool,
+ kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.resource_pools.list()
- return [r.serialize() for r in li]
+ li = uow.resource_pools.list_with_count(*args, **query_kwargs)
+ return pagination.get_result(li)
def resource_pool_one(resourcePoolId: str,
def resources(resourcePoolId: str, uow: unit_of_work.AbstractUnitOfWork,
**kwargs):
-
- filter_kwargs = {} # filter key should be the same with database name
+ pagination = Pagination(**kwargs)
+ # filter key should be the same with database name
+ 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)
- # li = uow.resources.list(resourcePoolId)
- # return [r.serialize() for r in li if r.resourceTypeId == restype_id]
if 'parentId' in kwargs:
- filter_kwargs['parentId'] = kwargs['parentId']
+ query_kwargs['parentId'] = kwargs['parentId']
+ if 'sort' in kwargs:
+ query_kwargs['sort'] = kwargs['sort']
with uow:
- li = uow.resources.list(resourcePoolId, **filter_kwargs)
- return [r.serialize() for r in li]
+ ret = uow.resources.list_with_count(
+ resourcePoolId, *args, **query_kwargs)
+
+ return pagination.get_result(ret)
def resource_one(resourceId: str, uow: unit_of_work.AbstractUnitOfWork):
return first.serialize() if first is not None else None
-def deployment_managers(uow: unit_of_work.AbstractUnitOfWork):
+def deployment_managers(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
+ pagination = Pagination(**kwargs)
+ query_kwargs = pagination.get_pagination()
+ args = gen_filter(ocloud.DeploymentManager,
+ kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.deployment_managers.list()
- return [r.serialize() for r in li]
+ li = uow.deployment_managers.list_with_count(*args, **query_kwargs)
+ return pagination.get_result(li)
def deployment_manager_one(deploymentManagerId: str,
profile_data = result.pop("profile", None)
result['profileName'] = profile
- if "default" == profile:
+ if ocloud.DeploymentManagerProfileDefault == profile:
pass
- elif "sol018" == profile:
- result['deploymentManagementServiceEndpoint'] = \
+ elif ocloud.DeploymentManagerProfileSOL018 == profile:
+ result['serviceUri'] = \
profile_data['cluster_api_endpoint']
result['profileData'] = profile_data
- elif "sol018_helmcli" == profile:
- result['deploymentManagementServiceEndpoint'] = \
+ elif ocloud.DeploymentManagerProfileSOL018HelmCLI == profile:
+ result['serviceUri'] = \
profile_data['cluster_api_endpoint']
helmcli_profile = dict()
return '/configs/'+kube_config_name
-def subscriptions(uow: unit_of_work.AbstractUnitOfWork):
+def subscriptions(uow: unit_of_work.AbstractUnitOfWork, **kwargs):
+ pagination = Pagination(**kwargs)
+ query_kwargs = pagination.get_pagination()
+ args = gen_filter(Subscription,
+ kwargs['filter']) if 'filter' in kwargs else []
with uow:
- li = uow.subscriptions.list()
- return [r.serialize() for r in li]
+ li = uow.subscriptions.list_with_count(*args, **query_kwargs)
+ return pagination.get_result(li)
def subscription_one(subscriptionId: str,