Fix: INF-254 ENUM type create failed while re-creating a pod

[pti/o2.git] / o2ims / domain / ocloud_repo.py

diff --git a/o2ims/domain/ocloud_repo.py b/o2ims/domain/ocloud_repo.py
index b224a68..1c63de8 100644 (file)
--- a/o2ims/domain/ocloud_repo.py
+++ b/o2ims/domain/ocloud_repo.py
@@ -68,6 +68,12 @@ class ResourceTypeRepository(abc.ABC):
             self.seen.add(resource_type)\r
         return resource_type\r
 \r
+    def get_by_name(self, resource_type_name) -> ocloud.ResourceType:\r
+        resource_type = self._get_by_name(resource_type_name)\r
+        if resource_type:\r
+            self.seen.add(resource_type)\r
+        return resource_type\r
+\r
     def list(self) -> List[ocloud.ResourceType]:\r
         return self._list()\r
 \r
@@ -83,6 +89,10 @@ class ResourceTypeRepository(abc.ABC):
     def _get(self, resource_type_id) -> ocloud.ResourceType:\r
         raise NotImplementedError\r
 \r
+    @abc.abstractmethod\r
+    def _get_by_name(self, resource_type_name) -> ocloud.ResourceType:\r
+        raise NotImplementedError\r
+\r
     @abc.abstractmethod\r
     def _update(self, resource_type: ocloud.ResourceType):\r
         raise NotImplementedError\r
@@ -136,8 +146,8 @@ class ResourceRepository(abc.ABC):
             self.seen.add(resource)\r
         return resource\r
 \r
-    def list(self, resourcepool_id) -> List[ocloud.Resource]:\r
-        return self._list(resourcepool_id)\r
+    def list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]:\r
+        return self._list(resourcepool_id, **kwargs)\r
 \r
     def update(self, resource: ocloud.Resource):\r
         self._update(resource)\r
@@ -151,6 +161,10 @@ class ResourceRepository(abc.ABC):
     def _get(self, resource_id) -> ocloud.Resource:\r
         raise NotImplementedError\r
 \r
+    @abc.abstractmethod\r
+    def _list(self, resourcepool_id, **kwargs) -> ocloud.Resource:\r
+        raise NotImplementedError\r
+\r
     @abc.abstractmethod\r
     def _update(self, resource: ocloud.Resource):\r
         raise NotImplementedError\r
@@ -187,43 +201,3 @@ class DeploymentManagerRepository(abc.ABC):
     @abc.abstractmethod\r
     def _update(self, deployment_manager: ocloud.DeploymentManager):\r
         raise NotImplementedError\r
-\r
-\r
-class SubscriptionRepository(abc.ABC):\r
-    def __init__(self):\r
-        self.seen = set()  # type: Set[ocloud.Subscription]\r
-\r
-    def add(self, subscription: ocloud.Subscription):\r
-        self._add(subscription)\r
-        self.seen.add(subscription)\r
-\r
-    def get(self, subscription_id) -> ocloud.Subscription:\r
-        subscription = self._get(subscription_id)\r
-        if subscription:\r
-            self.seen.add(subscription)\r
-        return subscription\r
-\r
-    def list(self) -> List[ocloud.Subscription]:\r
-        return self._list()\r
-\r
-    def update(self, subscription: ocloud.Subscription):\r
-        self._update(subscription)\r
-\r
-    def delete(self, subscription_id):\r
-        self._delete(subscription_id)\r
-\r
-    @abc.abstractmethod\r
-    def _add(self, subscription: ocloud.Subscription):\r
-        raise NotImplementedError\r
-\r
-    @abc.abstractmethod\r
-    def _get(self, subscription_id) -> ocloud.Subscription:\r
-        raise NotImplementedError\r
-\r
-    @abc.abstractmethod\r
-    def _update(self, subscription: ocloud.Subscription):\r
-        raise NotImplementedError\r
-\r
-    @abc.abstractmethod\r
-    def _delete(self, subscription_id):\r
-        raise NotImplementedError\r