X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Ftests%2Ftest_servicepackage.py;fp=genericparser%2Fpackages%2Ftests%2Ftest_servicepackage.py;h=241d80dcae3cb1d363fe74036b2bf0ee6ecf6f71;hb=5fd2ae6a4517980ce0f89247bb354220748ae67b;hp=786e34ca9a8749945c61b3b94f6d785b408bcf06;hpb=842a4fd77b1c9f93a4b97bd7f138c9b35a855d13;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/tests/test_servicepackage.py b/catalog/packages/tests/test_servicepackage.py
similarity index 95%
rename from genericparser/packages/tests/test_servicepackage.py
rename to catalog/packages/tests/test_servicepackage.py
index 786e34c..241d80d 100644
--- a/genericparser/packages/tests/test_servicepackage.py
+++ b/catalog/packages/tests/test_servicepackage.py
@@ -17,12 +17,12 @@ from django.test import TestCase, Client
 from mock import mock
 from rest_framework import status
 
-from genericparser.packages.biz.sdc_service_package import ServicePackage
-from genericparser.packages.const import PKG_STATUS
-from genericparser.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
-from genericparser.pub.exceptions import PackageNotFoundException, PackageHasExistsException, GenericparserException
-from genericparser.pub.msapi import sdc
-from genericparser.pub.utils import toscaparsers
+from catalog.packages.biz.sdc_service_package import ServicePackage
+from catalog.packages.const import PKG_STATUS
+from catalog.pub.database.models import ServicePackageModel, VnfPackageModel, PnfPackageModel
+from catalog.pub.exceptions import PackageNotFoundException, PackageHasExistsException, CatalogException
+from catalog.pub.msapi import sdc
+from catalog.pub.utils import toscaparser
 
 PARSER_BASE_URL = "/api/parser/v1"
 
@@ -296,12 +296,12 @@ class TestServicePackage(TestCase):
 
     @mock.patch.object(sdc, 'get_asset')
     def test_service_pkg_distribute_when_fail_get_artifacts(self, mock_get_asset):
-        mock_get_asset.side_effect = GenericparserException("Failed to query artifact(services,1) from sdc.")
+        mock_get_asset.side_effect = CatalogException("Failed to query artifact(services,1) from sdc.")
         csar_id = "1"
         try:
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
-            self.assertTrue(isinstance(e, GenericparserException))
+            self.assertTrue(isinstance(e, CatalogException))
             self.assertEqual("Failed to query artifact(services,1) from sdc.", e.args[0])
 
     @mock.patch.object(sdc, 'get_asset')
@@ -311,14 +311,14 @@ class TestServicePackage(TestCase):
         try:
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
-            self.assertTrue(isinstance(e, GenericparserException))
+            self.assertTrue(isinstance(e, CatalogException))
             self.assertEqual("Resource (cd557883-ac4b-462d-aa01-421b5fa606b1) is not distributed.", e.args[0])
 
     @mock.patch.object(sdc, 'get_asset')
     @mock.patch.object(sdc, 'download_artifacts')
     def test_service_pkg_distribute_when_fail_download_artifacts(self, mock_get_asset, mock_download_artifacts):
         mock_get_asset.return_value = self.asset_data
-        mock_download_artifacts.side_effect = GenericparserException("Failed to download 1 from sdc.")
+        mock_download_artifacts.side_effect = CatalogException("Failed to download 1 from sdc.")
         csar_id = "1"
         VnfPackageModel(vnfPackageId="cd557883-ac4b-462d-aa01-421b5fa606b1",
                         vnfdId="cd557883-ac4b-462d-aa01-421b5fa606b1").save()
@@ -327,12 +327,12 @@ class TestServicePackage(TestCase):
         try:
             ServicePackage().on_distribute(csar_id)
         except Exception as e:
-            self.assertTrue(isinstance(e, GenericparserException))
+            self.assertTrue(isinstance(e, CatalogException))
             self.assertEqual("Failed to download 1 from sdc.", e.args[0])
 
     @mock.patch.object(sdc, 'get_asset')
     @mock.patch.object(sdc, 'download_artifacts')
-    @mock.patch.object(toscaparsers, 'parse_sd')
+    @mock.patch.object(toscaparser, 'parse_sd')
     def test_service_pkg_distribute(self, mock_parse_sd, mock_download_artifacts, mock_get_asset):
         mock_parse_sd.return_value = json.JSONEncoder().encode(self.sd_data)
         mock_download_artifacts.return_value = "/test.csar"
@@ -454,7 +454,7 @@ class TestServicePackage(TestCase):
 
     ###############################################################
 
-    @mock.patch.object(toscaparsers, 'parse_sd')
+    @mock.patch.object(toscaparser, 'parse_sd')
     def test_service_pkg_parser(self, mock_parse_sd):
         ServicePackageModel(servicePackageId="8", servicedId="2").save()
         mock_parse_sd.return_value = json.JSONEncoder().encode({"a": "b"})