X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=b26e98a069633c3d70207a7dea7b9214d4bdb325;hb=f7ef52a5b4ead0472b1b5828471b28c88d2a0aea;hp=0826cf0dc2d9a4533d137ecff214a1dec5e40623;hpb=de778bc19d9329d3c1c3c536bfd702423102277b;p=pti%2Fo2.git diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py index 0826cf0..b26e98a 100644 --- a/o2ims/adapter/ocloud_repository.py +++ b/o2ims/adapter/ocloud_repository.py @@ -12,12 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -from typing import List -# from o2ims.adapter import orm -from o2ims.domain import ocloud +from typing import List, Tuple + +from o2ims.domain import ocloud, subscription_obj from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\ - ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository,\ - SubscriptionRepository + ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository +from o2ims.domain.subscription_repo import SubscriptionRepository +from o2common.helper import o2logging +logger = o2logging.get_logger(__name__) class OcloudSqlAlchemyRepository(OcloudRepository): @@ -34,8 +36,7 @@ class OcloudSqlAlchemyRepository(OcloudRepository): oCloudId=ocloud_id).first() def _list(self) -> List[ocloud.Ocloud]: - return self.session.query(ocloud.Ocloud).order_by( - ocloud.Ocloud.name).all() + return self.session.query(ocloud.Ocloud) def _update(self, ocloud: ocloud.Ocloud): self.session.add(ocloud) @@ -53,8 +54,20 @@ class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository): return self.session.query(ocloud.ResourceType).filter_by( resourceTypeId=resource_type_id).first() - def _list(self) -> List[ocloud.ResourceType]: - return self.session.query() + def _get_by_name(self, resource_type_name) -> ocloud.ResourceType: + return self.session.query(ocloud.ResourceType).filter_by( + name=resource_type_name).first() + + def _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourceType]]: + size = kwargs.pop('limit') if 'limit' in kwargs else None + offset = kwargs.pop('start') if 'start' in kwargs else 0 + + result = self.session.query(ocloud.ResourceType).filter_by( + **kwargs).order_by('resourceTypeId') + count = result.count() + if size is not None and size != -1: + return (count, result.limit(size).offset(offset)) + return (count, result) def _update(self, resourceType: ocloud.ResourceType): self.session.add(resourceType) @@ -72,8 +85,16 @@ class ResourcePoolSqlAlchemyRepository(ResourcePoolRepository): return self.session.query(ocloud.ResourcePool).filter_by( resourcePoolId=resource_pool_id).first() - def _list(self) -> List[ocloud.ResourcePool]: - return self.session.query() + def _list(self, **kwargs) -> Tuple[int, List[ocloud.ResourcePool]]: + size = kwargs.pop('limit') if 'limit' in kwargs else None + offset = kwargs.pop('start') if 'start' in kwargs else 0 + + result = self.session.query(ocloud.ResourcePool).filter_by( + **kwargs).order_by('resourcePoolId') + count = result.count() + if size is not None and size != -1: + return (count, result.limit(size).offset(offset)) + return (count, result) def _update(self, resourcePool: ocloud.ResourcePool): self.session.add(resourcePool) @@ -88,11 +109,41 @@ class ResourceSqlAlchemyRepository(ResourceRepository): self.session.add(resource) def _get(self, resource_id) -> ocloud.Resource: - return self.session.query(ocloud.Resource).filter_by( - resourceId=resource_id).first() - - def _list(self) -> List[ocloud.Resource]: - return self.session.query() + # return self.session.query(ocloud.Resource).filter_by( + # resourceId=resource_id).first() + # topq = uow.session.query(orm.resource).filter( + # orm.resource.c.resourceId == resourceId).\ + # cte('cte', recursive=True) + # bootomq = uow.session.query(orm.resource).join( + # topq, orm.resource.c.parentId == topq.c.resourceId) + # res = uow.session.query(topq.union(bootomq)) + def recursive(id): + res = self.session.query(ocloud.Resource).filter_by( + resourceId=id).first() + if res is not None: + query = self.session.query(ocloud.Resource).filter_by( + parentId=res.resourceId) + children = [] + for r in query: + child = recursive(r.resourceId) + children.append(child) + res.set_children(children) + return res + return recursive(resource_id) + + def _list(self, resourcepool_id, **kwargs) -> \ + Tuple[int, List[ocloud.Resource]]: + if 'sort' in kwargs: + kwargs.pop('sort') + size = kwargs.pop('limit') if 'limit' in kwargs else None + offset = kwargs.pop('start') if 'start' in kwargs else 0 + + result = self.session.query(ocloud.Resource).filter_by( + resourcePoolId=resourcepool_id, **kwargs).order_by('resourceId') + count = result.count() + if size is not None and size != -1: + return (count, result.limit(size).offset(offset)) + return (count, result) def _update(self, resource: ocloud.Resource): self.session.add(resource) @@ -110,8 +161,16 @@ class DeploymentManagerSqlAlchemyRepository(DeploymentManagerRepository): return self.session.query(ocloud.DeploymentManager).filter_by( deploymentManagerId=deployment_manager_id).first() - def _list(self) -> List[ocloud.DeploymentManager]: - return self.session.query() + def _list(self, **kwargs) -> Tuple[int, List[ocloud.DeploymentManager]]: + size = kwargs.pop('limit') if 'limit' in kwargs else None + offset = kwargs.pop('start') if 'start' in kwargs else 0 + + result = self.session.query(ocloud.DeploymentManager).filter_by( + **kwargs).order_by('deploymentManagerId') + count = result.count() + if size is not None and size != -1: + return (count, result.limit(size).offset(offset)) + return (count, result) def _update(self, deployment_manager: ocloud.DeploymentManager): self.session.add(deployment_manager) @@ -122,19 +181,28 @@ class SubscriptionSqlAlchemyRepository(SubscriptionRepository): super().__init__() self.session = session - def _add(self, subscription: ocloud.Subscription): + def _add(self, subscription: subscription_obj.Subscription): self.session.add(subscription) - def _get(self, subscription_id) -> ocloud.Subscription: - return self.session.query(ocloud.Subscription).filter_by( + def _get(self, subscription_id) -> subscription_obj.Subscription: + return self.session.query(subscription_obj.Subscription).filter_by( subscriptionId=subscription_id).first() - def _list(self) -> List[ocloud.Subscription]: - return self.session.query() + def _list(self, **kwargs) -> \ + Tuple[int, List[subscription_obj.Subscription]]: + size = kwargs.pop('limit') if 'limit' in kwargs else None + offset = kwargs.pop('start') if 'start' in kwargs else 0 + + result = self.session.query(subscription_obj.Subscription).filter_by( + **kwargs).order_by('subscriptionId') + count = result.count() + if size is not None and size != -1: + return (count, result.limit(size).offset(offset)) + return (count, result) - def _update(self, subscription: ocloud.Subscription): + def _update(self, subscription: subscription_obj.Subscription): self.session.add(subscription) def _delete(self, subscription_id): - self.session.query(ocloud.Subscription).filter_by( + self.session.query(subscription_obj.Subscription).filter_by( subscriptionId=subscription_id).delete()