aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorsheetal ghadge <sheetal.ghadge@t-systems.com>2023-10-19 14:44:47 +0530
committerMicha? Jagie??o <michal.jagiello@t-mobile.pl>2023-10-27 06:27:34 +0000
commit9fc6a07149040ea57876b17fa6bca123f03ce15c (patch)
treec0fe9cf295ece58881316e66420f26ccd836aa05 /src
parenta02a458f87329d4d5240b98fdc35f603077948e7 (diff)
Formatting fixes on NBI module
Updated __repr__ method for str & some pylama fix for long lines. Issue-ID: TEST-411 Change-Id: Id046b2e8b06fefdb64b6245f3195a546e733299d Signed-off-by: sheetal ghadge <sheetal.ghadge@t-systems.com>
Diffstat (limited to 'src')
-rw-r--r--src/onapsdk/nbi/nbi.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/onapsdk/nbi/nbi.py b/src/onapsdk/nbi/nbi.py
index 17356cb..7afc718 100644
--- a/src/onapsdk/nbi/nbi.py
+++ b/src/onapsdk/nbi/nbi.py
@@ -184,8 +184,11 @@ class Service(Nbi):
"""
return (f"Service(name={self.name}, service_id={self.service_id}, "
- f"service_specification={self.service_specification}, customer={self.customer}, "
- f"customer_role={self.customer_role})")
+ f"service_specification_id={self._service_specification_id}, "
+ f"service_specification_name={self._service_specification_name}, "
+ f"customer_id={self._customer_id}, "
+ f"customer_role={self.customer_role}, "
+ f"href={self.href})")
@classmethod
def get_all(cls, customer_id: str = 'generic') -> Iterator["Service"]:
@@ -199,9 +202,11 @@ class Service(Nbi):
"""
for service in cls.send_message_json("GET",
- "Get service instances from NBI",
- f"{cls.base_url}{cls.api_version}/service?"
- f"relatedParty.id={customer_id}"):
+ f"Get service instances from NBI {customer_id}"
+ f" ID from NBI",
+ f"{cls.base_url}{cls.api_version}/"
+ f"service/?relatedParty.id={customer_id}"
+ ):
yield cls(service.get("name"),
service.get("id"),
service.get("serviceSpecification", {}).get("name"),
@@ -343,8 +348,8 @@ class ServiceOrder(Nbi, WaitForFinishMixin): # pylint: disable=too-many-instanc
if not self._service_specification_id:
self._logger.error("No service specification")
return None
- self._service_specification = ServiceSpecification.\
- get_by_id(self._service_specification_id)
+ self._service_specification = ServiceSpecification.get_by_id(
+ self._service_specification_id)
return self._service_specification
@classmethod
@@ -371,9 +376,9 @@ class ServiceOrder(Nbi, WaitForFinishMixin): # pylint: disable=too-many-instanc
description=service_order.get("description"),
external_id=service_order.get("externalId"),
customer_id=service_order_related_party,
- service_specification_id=service_order.get("orderItem", [{}])[0].get("service")\
+ service_specification_id=service_order.get("orderItem", [{}])[0].get("service") \
.get("serviceSpecification").get("id"),
- service_instance_name=service_order.get("orderItem", [{}])[0].\
+ service_instance_name=service_order.get("orderItem", [{}])[0]. \
get("service", {}).get("name"),
state=service_order.get("state")
)