Merge "Ns descriptor related stuffs."

3 files changed, 12 insertions, 9 deletions

diff --git a/catalog/packages/biz/ns_descriptor.py b/catalog/packages/biz/ns_descriptor.py
index acde4eba..b69b8e4e 100644
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -38,6 +38,7 @@ def create(data):
     }
     NSPackageModel(
         nsPackageId=data['id'],
+        onboardingState=data['nsdOnboardingState'],
         operationalState=data['nsdOperationalState'],
         usageState=data['nsdUsageState'],
         userDefinedData=data['userDefinedData']
@@ -61,7 +62,7 @@ def query_multiple():
             'vnfPkgIds': [],
             'pnfdInfoIds': [],  # TODO
             'nestedNsdInfoIds': [],  # TODO
-            'nsdOnboardingState': 'CREATED',
+            'nsdOnboardingState': ns_pkg.onboardingState,
             'onboardingFailureDetails': None,  # TODO
             'nsdOperationalState': ns_pkg.operationalState,
             'nsdUsageState': ns_pkg.usageState,
@@ -70,14 +71,6 @@ def query_multiple():
         }
 
         if ns_pkg.nsdModel:
-            data['nsdOnboardingState'] = 'ONBOARDED'
-        elif ns_pkg.localFilePath:  # TODO: strip()
-            data['nsdOnboardingState'] = 'PROCESSING'
-        elif ns_pkg.nsdId:
-            data['nsdOnboardingState'] = 'UPLOADING'
-            data['nsdOnboardingState'] = 'CREATED'
-
-        if ns_pkg.nsdModel:
             nsd_model = json.JSONDecoder().decode(ns_pkg.nsdModel)
             vnf_pkg_ids = []
             for vnf in nsd_model['vnfs']:
diff --git a/catalog/packages/tests/test_nsd.py b/catalog/packages/tests/test_ns_descriptor.py
index 268f382f..c640b842 100644
--- a/catalog/packages/tests/test_nsd.py
+++ b/catalog/packages/tests/test_ns_descriptor.py
@@ -55,6 +55,15 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(expected_reponse_data, response.data)
 
+        def test_query_multiple_nsds_normal(self):
+            pass
+
+        def test_query_single_nsd_normal(self):
+            pass
+
+        def test_delete_single_nsd_normal(self):
+            pass
+
     def test_nsd_content_upload_normal(self):
         with open('nsd_content.txt', 'wb') as fp:
             fp.write('test')
diff --git a/catalog/pub/database/models.py b/catalog/pub/database/models.py
index 889a7e6d..3ae7d702 100644
--- a/catalog/pub/database/models.py
+++ b/catalog/pub/database/models.py
@@ -20,6 +20,7 @@ class NSPackageModel(models.Model):
     nsPackageUri = models.CharField(db_column='NSPACKAGEURI', max_length=300, null=True, blank=True)
     checksum = models.CharField(db_column='CHECKSUM', max_length=50, null=True, blank=True)  # checksum
     sdcCsarId = models.CharField(db_column='SDCCSARID', max_length=50, null=True, blank=True)  # SdcCSARUri
+    onboardingState = models.CharField(db_column='ONBOARDINGSTATE', max_length=20, blank=True, null=True)
     operationalState = models.CharField(db_column='OPERATIONALSTATE', max_length=20, blank=True, null=True)  # operationalState
     usageState = models.CharField(db_column='USAGESTATE', max_length=20, blank=True, null=True)  # usageState
     deletionPending = models.CharField(db_column='DELETIONPENDING', max_length=20, blank=True, null=True)  # deletionPending