From: maopengzhang <zhang.maopeng1@zte.com.cn>
Date: Mon, 12 Nov 2018 12:02:17 +0000 (+0800)
Subject: fix querry pnf error
X-Git-Tag: 1.2.1~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F72419%2F2;p=vfc%2Fnfvo%2Fcatalog.git

fix querry pnf error

fix querry pnf error, etc

Change-Id: Ib40bb0bc195cd1b277e86cfef02704ab66c962aa
Issue-ID: VFC-1158
Signed-off-by: maopengzhang <zhang.maopeng1@zte.com.cn>
---

diff --git a/catalog/packages/biz/pnf_descriptor.py b/catalog/packages/biz/pnf_descriptor.py
index 712daf9d..2a5ccc14 100644
--- a/catalog/packages/biz/pnf_descriptor.py
+++ b/catalog/packages/biz/pnf_descriptor.py
@@ -53,8 +53,11 @@ class PnfDescriptor(object):
         logger.info('A PNFD(%s) has been created.' % data['id'])
         return data
 
-    def query_multiple(self):
-        pnf_pkgs = PnfPackageModel.objects.all()
+    def query_multiple(self, pnfdId=None):
+        if pnfdId:
+            pnf_pkgs = PnfPackageModel.objects.filter(pnfdId=pnfdId)
+        else:
+            pnf_pkgs = PnfPackageModel.objects.all()
         response_data = []
         for pnf_pkg in pnf_pkgs:
             data = self.fill_response_data(pnf_pkg)
diff --git a/catalog/packages/views/pnf_descriptor_views.py b/catalog/packages/views/pnf_descriptor_views.py
index 618e6e05..0dabfad9 100644
--- a/catalog/packages/views/pnf_descriptor_views.py
+++ b/catalog/packages/views/pnf_descriptor_views.py
@@ -124,7 +124,11 @@ def pnf_descriptors_rc(request):
 
     if request.method == 'GET':
         try:
-            data = PnfDescriptor().query_multiple()
+            pnfdId = request.query_params.get('pnfdId', None)
+            if pnfdId:
+                data = PnfDescriptor().query_multiple(pnfdId)
+            else:
+                data = PnfDescriptor().query_multiple()
             pnfd_infos = validate_data(data, PnfdInfosSerializer)
             return Response(data=pnfd_infos.data, status=status.HTTP_200_OK)
         except Exception as e: