fix bug for failure in creating subscriptions for vnfm

[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 6802c22..2b1f606 100644 (file)
--- a/lcm/lcm/nf/biz/create_subscription.py
+++ b/lcm/lcm/nf/biz/create_subscription.py
@@ -27,6 +27,7 @@ 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__)
 
@@ -39,6 +40,8 @@ class CreateSubscription:
     def __init__(self, data):
         self.data = data
         self.filter = ignore_case_get(self.data, "filter", {})
+        logger.debug("self.data:%s" % self.data)
+        logger.debug("self.filter:%s" % self.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", [])
@@ -61,7 +64,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()
@@ -117,8 +120,8 @@ class CreateSubscription:
             return True
         for subscription in subscriptions:
             if self.check_filter_exists(subscription):
-                raise NFLCMExceptionSeeOther("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):
@@ -131,7 +134,7 @@ class CreateSubscription:
         }
         SubscriptionModel.objects.create(subscription_id=self.subscription_id,
                                          callback_uri=self.callback_uri,
-                                         auth_info=self.authentication,
+                                         auth_info=json.dumps(self.authentication),
                                          notification_types=json.dumps(self.notification_types),
                                          operation_types=json.dumps(self.operation_types),
                                          operation_states=json.dumps(self.operation_states),