From: laili Date: Fri, 24 Aug 2018 12:04:54 +0000 (+0800) Subject: Ns descriptor related stuffs. X-Git-Tag: 1.2.0~56 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=1208c9e6e845fc4f4de561db0c7f1d29af20d5a9;p=vfc%2Fnfvo%2Fcatalog.git Ns descriptor related stuffs. Add a test to query multiple pnds. Change-Id: I60fb15e406b555933ad724fd39c3ccddec7a0ff1 Issue-ID: VFC-1037 Signed-off-by: laili --- diff --git a/catalog/packages/tests/test_pnf_descriptor.py b/catalog/packages/tests/test_pnf_descriptor.py index d261968a..e5c48f1d 100644 --- a/catalog/packages/tests/test_pnf_descriptor.py +++ b/catalog/packages/tests/test_pnf_descriptor.py @@ -52,7 +52,58 @@ class TestPnfDescriptor(TestCase): self.assertEqual(expected_reponse_data, response.data) def test_query_multiple_pnfds_normal(self): - pass + expected_reponse_data = [ + { + 'id': '0', + 'pnfdId': None, + 'pnfdName': None, + 'pnfdVersion': None, + 'pnfdProvider': None, + 'pnfdInvariantId': None, + 'pnfdOnboardingState': 'CREATED', + 'onboardingFailureDetails': None, + 'pnfdUsageState': 'NOT_IN_USE', + 'userDefinedData': { + 'key1': 'value1', + 'key2': 'value2', + 'key3': 'value3', + }, + '_links': None + }, + { + 'id': '1', + 'pnfdId': None, + 'pnfdName': None, + 'pnfdVersion': None, + 'pnfdProvider': None, + 'pnfdInvariantId': None, + 'pnfdOnboardingState': 'CREATED', + 'onboardingFailureDetails': None, + 'pnfdUsageState': '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): + PnfPackageModel( + pnfPackageId=str(i), + onboardingState='CREATED', + usageState='NOT_IN_USE', + userDefinedData=user_defined_data + ).save() + response = self.client.get('/api/nsd/v1/pnf_descriptors', format='json') + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertEqual(expected_reponse_data, response.data) def test_query_single_pnfd_normal(self): expected_reponse_data = {