X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Focloud_repository.py;h=ff1cd27b54f4f44a074e34281aa12c2d95da0930;hb=576ad21504bb3e50546b349c63ebec7bd0c805ab;hp=bd147221092135f7c703ad51e97eff1f8a9cedf5;hpb=02b85e27680e1139bc8e1930af5449a26527b4de;p=pti%2Fo2.git

diff --git a/o2ims/adapter/ocloud_repository.py b/o2ims/adapter/ocloud_repository.py
index bd14722..ff1cd27 100644
--- a/o2ims/adapter/ocloud_repository.py
+++ b/o2ims/adapter/ocloud_repository.py
@@ -14,11 +14,11 @@
 
 from typing import List
 
-from o2ims.domain import ocloud, subscription_obj
+from o2ims.domain import ocloud, subscription_obj, configuration_obj
 from o2ims.domain.ocloud_repo import OcloudRepository, ResourceTypeRepository,\
     ResourcePoolRepository, ResourceRepository, DeploymentManagerRepository
-from o2ims.domain.subscription_repo import SubscriptionRepository, \
-    RegistrationRepository
+from o2ims.domain.subscription_repo import SubscriptionRepository
+from o2ims.domain.configuration_repo import ConfigurationRepository
 from o2common.helper import o2logging
 logger = o2logging.get_logger(__name__)
 
@@ -55,6 +55,10 @@ class ResouceTypeSqlAlchemyRepository(ResourceTypeRepository):
         return self.session.query(ocloud.ResourceType).filter_by(
             resourceTypeId=resource_type_id).first()
 
+    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) -> List[ocloud.ResourceType]:
         return self.session.query(ocloud.ResourceType)
 
@@ -112,9 +116,9 @@ class ResourceSqlAlchemyRepository(ResourceRepository):
             return res
         return recursive(resource_id)
 
-    def _list(self, resourcepool_id) -> List[ocloud.Resource]:
+    def _list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]:
         return self.session.query(ocloud.Resource).filter_by(
-            resourcePoolId=resourcepool_id)
+            resourcePoolId=resourcepool_id, **kwargs)
 
     def _update(self, resource: ocloud.Resource):
         self.session.add(resource)
@@ -162,24 +166,24 @@ class SubscriptionSqlAlchemyRepository(SubscriptionRepository):
             subscriptionId=subscription_id).delete()
 
 
-class RegistrationSqlAlchemyRepository(RegistrationRepository):
+class ConfigurationSqlAlchemyRepository(ConfigurationRepository):
     def __init__(self, session):
         super().__init__()
         self.session = session
 
-    def _add(self, registration: subscription_obj.Registration):
-        self.session.add(registration)
+    def _add(self, configuration: configuration_obj.Configuration):
+        self.session.add(configuration)
 
-    def _get(self, registration_id) -> subscription_obj.Registration:
-        return self.session.query(subscription_obj.Registration).filter_by(
-            registrationId=registration_id).first()
+    def _get(self, configuration_id) -> configuration_obj.Configuration:
+        return self.session.query(configuration_obj.Configuration).filter_by(
+            configurationId=configuration_id).first()
 
-    def _list(self) -> List[subscription_obj.Registration]:
-        return self.session.query(subscription_obj.Registration)
+    def _list(self) -> List[configuration_obj.Configuration]:
+        return self.session.query(configuration_obj.Configuration)
 
-    def _update(self, registration: subscription_obj.Registration):
-        self.session.add(registration)
+    def _update(self, configuration: configuration_obj.Configuration):
+        self.session.add(configuration)
 
-    def _delete(self, registration_id):
-        self.session.query(subscription_obj.Registration).filter_by(
-            registrationId=registration_id).delete()
+    def _delete(self, configuration_id):
+        self.session.query(configuration_obj.Configuration).filter_by(
+            configurationId=configuration_id).delete()