X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=bd147221092135f7c703ad51e97eff1f8a9cedf5;hb=f69bcfa4e53700f89b2a82456602f472f92f40a8;hp=ab1d5c46b365b22da8d7570fc89db4210779f6c8;hpb=44f01a560347914798d8f913696d0e495ee076f8;p=pti%2Fo2.git diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py index ab1d5c4..bd14722 100644 --- a/o2ims/adapter/ocloud_repository.py +++ b/o2ims/adapter/ocloud_repository.py @@ -14,10 +14,11 @@ from typing import List -from o2ims.domain import ocloud +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, \ + RegistrationRepository from o2common.helper import o2logging logger = o2logging.get_logger(__name__) @@ -143,19 +144,42 @@ 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(ocloud.Subscription) + def _list(self) -> List[subscription_obj.Subscription]: + return self.session.query(subscription_obj.Subscription) - 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() + + +class RegistrationSqlAlchemyRepository(RegistrationRepository): + def __init__(self, session): + super().__init__() + self.session = session + + def _add(self, registration: subscription_obj.Registration): + self.session.add(registration) + + def _get(self, registration_id) -> subscription_obj.Registration: + return self.session.query(subscription_obj.Registration).filter_by( + registrationId=registration_id).first() + + def _list(self) -> List[subscription_obj.Registration]: + return self.session.query(subscription_obj.Registration) + + def _update(self, registration: subscription_obj.Registration): + self.session.add(registration) + + def _delete(self, registration_id): + self.session.query(subscription_obj.Registration).filter_by( + registrationId=registration_id).delete()