From: laili <lai.li@zte.com.cn>
Date: Tue, 21 Aug 2018 05:57:38 +0000 (+0800)
Subject: Ns descriptor related stuffs.
X-Git-Tag: 1.2.0~119^2~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bd5707a94776fe49505cda0e25530e2db5ddf698;p=vfc%2Fnfvo%2Fcatalog.git

Ns descriptor related stuffs.

Add a urlpattern.
Add a test to uploading of nsd content.

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

diff --git a/catalog/packages/tests/test_nsd.py b/catalog/packages/tests/test_nsd.py
index a1b344c1..268f382f 100644
--- a/catalog/packages/tests/test_nsd.py
+++ b/catalog/packages/tests/test_nsd.py
@@ -13,6 +13,8 @@
 # limitations under the License.
 
 
+import os
+
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
@@ -54,7 +56,18 @@ class TestNsDescriptor(TestCase):
         self.assertEqual(expected_reponse_data, response.data)
 
     def test_nsd_content_upload_normal(self):
-        pass
+        with open('nsd_content.txt', 'wb') as fp:
+            fp.write('test')
+
+        with open('nsd_content.txt', 'rb') as fp:
+            resp = self.client.put(
+                "/api/nsd/v1/ns_descriptors/22/nsd_content",
+                {'file': fp},
+            )
+        self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT)
+        self.assertEqual({}, resp.data)
+
+        os.remove('nsd_content.txt')
 
     def test_nsd_content_upload_failure(self):
         pass
diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py
index 466dba07..7cd72cde 100644
--- a/catalog/packages/urls.py
+++ b/catalog/packages/urls.py
@@ -14,7 +14,7 @@
 
 from django.conf.urls import url
 
-from catalog.packages.views import catalog_views, ns_descriptor_views
+from catalog.packages.views import catalog_views, ns_descriptor_views, nsd_content_views
 
 
 urlpatterns = [
@@ -28,7 +28,7 @@ urlpatterns = [
     # NSD
     url(r'^api/nsd/v1/ns_descriptors$', ns_descriptor_views.create_ns_descriptors, name='ns_descriptors_rc'),
     url(r'^api/nsd/v1/ns_descriptors$', ns_descriptor_views.query_ns_descriptors, name='ns_info_rd'),
-    # url(r'^api/nsd/v1/ns_descriptors/(?P<nsdInfoId>[0-9a-zA-Z\-\_]+)/nsd_content$', nsd_content_views.upload_nsd_content, name='nsd_content_ru'),
+    url(r'^api/nsd/v1/ns_descriptors/(?P<nsdInfoId>[0-9a-zA-Z\-\_]+)/nsd_content$', nsd_content_views.upload_nsd_content, name='nsd_content_ru'),
 
     # TODO SOL005 & SOL003
     # url(r'^api/nsd/v1/pnf_descriptors', pnf_descriptors.as_view(), name='pnf_descriptors_rc'),