Fix bug for miss check callbackurl in subscription post request.

[vfc/gvnfm/vnflcm.git] / lcm / lcm / nf / biz / create_subscription.py

diff --git a/lcm/lcm/nf/biz/create_subscription.py b/lcm/lcm/nf/biz/create_subscription.py
index f42a59c..164bf6c 100644 (file)
--- 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", {})
 
@@ -60,7 +62,7 @@ class CreateSubscription:
 
     def do_biz(self):
         self.subscription_id = str(uuid.uuid4())
-        # self.check_callbackuri_connection()
+        self.check_callbackuri_connection()
         self.check_valid_auth_info()
         self.check_filter_types()
         self.check_valid()
@@ -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):