X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=genericparser%2Fpackages%2Ftests%2Ftest_pnf_descriptor.py;h=770d74b00c96fd76a97b66d873536f84ed126cf3;hb=aef67d1a1fb076f154f9f7595b54590fc7499ee6;hp=a6da1dbb330815666eb5706250060620c0c42d64;hpb=affcd0828f0dd0941ba546aca5bce05e8ee1a598;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/tests/test_pnf_descriptor.py b/genericparser/packages/tests/test_pnf_descriptor.py
index a6da1db..770d74b 100644
--- a/genericparser/packages/tests/test_pnf_descriptor.py
+++ b/genericparser/packages/tests/test_pnf_descriptor.py
@@ -17,7 +17,7 @@ import copy
 import json
 import mock
 import os
-
+import shutil
 
 from django.test import TestCase
 from rest_framework import status
@@ -25,6 +25,7 @@ from rest_framework.test import APIClient
 from genericparser.packages.biz.pnf_descriptor import PnfDescriptor
 from genericparser.packages.const import PKG_STATUS
 from genericparser.packages.tests.const import pnfd_data
+from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
 from genericparser.pub.database.models import PnfPackageModel, NSPackageModel
 from genericparser.pub.utils import toscaparsers
 
@@ -55,7 +56,9 @@ class TestPnfDescriptor(TestCase):
         }
 
     def tearDown(self):
-        pass
+        file_path = os.path.join(GENERICPARSER_ROOT_PATH, "22")
+        if os.path.exists(file_path):
+            shutil.rmtree(file_path)
 
     def test_pnfd_create_normal(self):
         request_data = {'userDefinedData': self.user_defined_data}
@@ -73,7 +76,9 @@ class TestPnfDescriptor(TestCase):
         )
         response.data.pop('id')
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        self.assertEqual(expected_reponse_data, response.data)
+        # self.assertEqual(expected_reponse_data, response.data)
+        for key, value in expected_reponse_data.items():
+            self.assertEqual(response.data[key], value)
 
     def test_query_multiple_pnfds_normal(self):
         expected_reponse_data = [
@@ -145,10 +150,10 @@ class TestPnfDescriptor(TestCase):
             userDefinedData=user_defined_data_json,
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -161,10 +166,10 @@ class TestPnfDescriptor(TestCase):
         os.remove('pnfd_content.txt')
 
     def test_pnfd_content_upload_when_pnf_not_exist(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
 
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -173,7 +178,7 @@ class TestPnfDescriptor(TestCase):
 
     @mock.patch.object(toscaparsers, "parse_pnfd")
     def test_pnfd_content_upload_when_pnfd_exist(self, mock_parse_pnfd):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.write('test')
         PnfPackageModel(
             pnfPackageId='22',
@@ -186,7 +191,7 @@ class TestPnfDescriptor(TestCase):
             pnfdId="zte-1.0"
         ).save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode(pnfd_data)
-        with open('pnfd_content.txt', 'rb') as fp:
+        with open('pnfd_content.txt', 'rt') as fp:
             resp = self.client.put(
                 "/api/nsd/v1/pnf_descriptors/22/pnfd_content",
                 {'file': fp},
@@ -194,7 +199,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_pnfd_download_normal(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)
@@ -211,7 +216,7 @@ class TestPnfDescriptor(TestCase):
         for data in resp.streaming_content:
             file_content = '%s%s' % (file_content, data)
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual('test1test2', file_content)
+        self.assertEqual("b'test1test2'", file_content)
         os.remove('pnfd_content.txt')
 
     def test_pnfd_download_failed(self):
@@ -219,7 +224,7 @@ class TestPnfDescriptor(TestCase):
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_pnfd_download_when_not_on_boarded(self):
-        with open('pnfd_content.txt', 'wb') as fp:
+        with open('pnfd_content.txt', 'wt') as fp:
             fp.writelines('test1')
             fp.writelines('test2')
         user_defined_data = json.JSONEncoder().encode(self.user_defined_data)
@@ -277,6 +282,6 @@ class TestPnfDescriptor(TestCase):
         PnfPackageModel(pnfPackageId="8", pnfdId="10").save()
         mock_parse_pnfd.return_value = json.JSONEncoder().encode({"c": "d"})
         req_data = {"csarId": "8", "inputs": []}
-        resp = self.client.post("/api/genericparser/v1/parserpnfd", req_data, format='json')
+        resp = self.client.post("/api/parser/v1/parserpnfd", req_data, format='json')
         self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
         self.assertEqual({"model": '{"c": "d"}'}, resp.data)