From: biancunkang <bian.cunkang@zte.com.cn>
Date: Tue, 21 Aug 2018 09:18:42 +0000 (+0800)
Subject: Deal with nfPackage
X-Git-Tag: 1.2.0~120^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F61517%2F1;p=vfc%2Fnfvo%2Fcatalog.git

Deal with nfPackage

Change-Id: Ifdf82d234f7bfd540156a75445b4aae9d3d6b40c
Issue-ID: VFC-1038
Signed-off-by: biancunkang <bian.cunkang@zte.com.cn>
---

diff --git a/catalog/packages/tests/test_nf.py b/catalog/packages/tests/test_nf.py
index 6bb7ee77..428622bd 100644
--- a/catalog/packages/tests/test_nf.py
+++ b/catalog/packages/tests/test_nf.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import json
-
+import os
 import mock
-from django.test import Client
+from rest_framework.test import APIClient
 from django.test import TestCase
 from rest_framework import status
 
@@ -24,11 +24,12 @@ from catalog.pub.database.models import JobStatusModel, JobModel
 from catalog.pub.database.models import VnfPackageModel
 from catalog.pub.msapi import sdc
 from catalog.pub.utils import restcall, toscaparser
+from catalog.pub.config.config import CATALOG_ROOT_PATH
 
 
 class TestNfPackage(TestCase):
     def setUp(self):
-        self.client = Client()
+        self.client = APIClient()
         VnfPackageModel.objects.filter().delete()
         JobModel.objects.filter().delete()
         JobStatusModel.objects.filter().delete()
@@ -395,3 +396,8 @@ class TestNfPackage(TestCase):
         resp = self.client.post("/api/catalog/v1/parservnfd", req_data, format='json')
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
         self.assertEqual(resp.data, {"error": "VNF CSAR(1) does not exist."})
+
+    def test_upload_vnfPkg(self):
+        data = {'file': open(os.path.join(CATALOG_ROOT_PATH, "empty.txt"), "rb")}
+        response = self.client.put("/api/vnfpkgm/v1/vnf_packages/222/package_content", data=data)
+        self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED)