X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Flcm%2Fnf%2Fbiz%2Fcreate_subscription.py;h=8c6d4528e99f7c08c7d507f3bb4841d5640538c8;hb=53a83288a7c8d591c9665c80e2ff759ac305f4a1;hp=f42a59c0488c01e5330134b9ae9773ee4b8a9972;hpb=3e42b3c95ade30a5083b993514b6b0d0734e0075;p=vfc%2Fgvnfm%2Fvnflcm.git diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py index f42a59c0..8c6d4528 100644 --- a/lcm/lcm/nf/biz/create_subscription.py +++ b/lcm/lcm/nf/biz/create_subscription.py @@ -25,7 +25,9 @@ from rest_framework import status from lcm.nf import const from lcm.pub.database.models import SubscriptionModel from lcm.pub.exceptions import NFLCMException +from lcm.pub.exceptions import NFLCMExceptionSeeOther from lcm.pub.utils.values import ignore_case_get +from lcm.pub.config.config import MSB_SERVICE_IP, MSB_SERVICE_PORT logger = logging.getLogger(__name__) @@ -42,7 +44,7 @@ class CreateSubscription: self.authentication = ignore_case_get(self.data, "authentication", {}) self.notification_types = ignore_case_get(self.filter, "notificationTypes", []) self.operation_types = ignore_case_get(self.filter, "operationTypes", []) - self.operation_states = ignore_case_get(self.filter, "notificationStates", []) + self.operation_states = ignore_case_get(self.filter, "operationStates", []) self.vnf_filter = \ ignore_case_get(self.filter, "vnfInstanceSubscriptionFilter", {}) @@ -116,8 +118,8 @@ class CreateSubscription: return True for subscription in subscriptions: if self.check_filter_exists(subscription): - raise NFLCMException("Already Subscription exists with the " - "same callbackUri and filter") + links = json.loads(subscription.links) + raise NFLCMExceptionSeeOther("http://%s:%s/%s" % (MSB_SERVICE_IP, MSB_SERVICE_PORT, links["self"]["href"])) return False def save_db(self):