X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fdomain%2Focloud_repo.py;h=cf2d97999cc9b169c8f9496515a2f026ec745f32;hb=58994b7d851b47456eed1820d36cc06803777e3b;hp=9f86c9d1ede4f03e1b3f0557b58a00c7e96de91a;hpb=f7ef52a5b4ead0472b1b5828471b28c88d2a0aea;p=pti%2Fo2.git diff --git a/o2ims/domain/ocloud_repo.py b/o2ims/domain/ocloud_repo.py index 9f86c9d..cf2d979 100644 --- a/o2ims/domain/ocloud_repo.py +++ b/o2ims/domain/ocloud_repo.py @@ -31,8 +31,8 @@ class OcloudRepository(abc.ABC): self.seen.add(ocloud) return ocloud - def list(self) -> List[ocloud.Ocloud]: - return self._list() + def list(self, *args) -> List[ocloud.Ocloud]: + return self._list(*args) def update(self, ocloud: ocloud.Ocloud): self._update(ocloud) @@ -49,6 +49,10 @@ class OcloudRepository(abc.ABC): def _get(self, ocloud_id) -> ocloud.Ocloud: raise NotImplementedError + @abc.abstractmethod + def _list(self, *args) -> List[ocloud.Ocloud]: + raise NotImplementedError + @abc.abstractmethod def _update(self, ocloud: ocloud.Ocloud): raise NotImplementedError @@ -74,12 +78,12 @@ class ResourceTypeRepository(abc.ABC): self.seen.add(resource_type) return resource_type - def list(self, **kwargs) -> List[ocloud.ResourceType]: - return self._list(**kwargs)[1] + def list(self, *args) -> List[ocloud.ResourceType]: + return self._list(*args)[1] - def list_with_count(self, **kwargs) -> \ + def list_with_count(self, *args, **kwargs) -> \ Tuple[int, List[ocloud.ResourceType]]: - return self._list(**kwargs) + return self._list(*args, **kwargs) def update(self, resource_type: ocloud.ResourceType): self._update(resource_type) @@ -120,12 +124,12 @@ class ResourcePoolRepository(abc.ABC): self.seen.add(resource_pool) return resource_pool - def list(self, **kwargs) -> List[ocloud.ResourcePool]: - return self._list(**kwargs)[1] + def list(self, *args) -> List[ocloud.ResourcePool]: + return self._list(*args)[1] - def list_with_count(self, **kwargs) -> \ + def list_with_count(self, *args, **kwargs) -> \ Tuple[int, List[ocloud.ResourcePool]]: - return self._list(**kwargs) + return self._list(*args, **kwargs) def update(self, resource_pool: ocloud.ResourcePool): self._update(resource_pool) @@ -162,12 +166,12 @@ class ResourceRepository(abc.ABC): self.seen.add(resource) return resource - def list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]: - return self._list(resourcepool_id, **kwargs)[1] + def list(self, resourcepool_id, *args) -> List[ocloud.Resource]: + return self._list(resourcepool_id, *args)[1] - def list_with_count(self, resourcepool_id, **kwargs) -> \ + def list_with_count(self, resourcepool_id, *args, **kwargs) -> \ Tuple[int, List[ocloud.Resource]]: - return self._list(resourcepool_id, **kwargs) + return self._list(resourcepool_id, *args, **kwargs) def update(self, resource: ocloud.Resource): self._update(resource) @@ -205,12 +209,12 @@ class DeploymentManagerRepository(abc.ABC): self.seen.add(deployment_manager) return deployment_manager - def list(self, **kwargs) -> List[ocloud.DeploymentManager]: - return self._list(**kwargs)[1] + def list(self, *args) -> List[ocloud.DeploymentManager]: + return self._list(*args)[1] - def list_with_count(self, **kwargs) -> \ + def list_with_count(self, *args, **kwargs) -> \ Tuple[int, List[ocloud.DeploymentManager]]: - return self._list(**kwargs) + return self._list(*args, **kwargs) def update(self, deployment_manager: ocloud.DeploymentManager): self._update(deployment_manager)