Add default value for user defined data

Change-Id: I64d800014ec1adb87eaa7db6f70fc8f08fb4c347
Issue-ID: VFC-1151
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index f625da6..5741eac 100644 (file)
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -39,7 +39,7 @@ class NsDescriptor(object):
 
     def create(self, data, id=None):
         logger.info('Start to create a NSD...')
-        user_defined_data = ignore_case_get(data, 'userDefinedData')
+        user_defined_data = ignore_case_get(data, 'userDefinedData', {})
         data = {
             'id': id if id else str(uuid.uuid4()),
             'nsdOnboardingState': PKG_STATUS.CREATED,

diff --git a/catalog/packages/biz/pnf_descriptor.py b/catalog/packages/biz/pnf_descriptor.py
index 3910c44..fe77344 100644 (file)
--- a/catalog/packages/biz/pnf_descriptor.py
+++ b/catalog/packages/biz/pnf_descriptor.py
@@ -36,7 +36,7 @@ class PnfDescriptor(object):
 
     def create(self, data):
         logger.info('Start to create a PNFD...')
-        user_defined_data = ignore_case_get(data, 'userDefinedData')
+        user_defined_data = ignore_case_get(data, 'userDefinedData', {})
         data = {
             'id': str(uuid.uuid4()),
             'pnfdOnboardingState': PKG_STATUS.CREATED,

diff --git a/catalog/packages/biz/vnf_package.py b/catalog/packages/biz/vnf_package.py
index 4f9c939..0444e98 100644 (file)
--- a/catalog/packages/biz/vnf_package.py
+++ b/catalog/packages/biz/vnf_package.py
@@ -39,7 +39,7 @@ class VnfPackage(object):
         pass
 
     def create_vnf_pkg(self, data):
-        user_defined_data = ignore_case_get(data, "userDefinedData")
+        user_defined_data = ignore_case_get(data, "userDefinedData", {})
         vnf_pkg_id = str(uuid.uuid4())
         VnfPackageModel.objects.create(
             vnfPackageId=vnf_pkg_id,

diff --git a/catalog/packages/tests/test_ns_descriptor.py b/catalog/packages/tests/test_ns_descriptor.py
index 8ed04d0..3f8d245 100644 (file)
--- a/catalog/packages/tests/test_ns_descriptor.py
+++ b/catalog/packages/tests/test_ns_descriptor.py
@@ -80,11 +80,6 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(expected_reponse_data, response.data)
 
-    def test_nsd_create_failed(self):
-        reqest_data = {'username': "111"}
-        response = self.client.post('/api/nsd/v1/ns_descriptors', data=reqest_data, format='json')
-        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-
     def test_query_multiple_nsds_normal(self):
         expected_reponse_data = [
             copy.deepcopy(self.expected_nsd_info),

diff --git a/catalog/packages/tests/test_pnf_descriptor.py b/catalog/packages/tests/test_pnf_descriptor.py
index 7afdeae..277676f 100644 (file)
--- a/catalog/packages/tests/test_pnf_descriptor.py
+++ b/catalog/packages/tests/test_pnf_descriptor.py
@@ -75,11 +75,6 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(expected_reponse_data, response.data)
 
-    def test_pnfd_create_failed(self):
-        request_data = {'username': "111"}
-        response = self.client.post('/api/nsd/v1/pnf_descriptors', data=request_data, format='json')
-        self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
-
     def test_query_multiple_pnfds_normal(self):
         expected_reponse_data = [
             copy.deepcopy(self.expected_pnfd_info),