X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_ns_descriptor.py;fp=genericparser%2Fpackages%2Ftests%2Ftest_ns_descriptor.py;h=473786e9e1dbc80a55d984ef6a160b8364aec287;hb=5fd2ae6a4517980ce0f89247bb354220748ae67b;hp=36933ac8983e3f1a20780488a52d03d53291c36e;hpb=842a4fd77b1c9f93a4b97bd7f138c9b35a855d13;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/tests/test_ns_descriptor.py b/catalog/packages/tests/test_ns_descriptor.py
similarity index 92%
rename from genericparser/packages/tests/test_ns_descriptor.py
rename to catalog/packages/tests/test_ns_descriptor.py
index 36933ac..473786e 100644
--- a/genericparser/packages/tests/test_ns_descriptor.py
+++ b/catalog/packages/tests/test_ns_descriptor.py
@@ -20,12 +20,12 @@ import os
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
-from genericparser.packages.biz.ns_descriptor import NsDescriptor
-from genericparser.packages.const import PKG_STATUS
-from genericparser.packages.tests.const import nsd_data
-from genericparser.pub.config.config import GENERICPARSER_ROOT_PATH
-from genericparser.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
-from genericparser.pub.utils import toscaparsers
+from catalog.packages.biz.ns_descriptor import NsDescriptor
+from catalog.packages.const import PKG_STATUS
+from catalog.packages.tests.const import nsd_data
+from catalog.pub.config.config import CATALOG_ROOT_PATH
+from catalog.pub.database.models import NSPackageModel, VnfPackageModel, PnfPackageModel
+from catalog.pub.utils import toscaparser
 
 
 class TestNsDescriptor(TestCase):
@@ -78,9 +78,7 @@ class TestNsDescriptor(TestCase):
         )
         response.data.pop('id')
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-        # self.assertEqual(expected_reponse_data, response.data)
-        for key, value in expected_reponse_data.items():
-            self.assertEqual(response.data[key], value)
+        self.assertEqual(expected_reponse_data, response.data)
 
     def test_query_multiple_nsds_normal(self):
         expected_reponse_data = [
@@ -156,7 +154,7 @@ class TestNsDescriptor(TestCase):
         response = self.client.delete("/api/nsd/v1/ns_descriptors/21", format='json')
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
-    @mock.patch.object(toscaparsers, 'parse_nsd')
+    @mock.patch.object(toscaparser, 'parse_nsd')
     def test_nsd_content_upload_normal(self, mock_parse_nsd):
         user_defined_data_json = json.JSONEncoder().encode(self.user_defined_data)
         mock_parse_nsd.return_value = json.JSONEncoder().encode(nsd_data)
@@ -185,7 +183,7 @@ class TestNsDescriptor(TestCase):
                 {'file': fp},
             )
         file_content = ''
-        with open(os.path.join(GENERICPARSER_ROOT_PATH, '22/nsd_content.txt')) as fp:
+        with open(os.path.join(CATALOG_ROOT_PATH, '22/nsd_content.txt')) as fp:
             data = fp.read()
             file_content = '%s%s' % (file_content, data)
         ns_pkg = NSPackageModel.objects.filter(nsPackageId="22")
@@ -220,9 +218,9 @@ class TestNsDescriptor(TestCase):
         )
         file_content = ""
         for data in response.streaming_content:
-            file_content = '%s%s' % (file_content, data)
+            file_content = '%s%s' % (file_content, data.decode())
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual("b'test1test2'", file_content)
+        self.assertEqual("test1test2", file_content)
         os.remove('nsd_content.txt')
 
     def test_nsd_content_download_when_ns_not_exist(self):
@@ -255,9 +253,9 @@ class TestNsDescriptor(TestCase):
         )
         partial_file_content = ''
         for data in response.streaming_content:
-            partial_file_content = '%s%s' % (partial_file_content, data)
+            partial_file_content = '%s%s' % (partial_file_content, data.decode())
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual("b'test2'", partial_file_content)
+        self.assertEqual("test2", partial_file_content)
         os.remove('nsd_content.txt')
 
     @mock.patch.object(NsDescriptor, 'create')