Fix nfdeployment deleting issue

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

diff --git a/o2ims/domain/ocloud_repo.py b/o2ims/domain/ocloud_repo.py
index 48ad840..1c63de8 100644 (file)
--- a/o2ims/domain/ocloud_repo.py
+++ b/o2ims/domain/ocloud_repo.py
@@ -36,6 +36,7 @@ class OcloudRepository(abc.ABC):
 \r
     def update(self, ocloud: ocloud.Ocloud):\r
         self._update(ocloud)\r
+        self.seen.add(ocloud)\r
 \r
     # def update_fields(self, ocloudid: str, updatefields: dict):\r
     #     self._update(ocloudid, updatefields)\r
@@ -67,11 +68,18 @@ 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
     def update(self, resource_type: ocloud.ResourceType):\r
         self._update(resource_type)\r
+        self.seen.add(resource_type)\r
 \r
     @abc.abstractmethod\r
     def _add(self, resource_type: ocloud.ResourceType):\r
@@ -81,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
@@ -105,6 +117,7 @@ class ResourcePoolRepository(abc.ABC):
 \r
     def update(self, resource_pool: ocloud.ResourcePool):\r
         self._update(resource_pool)\r
+        self.seen.add(resource_pool)\r
 \r
     @abc.abstractmethod\r
     def _add(self, resource_pool: ocloud.ResourcePool):\r
@@ -133,11 +146,12 @@ class ResourceRepository(abc.ABC):
             self.seen.add(resource)\r
         return resource\r
 \r
-    def list(self) -> List[ocloud.Resource]:\r
-        return self._list()\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
+        self.seen.add(resource)\r
 \r
     @abc.abstractmethod\r
     def _add(self, resource: ocloud.Resource):\r
@@ -147,6 +161,43 @@ 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
+\r
+\r
+class DeploymentManagerRepository(abc.ABC):\r
+    def __init__(self):\r
+        self.seen = set()  # type: Set[ocloud.DeploymentManager]\r
+\r
+    def add(self, deployment_manager: ocloud.DeploymentManager):\r
+        self._add(deployment_manager)\r
+        self.seen.add(deployment_manager)\r
+\r
+    def get(self, deployment_manager_id) -> ocloud.DeploymentManager:\r
+        deployment_manager = self._get(deployment_manager_id)\r
+        if deployment_manager:\r
+            self.seen.add(deployment_manager)\r
+        return deployment_manager\r
+\r
+    def list(self) -> List[ocloud.DeploymentManager]:\r
+        return self._list()\r
+\r
+    def update(self, deployment_manager: ocloud.DeploymentManager):\r
+        self._update(deployment_manager)\r
+\r
+    @abc.abstractmethod\r
+    def _add(self, deployment_manager: ocloud.DeploymentManager):\r
+        raise NotImplementedError\r
+\r
+    @abc.abstractmethod\r
+    def _get(self, deployment_manager_id) -> ocloud.DeploymentManager:\r
+        raise NotImplementedError\r
+\r
+    @abc.abstractmethod\r
+    def _update(self, deployment_manager: ocloud.DeploymentManager):\r
+        raise NotImplementedError\r