X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fnsdm_subscription.py;fp=genericparser%2Fpackages%2Fbiz%2Fnsdm_subscription.py;h=e2af6e49b29aa1b860e8fdb67cbe1f4d798169cb;hb=a32c2b20207885d895bd96204cc166fca14db97b;hp=dfcd2ecc7fda2b1eb190f3d27fe8dda2a27c59b0;hpb=431a5a35a8e0a26d21c663167303696db8a7a2a6;p=modeling%2Fetsicatalog.git

diff --git a/genericparser/packages/biz/nsdm_subscription.py b/catalog/packages/biz/nsdm_subscription.py
similarity index 92%
rename from genericparser/packages/biz/nsdm_subscription.py
rename to catalog/packages/biz/nsdm_subscription.py
index dfcd2ec..e2af6e4 100644
--- a/genericparser/packages/biz/nsdm_subscription.py
+++ b/catalog/packages/biz/nsdm_subscription.py
@@ -22,12 +22,12 @@ from collections import Counter
 
 from rest_framework import status
 
-from genericparser.packages import const
-from genericparser.pub.database.models import NsdmSubscriptionModel
-from genericparser.pub.exceptions import GenericparserException, \
+from catalog.packages import const
+from catalog.pub.database.models import NsdmSubscriptionModel
+from catalog.pub.exceptions import CatalogException, \
     ResourceNotFoundException, \
     NsdmBadRequestException, NsdmDuplicateSubscriptionException
-from genericparser.pub.utils.values import ignore_case_get
+from catalog.pub.utils.values import ignore_case_get
 
 logger = logging.getLogger(__name__)
 
@@ -93,12 +93,12 @@ class NsdmSubscription:
         try:
             response = requests.get(self.callback_uri, timeout=2)
             if response.status_code != status.HTTP_204_NO_CONTENT:
-                raise GenericparserException("callbackUri %s returns %s status "
-                                             "code." % (self.callback_uri,
-                                                        response.status_code))
+                raise CatalogException("callbackUri %s returns %s status "
+                                       "code." % (self.callback_uri,
+                                                  response.status_code))
         except Exception:
-            raise GenericparserException("callbackUri %s didn't return 204 status"
-                                         "code." % self.callback_uri)
+            raise CatalogException("callbackUri %s didn't return 204 status"
+                                   "code." % self.callback_uri)
 
     def fill_resp_data(self, subscription):
         subscription_filter = dict()
@@ -201,7 +201,7 @@ class NsdmSubscription:
         links = {
             "self": {
                 "href":
-                    const.NSDM_SUBSCRIPTION_ROOT_URI + self.subscription_id
+                const.NSDM_SUBSCRIPTION_ROOT_URI + self.subscription_id
             }
         }
         subscription_save_db = {