Ns descriptor related stuffs.

Modify the biz for uploading of nsd content.

Change-Id: I89f78cf7d82f4152a74341f0b6d9f8a01770ba80
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 b9ebdf4..acde4eb 100644 (file)
--- a/catalog/packages/biz/ns_descriptor.py
+++ b/catalog/packages/biz/ns_descriptor.py
@@ -155,21 +155,19 @@ def delete_single(nsd_info_id):
     ns_pkgs.delete()
 
 
-def upload(files, nsd_info_id):
-    remote_files = files
-    for remote_file in remote_files:
-        local_file_name = remote_file.name
-        local_file_dir = os.path.join(CATALOG_ROOT_PATH, nsd_info_id)
-        local_file_name = os.path.join(local_file_dir, local_file_name)
-        if not os.path.exists(local_file_dir):
-            fileutil.make_dirs(local_file_dir)
-        with open(local_file_name, 'wb') as local_file:
-            if remote_file.multiple_chunks(chunk_size=None):
-                for chunk in remote_file.chunks():
-                    local_file.write(chunk)
-            else:
-                data = remote_file.read()
-                local_file.write(data)
+def upload(remote_file, nsd_info_id):
+    local_file_name = remote_file.name
+    local_file_dir = os.path.join(CATALOG_ROOT_PATH, nsd_info_id)
+    local_file_name = os.path.join(local_file_dir, local_file_name)
+    if not os.path.exists(local_file_dir):
+        fileutil.make_dirs(local_file_dir)
+    with open(local_file_name, 'wb') as local_file:
+        if remote_file.multiple_chunks(chunk_size=None):
+            for chunk in remote_file.chunks():
+                local_file.write(chunk)
+        else:
+            data = remote_file.read()
+            local_file.write(data)
 
 
 def fill_resp_data(ns_pkg):

diff --git a/catalog/packages/views/nsd_content_views.py b/catalog/packages/views/nsd_content_views.py
index 2c49f14..ed580e4 100644 (file)
--- a/catalog/packages/views/nsd_content_views.py
+++ b/catalog/packages/views/nsd_content_views.py
@@ -63,7 +63,7 @@ def upload_nsd_content(request, *args, **kwargs):
     nsd_info_id = kwargs.get("nsdInfoId")
     files = request.FILES.getlist('file')
     try:
-        upload(files, nsd_info_id)
+        upload(files[0], nsd_info_id)
         return Response(data={}, status=status.HTTP_204_NO_CONTENT)
     except IOError:
         logger.error(traceback.format_exc())