diff options
Diffstat (limited to 'src/onapsdk/aai/cloud_infrastructure')
-rw-r--r-- | src/onapsdk/aai/cloud_infrastructure/cloud_region.py | 3 | ||||
-rw-r--r-- | src/onapsdk/aai/cloud_infrastructure/tenant.py | 16 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/onapsdk/aai/cloud_infrastructure/cloud_region.py b/src/onapsdk/aai/cloud_infrastructure/cloud_region.py index 997f426..171be34 100644 --- a/src/onapsdk/aai/cloud_infrastructure/cloud_region.py +++ b/src/onapsdk/aai/cloud_infrastructure/cloud_region.py @@ -22,6 +22,7 @@ from onapsdk.exceptions import ResourceNotFound from ..aai_element import AaiResource from ..mixins.link_to_complex import AaiResourceLinkToComplexMixin +from ..mixins.link_to_project import AaiResourceLinkToProjectMixin from .complex import Complex from .tenant import Tenant @@ -66,7 +67,7 @@ class EsrSystemInfo: # pylint: disable=too-many-instance-attributes openstack_region_id: str = None -class CloudRegion(AaiResource, AaiResourceLinkToComplexMixin): # pylint: disable=too-many-instance-attributes +class CloudRegion(AaiResource, AaiResourceLinkToComplexMixin, AaiResourceLinkToProjectMixin): # pylint: disable=too-many-instance-attributes """Cloud region class. Represents A&AI cloud region object. diff --git a/src/onapsdk/aai/cloud_infrastructure/tenant.py b/src/onapsdk/aai/cloud_infrastructure/tenant.py index 13d9aec..7377b8e 100644 --- a/src/onapsdk/aai/cloud_infrastructure/tenant.py +++ b/src/onapsdk/aai/cloud_infrastructure/tenant.py @@ -12,11 +12,11 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# from onapsdk.aai.cloud_infrastructure.cloud_region import CloudRegion +#from onapsdk.aai.cloud_infrastructure.cloud_region import CloudRegion from ..aai_element import AaiResource -class Tenant(AaiResource): +class Tenant(AaiResource): # pylint: disable=too-many-instance-attributes """Tenant class.""" def __init__(self, # pylint: disable=too-many-arguments @@ -69,9 +69,12 @@ class Tenant(AaiResource): str: Url to get all tenants """ - return (f"{cls.base_url}{cls.api_version}/cloud-infrastructure/cloud-regions/cloud-region/" - f"{cloud_region.cloud_owner}/{cloud_region.cloud_region_id}" - f"/tenants/") + return ( + f"{cls.base_url}{cls.api_version}/cloud-infrastructure/" + f"cloud-regions/cloud-region/" + f"{cloud_region.cloud_owner}/{cloud_region.cloud_region_id}" + f"/tenants/" + ) @property def url(self) -> str: @@ -82,7 +85,8 @@ class Tenant(AaiResource): """ return ( - f"{self.base_url}{self.api_version}/cloud-infrastructure/cloud-regions/cloud-region/" + f"{self.base_url}{self.api_version}/cloud-infrastructure/" + f"cloud-regions/cloud-region/" f"{self.cloud_region.cloud_owner}/{self.cloud_region.cloud_region_id}" f"/tenants/tenant/{self.tenant_id}?" f"resource-version={self.resource_version}" |