From: laili <lai.li@zte.com.cn>
Date: Fri, 24 Aug 2018 11:49:12 +0000 (+0800)
Subject: Ns descriptor related stuffs.
X-Git-Tag: 1.2.0~59
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4cbfd5040075d303667bede35f4235cb5d8bd65d;p=vfc%2Fnfvo%2Fcatalog.git

Ns descriptor related stuffs.

Add a test to query multiple nsds.

Change-Id: I74a1dcde1b091286cd14633c175cab1d305d8ad2
Issue-ID: VFC-1037
Signed-off-by: laili <lai.li@zte.com.cn>
---

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index 2f600ff5..daf287e0 100644
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -53,7 +53,7 @@ def query_multiple():
         raise CatalogException('NS descriptors do not exist.')
     response_data = []
     for ns_pkg in ns_pkgs:
-        data = fill_resp_data()
+        data = fill_resp_data(ns_pkg)
         response_data.append(data)
     return response_data
 
diff --git a/catalog/packages/tests/test_ns_descriptor.py b/catalog/packages/tests/test_ns_descriptor.py
index e7caf0fc..d7e09e34 100644
--- a/catalog/packages/tests/test_ns_descriptor.py
+++ b/catalog/packages/tests/test_ns_descriptor.py
@@ -55,7 +55,67 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(expected_reponse_data, response.data)
 
     def test_query_multiple_nsds_normal(self):
-        pass
+        expected_reponse_data = [
+            {
+                'id': '0',
+                'nsdId': None,
+                'nsdName': None,
+                'nsdVersion': None,
+                'nsdDesigner': None,
+                'nsdInvariantId': None,
+                'vnfPkgIds': [],
+                'pnfdInfoIds': [],
+                'nestedNsdInfoIds': [],
+                'nsdOnboardingState': 'CREATED',
+                'onboardingFailureDetails': None,
+                'nsdOperationalState': 'DISABLED',
+                'nsdUsageState': 'NOT_IN_USE',
+                'userDefinedData': {
+                    'key1': 'value1',
+                    'key2': 'value2',
+                    'key3': 'value3',
+                },
+                '_links': None
+            },
+            {
+                'id': '1',
+                'nsdId': None,
+                'nsdName': None,
+                'nsdVersion': None,
+                'nsdDesigner': None,
+                'nsdInvariantId': None,
+                'vnfPkgIds': [],
+                'pnfdInfoIds': [],
+                'nestedNsdInfoIds': [],
+                'nsdOnboardingState': 'CREATED',
+                'onboardingFailureDetails': None,
+                'nsdOperationalState': 'DISABLED',
+                'nsdUsageState': 'NOT_IN_USE',
+                'userDefinedData': {
+                    'key1': 'value1',
+                    'key2': 'value2',
+                    'key3': 'value3',
+                },
+                '_links': None
+            }
+        ]
+        user_defined_data = {
+            'key1': 'value1',
+            'key2': 'value2',
+            'key3': 'value3',
+        }
+        user_defined_data = json.JSONEncoder().encode(user_defined_data)
+        for i in range(2):
+            NSPackageModel(
+                nsPackageId=str(i),
+                onboardingState='CREATED',
+                operationalState='DISABLED',
+                usageState='NOT_IN_USE',
+                userDefinedData=user_defined_data
+            ).save()
+        response = self.client.get('/api/nsd/v1/ns_descriptors', format='json')
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(expected_reponse_data, response.data)
 
     def test_query_single_nsd_normal(self):
         expected_reponse_data = {