From cc1725f1b9509163e0a61d8914e04c53f21e362b Mon Sep 17 00:00:00 2001 From: laili Date: Tue, 21 Aug 2018 20:56:19 +0800 Subject: [PATCH] Ns descriptor related stuffs. Add a urlpattern. Add a test to the uploading of pnfd content. Change-Id: Iec1ff7088068f35ef14b10d5122149e04b3ca453 Issue-ID: VFC-1037 Signed-off-by: laili --- catalog/packages/tests/test_pnfd.py | 14 +++++++++++++- catalog/packages/urls.py | 9 ++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/catalog/packages/tests/test_pnfd.py b/catalog/packages/tests/test_pnfd.py index 4d8e8603..35e7720f 100644 --- a/catalog/packages/tests/test_pnfd.py +++ b/catalog/packages/tests/test_pnfd.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os from django.test import TestCase from rest_framework import status @@ -53,7 +54,18 @@ class TestPnfDescriptor(TestCase): self.assertEqual(expected_reponse_data, response.data) def test_pnfd_content_upload_normal(self): - pass + with open('pnfd_content.txt', 'wb') as fp: + fp.write('test') + + with open('pnfd_content.txt', 'rb') as fp: + resp = self.client.put( + "/api/nsd/v1/pnf_descriptors/22/pnfd_content", + {'file': fp}, + ) + self.assertEqual(resp.status_code, status.HTTP_204_NO_CONTENT) + self.assertEqual({}, resp.data) + + os.remove('pnfd_content.txt') def test_pnfd_content_upload_failure(self): pass diff --git a/catalog/packages/urls.py b/catalog/packages/urls.py index 9c8d3d66..04fd6751 100644 --- a/catalog/packages/urls.py +++ b/catalog/packages/urls.py @@ -15,7 +15,9 @@ from django.conf.urls import url from catalog.packages.views.vnfpkg_views import package_content -from catalog.packages.views import catalog_views, ns_descriptor_views, nsd_content_views, pnf_descriptor_views +from catalog.packages.views import (catalog_views, ns_descriptor_views, + nsd_content_views, pnf_descriptor_views, + pnfd_content_views) urlpatterns = [ @@ -32,11 +34,12 @@ urlpatterns = [ url(r'^api/nsd/v1/ns_descriptors/(?P[0-9a-zA-Z\-\_]+)/nsd_content$', nsd_content_views.upload_nsd_content, name='nsd_content_ru'), # PNF - url(r'^api/nsd/v1/pnf_descriptors', pnf_descriptor_views.create_pnf_descriptors, name='pnf_descriptors_rc'), + url(r'^api/nsd/v1/pnf_descriptors$', pnf_descriptor_views.create_pnf_descriptors, name='pnf_descriptors_rc'), + url(r'^api/nsd/v1/pnf_descriptors/(?P[0-9a-zA-Z\-\_]+)/pnfd_content$', pnfd_content_views.upload_pnfd_content, name='pnfd_content_ru'), # TODO SOL005 & SOL003 # url(r'^api/nsd/v1/pnf_descriptors/(?P[0-9a-zA-Z\-\_]+)$', pnfd_info.as_view(), name='pnfd_info_rd'), - # url(r'^api/nsd/v1/pnf_descriptors/(?P[0-9a-zA-Z\-\_]+)$/pnfd_content', pnfd_content.as_view(), name='pnfd_content_ru'), + # url(r'^api/nsd/v1/subscriptions', nsd_subscriptions.as_view(), name='subscriptions_rc'), # url(r'^api/nsd/v1/subscriptions/(?P[0-9a-zA-Z\-\_]+)$', nsd_subscription.as_view(), name='subscription_rd'), # url(r'^api/vnfpkgm/v1/vnf_packages', vnf_packages.as_view(), name='vnf_packages_rc'), -- 2.16.6