Merge "update test cases if subscription does not exist"

[modeling/etsicatalog.git] / catalog / packages / biz / vnf_pkg_subscription.py

diff --git a/catalog/packages/biz/vnf_pkg_subscription.py b/catalog/packages/biz/vnf_pkg_subscription.py
index 29ef92e..ea57420 100644 (file)
--- a/catalog/packages/biz/vnf_pkg_subscription.py
+++ b/catalog/packages/biz/vnf_pkg_subscription.py
@@ -21,14 +21,13 @@ import uuid
 
 from collections import Counter
 from rest_framework import status
-
+from requests.auth import HTTPBasicAuth
 from catalog.packages import const
 from catalog.pub.database.models import VnfPkgSubscriptionModel
-from catalog.pub.exceptions import VnfPkgSubscriptionException,\
+from catalog.pub.exceptions import VnfPkgSubscriptionException, \
     VnfPkgDuplicateSubscriptionException, SubscriptionDoesNotExistsException
 from catalog.pub.utils.values import ignore_case_get
 
-
 logger = logging.getLogger(__name__)
 
 ROOT_FILTERS = {
@@ -48,7 +47,7 @@ class CreateSubscription(object):
 
     def __init__(self, data):
         self.data = data
-        self.filter = ignore_case_get(self.data, "filters", {})
+        self.filter = ignore_case_get(self.data, "filter", {})
         self.callback_uri = ignore_case_get(self.data, "callbackUri")
         self.authentication = ignore_case_get(self.data, "authentication", {})
         self.notification_types = ignore_case_get(self.filter, "notificationTypes", [])
@@ -57,13 +56,26 @@ class CreateSubscription(object):
         self.vnfd_id = ignore_case_get(self.filter, "vnfdId", [])
         self.vnf_pkg_id = ignore_case_get(self.filter, "vnfPkgId", [])
         self.vnf_products_from_provider = \
-            ignore_case_get(self.filter, "vnfProductsFromProviders", {})
+            ignore_case_get(self.filter, "vnfProductsFromProviders", [])
 
     def check_callbackuri_connection(self):
         logger.debug("SubscribeNotification-post::> Sending GET request "
                      "to %s" % self.callback_uri)
         try:
-            response = requests.get(self.callback_uri, timeout=2)
+            if self.authentication:
+                if const.BASIC in self.authentication.get("authType", ''):
+                    params = self.authentication.get("paramsBasic", {})
+                    username = params.get("userName")
+                    password = params.get("password")
+                    response = requests.get(self.callback_uri, auth=HTTPBasicAuth(username, password), timeout=2)
+                elif const.OAUTH2_CLIENT_CREDENTIALS in self.authentication.get("authType", ''):
+                    # todo
+                    pass
+                else:
+                    # todo
+                    pass
+            else:
+                response = requests.get(self.callback_uri, timeout=2)
             if response.status_code != status.HTTP_204_NO_CONTENT:
                 raise VnfPkgSubscriptionException(
                     "callbackUri %s returns %s status code." % (
@@ -104,7 +116,7 @@ class CreateSubscription(object):
             if not is_filter_type_equal(getattr(self, filter_type),
                                         ast.literal_eval(getattr(sub, filter_type))):
                 return False
-        # If all the above types are same then check id filters
+        # If all the above types are same then check id filter
         for id_filter in ["vnfd_id", "vnf_pkg_id"]:
             if not is_filter_type_equal(getattr(self, id_filter),
                                         ast.literal_eval(getattr(sub, id_filter))):
@@ -151,11 +163,11 @@ class QuerySubscription(object):
     def query_multi_subscriptions(self, params):
         query_data = {}
         logger.debug("QuerySubscription--get--multi--subscriptions--biz::> Check "
-                     "for filters in query params %s" % params)
+                     "for filter in query params %s" % params)
         for query, value in list(params.items()):
             if query in ROOT_FILTERS:
                 query_data[ROOT_FILTERS[query] + '__icontains'] = value
-        # Query the database with filters if the request has fields in request params, else fetch all records
+        # Query the database with filter if the request has fields in request params, else fetch all records
         if query_data:
             subscriptions = VnfPkgSubscriptionModel.objects.filter(**query_data)
         else:
@@ -172,7 +184,7 @@ class QuerySubscription(object):
             subscription_id=subscription_id)
         if not subscription.exists():
             raise SubscriptionDoesNotExistsException("Subscription with ID: %s "
-                                                     "does not exists" % subscription_id)
+                                                     "does not exist" % subscription_id)
         return subscription[0].toDict()
 
 
@@ -186,5 +198,5 @@ class TerminateSubscription(object):
             subscription_id=subscription_id)
         if not subscription.exists():
             raise SubscriptionDoesNotExistsException("Subscription with ID: %s "
-                                                     "does not exists" % subscription_id)
+                                                     "does not exist" % subscription_id)
         subscription[0].delete()