From: K Sai Kiran <saikiran.k@tataelxsi.co.in>
Date: Fri, 28 Aug 2020 09:41:48 +0000 (+0530)
Subject: Fixed bug 1197
X-Git-Tag: release-v9.0-start~20
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d010e3e44d9b06012dc741aca98054e3a87c5f22;p=osm%2FNBI.git

Fixed bug 1197

Added api_req arguments to add show methods to make
them compatible with engine.py call signature.

Change-Id: I161515e0cc71596fde28e138561f7bb399e206fc
Signed-off-by: K Sai Kiran <saikiran.k@tataelxsi.co.in>
---

diff --git a/osm_nbi/admin_topics.py b/osm_nbi/admin_topics.py
index 7e71459..3c3249c 100644
--- a/osm_nbi/admin_topics.py
+++ b/osm_nbi/admin_topics.py
@@ -679,12 +679,13 @@ class UserTopicAuth(UserTopic):
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id or username
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         # Allow _id to be a name or uuid
@@ -817,6 +818,7 @@ class UserTopicAuth(UserTopic):
         Get a list of the topic that matches a filter
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param filter_q: filter of data to be applied
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: The list, it can be empty if no one match the filter.
         """
         user_list = self.auth.get_user_list(filter_q)
@@ -963,12 +965,13 @@ class ProjectTopicAuth(ProjectTopic):
         except ValidationError as e:
             raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY)
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         # Allow _id to be a name or uuid
@@ -1231,12 +1234,13 @@ class RoleTopicAuth(BaseTopic):
             final_content["permissions"]["admin"] = False
         return None
 
-    def show(self, session, _id):
+    def show(self, session, _id, api_req=False):
         """
         Get complete information on an topic
 
         :param session: contains "username", "admin", "force", "public", "project_id", "set_project"
         :param _id: server internal id
+        :param api_req: True if this call is serving an external API request. False if serving internal request.
         :return: dictionary, raise exception if not found.
         """
         filter_q = {BaseTopic.id_field(self.topic, _id): _id}
diff --git a/osm_nbi/pmjobs_topics.py b/osm_nbi/pmjobs_topics.py
index 7fa2035..6ce8b3d 100644
--- a/osm_nbi/pmjobs_topics.py
+++ b/osm_nbi/pmjobs_topics.py
@@ -65,7 +65,7 @@ class PmJobsTopic():
         except aiohttp.client_exceptions.ClientConnectorError as e:
             raise EngineException("Connection to '{}'Failure: {}".format(self.url, e))
 
-    def show(self, session, ns_id):
+    def show(self, session, ns_id, api_req=False):
         metrics_list = self._get_vnf_metric_list(ns_id)
         loop = asyncio.new_event_loop()
         asyncio.set_event_loop(loop)