update version of lcm

[vfc/nfvo/lcm.git] / lcm / ns / ns_create.py

diff --git a/lcm/ns/ns_create.py b/lcm/ns/ns_create.py
index de6bac6..1f99f22 100644 (file)
--- a/lcm/ns/ns_create.py
+++ b/lcm/ns/ns_create.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
+import traceback
 import uuid
 
 from lcm.pub.config.config import REPORT_TO_AAI
@@ -21,6 +22,7 @@ from lcm.pub.msapi.aai import create_ns_aai
 from lcm.pub.msapi.sdc_run_catalog import query_nspackage_by_id
 from lcm.pub.utils.timeutil import now_time
 from lcm.pub.utils.values import ignore_case_get
+from lcm.ns.const import SERVICE_ROLE, SERVICE_TYPE
 
 logger = logging.getLogger(__name__)
 
@@ -30,8 +32,8 @@ class CreateNSService(object):
         self.csar_id = csar_id
         self.ns_name = ns_name
         self.description = description
-        self.global_customer_id = ignore_case_get(context, 'global-customer-id')
-        self.service_type = ignore_case_get(context, 'service-type')
+        self.global_customer_id = ignore_case_get(context, 'globalCustomerId')
+        self.service_type = ignore_case_get(context, 'serviceType')
         self.ns_inst_id = ''
         self.ns_package_id = ''
 
@@ -75,38 +77,16 @@ class CreateNSService(object):
 
     def create_ns_in_aai(self):
         logger.debug("CreateNSService::create_ns_in_aai::report ns instance[%s] to aai." % self.ns_inst_id)
-        # global_customer_id = "global-customer-id-" + self.ns_inst_id
-        # data = {
-        #     "global-customer-id": "global-customer-id-" + self.ns_inst_id,
-        #     "subscriber-name": "subscriber-name-" + self.ns_inst_id,
-        #     "subscriber-type": "subscriber-type-" + self.ns_inst_id,
-        #     "service-subscriptions": {
-        #         "service-subscription": [
-        #             {
-        #                 "service-type": "Network",
-        #                 "service-instances": {
-        #                     "service-instance": [
-        #                         {
-        #                             "service-instance-id": self.ns_inst_id,
-        #                             "service-instance-name": self.ns_name,
-        #                             "service-type": "Network",
-        #                             "service-role": "service-role-" + self.ns_inst_id
-        #                         }
-        #                     ]
-        #                 }
-        #             }
-        #         ]
-        #     }
-        # }
-        # resp_data, resp_status = create_customer_aai(global_customer_id, data)
-        data = {
-            "service-instance-id": self.ns_inst_id,
-            "service-instance-name": self.ns_name,
-            "service-type": "Network",
-            "service-role": "service-role-" + self.ns_inst_id
-        }
-        resp_data, resp_status = create_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id, data)
-        if resp_data:
-            logger.debug("Fail to create ns[%s] to aai: [%s].", self.ns_inst_id, resp_status)
-        else:
-            logger.debug("Success to create ns[%s] to aai: [%s].", self.ns_inst_id, resp_status)
+        try:
+            data = {
+                "service-instance-id": self.ns_inst_id,
+                "service-instance-name": self.ns_name,
+                "service-type": SERVICE_TYPE,
+                "service-role": SERVICE_ROLE
+            }
+            resp_data, resp_status = create_ns_aai(self.global_customer_id, self.service_type, self.ns_inst_id, data)
+            logger.debug("Success to create ns[%s] to aai:[%s],[%s].", self.ns_inst_id, resp_data, resp_status)
+        except NSLCMException as e:
+            logger.debug("Fail to createns[%s] to aai, detail message: %s" % (self.ns_inst_id, e.message))
+        except:
+            logger.error(traceback.format_exc())