X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog%2Fpackages%2Fbiz%2Fvnf_pkg_subscription.py;h=2b2e245b89906a6d234f9bde03bcad4e0a5e3477;hb=246df561b466d1202a40ece1c133a4bf70ab958f;hp=69ce2e8552e611498bdc6659365b9e36b8559669;hpb=0409420992ea31df6cbaa28e5cbd0ff6ecd03b36;p=modeling%2Fetsicatalog.git diff --git a/catalog/packages/biz/vnf_pkg_subscription.py b/catalog/packages/biz/vnf_pkg_subscription.py index 69ce2e8..2b2e245 100644 --- a/catalog/packages/biz/vnf_pkg_subscription.py +++ b/catalog/packages/biz/vnf_pkg_subscription.py @@ -21,13 +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 - +from catalog.pub.config.config import MSB_BASE_URL logger = logging.getLogger(__name__) @@ -45,10 +45,9 @@ def is_filter_type_equal(new_filter, existing_filter): 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", []) @@ -63,7 +62,21 @@ class CreateSubscription(object): 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, + verify=False) + elif const.OAUTH2_CLIENT_CREDENTIALS in self.authentication.get("authType", ''): + # todo + pass + else: + # todo + pass + else: + response = requests.get(self.callback_uri, timeout=2, verify=False) if response.status_code != status.HTTP_204_NO_CONTENT: raise VnfPkgSubscriptionException( "callbackUri %s returns %s status code." % ( @@ -78,8 +91,8 @@ class CreateSubscription(object): def do_biz(self): self.subscription_id = str(uuid.uuid4()) - self.check_callbackuri_connection() self.check_valid_auth_info() + self.check_callbackuri_connection() self.check_valid() self.save_db() subscription = VnfPkgSubscriptionModel.objects.get( @@ -91,11 +104,10 @@ class CreateSubscription(object): def check_valid_auth_info(self): logger.debug("SubscribeNotification--post::> Validating Auth " "details if provided") - if self.authentication.get("paramsBasic", {}) and \ - const.BASIC not in self.authentication.get("authType"): + if self.authentication.get("paramsBasic", {}) and const.BASIC not in self.authentication.get("authType"): raise VnfPkgSubscriptionException('Auth type should be ' + const.BASIC) - if self.authentication.get("paramsOauth2ClientCredentials", {}) and \ - const.OAUTH2_CLIENT_CREDENTIALS not in self.authentication.get("authType"): + if self.authentication.get("paramsOauth2ClientCredentials", {}) \ + and const.OAUTH2_CLIENT_CREDENTIALS not in self.authentication.get("authType"): raise VnfPkgSubscriptionException('Auth type should be ' + const.OAUTH2_CLIENT_CREDENTIALS) def check_filter_exists(self, sub): @@ -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))): @@ -112,16 +124,17 @@ class CreateSubscription(object): return True def check_valid(self): + links = "" logger.debug("SubscribeNotification--post::> Checking DB if " "callbackUri already exists") subscriptions = VnfPkgSubscriptionModel.objects.filter(callback_uri=self.callback_uri) - if not subscriptions.exists(): - return True for subscription in subscriptions: if self.check_filter_exists(subscription): + links = json.loads(subscription.links) + logger.error("Subscriptions has already exists with the same callbackUri and filter:%s" % links) raise VnfPkgDuplicateSubscriptionException( - "Already Subscription (%s) exists with the " - "same callbackUri and filter" % subscription.subscription_id) + "%s/%s" % (MSB_BASE_URL, links["self"]["href"])) + return True def save_db(self): @@ -147,15 +160,14 @@ class CreateSubscription(object): 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,12 +184,11 @@ 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() class TerminateSubscription(object): - def terminate(self, subscription_id): logger.debug("TerminateSubscriptions--delete--biz::> " "ID: %s" % subscription_id) @@ -186,5 +197,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()