X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=4880fa164b7352e9110d015071572e8ee0b436cc;hb=refs%2Fchanges%2F08%2F7408%2F4;hp=8a547fe96d4f3ff29654ab9e71a1024482ff4261;hpb=81e3575a77366f30c2049f98c48a3087db0ea992;p=pti%2Fo2.git diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py index 8a547fe..4880fa1 100644 --- a/o2ims/adapter/ocloud_repository.py +++ b/o2ims/adapter/ocloud_repository.py @@ -12,70 +12,150 @@ # See the License for the specific language governing permissions and # limitations under the License. -import abc -from typing import Set -# from o2ims.adapter import orm -from o2ims.domain import ocloud +from typing import List +from o2ims.domain import ocloud, subscription_obj +from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\ + ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository +from o2ims.domain.subscription_repo import SubscriptionRepository +from o2common.helper import o2logging +logger = o2logging.get_logger(__name__) -class OcloudRepository(abc.ABC): - def __init__(self): - self.seen = set() # type: Set[ocloud.Ocloud] - def add(self, ocloud: ocloud.Ocloud): - self._add(ocloud) - self.seen.add(ocloud) +class OcloudSqlAlchemyRepository(OcloudRepository): + def __init__(self, session): + super().__init__() + self.session = session - def get(self, ocloudid) -> ocloud.Ocloud: - ocloud = self._get(ocloudid) - if ocloud: - self.seen.add(ocloud) - return ocloud + def _add(self, ocloud: ocloud.Ocloud): + self.session.add(ocloud) + # self.session.add_all(ocloud.deploymentManagers) - def update(self, ocloud: ocloud.Ocloud): - self._update(ocloud) + def _get(self, ocloud_id) -> ocloud.Ocloud: + return self.session.query(ocloud.Ocloud).filter_by( + oCloudId=ocloud_id).first() - # def update_fields(self, ocloudid: str, updatefields: dict): - # self._update(ocloudid, updatefields) + def _list(self) -> List[ocloud.Ocloud]: + return self.session.query(ocloud.Ocloud) - @abc.abstractmethod - def _add(self, ocloud: ocloud.Ocloud): - raise NotImplementedError + def _update(self, ocloud: ocloud.Ocloud): + self.session.add(ocloud) - @abc.abstractmethod - def _get(self, ocloudid) -> ocloud.Ocloud: - raise NotImplementedError - @abc.abstractmethod - def _update(self, ocloud: ocloud.Ocloud): - raise NotImplementedError +class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository): + def __init__(self, session): + super().__init__() + self.session = session + def _add(self, resourceType: ocloud.ResourceType): + self.session.add(resourceType) -class OcloudSqlAlchemyRepository(OcloudRepository): + def _get(self, resource_type_id) -> ocloud.ResourceType: + return self.session.query(ocloud.ResourceType).filter_by( + resourceTypeId=resource_type_id).first() + + def _list(self) -> List[ocloud.ResourceType]: + return self.session.query(ocloud.ResourceType) + + def _update(self, resourceType: ocloud.ResourceType): + self.session.add(resourceType) + + +class ResourcePoolSqlAlchemyRepository(ResourcePoolRepository): def __init__(self, session): super().__init__() self.session = session - def _add(self, ocloud: ocloud.Ocloud): - self.session.add(ocloud) - # self.session.add_all(ocloud.deploymentManagers) + def _add(self, resourcePool: ocloud.ResourcePool): + self.session.add(resourcePool) - def _get(self, ocloudid) -> ocloud.Ocloud: - return self.session.query(ocloud.Ocloud).filter_by( - oCloudId=ocloudid).first() + def _get(self, resource_pool_id) -> ocloud.ResourcePool: + return self.session.query(ocloud.ResourcePool).filter_by( + resourcePoolId=resource_pool_id).first() - def _update(self, ocloud: ocloud.Ocloud): - self.session.add(ocloud) + def _list(self) -> List[ocloud.ResourcePool]: + return self.session.query(ocloud.ResourcePool) + + def _update(self, resourcePool: ocloud.ResourcePool): + self.session.add(resourcePool) + + +class ResourceSqlAlchemyRepository(ResourceRepository): + def __init__(self, session): + super().__init__() + self.session = session + + def _add(self, resource: ocloud.Resource): + self.session.add(resource) + + def _get(self, resource_id) -> ocloud.Resource: + # 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) -> List[ocloud.Resource]: + return self.session.query(ocloud.Resource).filter_by( + resourcePoolId=resourcepool_id) + + def _update(self, resource: ocloud.Resource): + self.session.add(resource) + + +class DeploymentManagerSqlAlchemyRepository(DeploymentManagerRepository): + def __init__(self, session): + super().__init__() + self.session = session + + def _add(self, deployment_manager: ocloud.DeploymentManager): + self.session.add(deployment_manager) + + def _get(self, deployment_manager_id) -> ocloud.DeploymentManager: + return self.session.query(ocloud.DeploymentManager).filter_by( + deploymentManagerId=deployment_manager_id).first() + + def _list(self) -> List[ocloud.DeploymentManager]: + return self.session.query(ocloud.DeploymentManager) + + def _update(self, deployment_manager: ocloud.DeploymentManager): + self.session.add(deployment_manager) + + +class SubscriptionSqlAlchemyRepository(SubscriptionRepository): + def __init__(self, session): + super().__init__() + self.session = session + + def _add(self, subscription: subscription_obj.Subscription): + self.session.add(subscription) + + 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[subscription_obj.Subscription]: + return self.session.query(subscription_obj.Subscription) + + def _update(self, subscription: subscription_obj.Subscription): + self.session.add(subscription) - # def _update_fields(self, ocloudid: str, updatefields: dict): - # dmslist = updatefields.pop("deploymentManagers", None) - # if dmslist: - # self._update_dms_list(dmslist) - # if updatefields: - # self.session.query(ocloud.Ocloud).filter_by( - # oCloudId=ocloudid).update(updatefields) - - # def _update_dms_list(self, dms_list: list): - # for dms in dms_list or []: - # self.session.query(ocloud.DeploymentManager).filter_by( - # deploymentManagerId=dms.deploymentManagerId).update(dms) + def _delete(self, subscription_id): + self.session.query(subscription_obj.Subscription).filter_by( + subscriptionId=subscription_id).delete()