Fix bug of cli command error when onboard vnf
[integration.git] / test / hpa_automation / tosca / hpa_automation.py
index b83d3eb..68f8487 100755 (executable)
@@ -18,6 +18,7 @@ import time
 import argparse
 import sys
 import requests
+import mysql.connector
 
 def get_parameters(file):
     parameters = json.load(file)
@@ -48,6 +49,138 @@ def create_complex(parameters):
 
     os.system(complex_create_string)
 
+def create_vlm(parameters):
+    vlm_create_string = "oclip vlm-create -x {} -u {} -p {} -m {}".format(parameters["vendor-name"], \
+      parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_onboarding_url"])
+    command_out = (os.popen(vlm_create_string)).read()
+    out_list = get_out_helper(command_out)
+    vlm_id = out_list[3]
+    vlm_version = out_list[5]
+
+    entitlement_string = "oclip vlm-entitlement-pool-create -x {} -y {} -e {} -z {} -k {} -g {} -l {} -u {} -p {} -m {}".format( \
+      parameters["entitlement-pool-name"], vlm_id, vlm_version, parameters["entitlement-description"], parameters["vendor-name"], \
+      parameters["expiry-date"], parameters["start-date"],  parameters["sdc_creator"], parameters["sdc_password"], \
+      parameters["sdc_onboarding_url"])
+    command_out = (os.popen(entitlement_string)).read()
+    entitlement_id = (get_out_helper(command_out))[3]
+
+
+    key_group_string = "oclip vlm-key-group-create -c {} -e {} -x {} -y {} -u {} -p {} -m {}".format(vlm_id, vlm_version, \
+      parameters["key-group-name"], parameters["key-group-type"],  parameters["sdc_creator"], parameters["sdc_password"], \
+      parameters["sdc_onboarding_url"])
+    command_out = (os.popen(key_group_string)).read()
+    key_group_id = (get_out_helper(command_out))[3]
+
+    feature_group_string = "oclip vlm-feature-group-create -x {} -y {} -e {} -z {} -g {} -b {} -c {} -u {} -p {} -m {}".format(
+      parameters["feature-grp-name"], vlm_id, vlm_version, parameters["feature-grp-desc"], key_group_id, entitlement_id, \
+      parameters["part-no"], parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_onboarding_url"])
+    command_out = (os.popen(feature_group_string)).read()
+    feature_group_id = (get_out_helper(command_out))[3]
+
+    agreement_string = "oclip vlm-aggreement-create -x {} -y {} -e {} -z {} -g {} -u {} -p {} -m {}".format(parameters["agreement-name"], \
+      vlm_id, vlm_version, parameters["agreement-desc"], feature_group_id, parameters["sdc_creator"], parameters["sdc_password"], \
+      parameters["sdc_onboarding_url"])
+    command_out = (os.popen(agreement_string)).read()
+    agreement_id = (get_out_helper(command_out))[3]
+
+    submit_string = "oclip vlm-submit -x {} -y {} -u {} -p {} -m {}".format(vlm_id, vlm_version, parameters["sdc_creator"], \
+      parameters["sdc_password"], parameters["sdc_onboarding_url"])
+    os.system(submit_string)
+
+    output = [feature_group_id, agreement_id, vlm_version, vlm_id ]
+    return output
+
+def create_vsp(parameters, in_list):
+    vnfs = parameters["vnf"]
+    vsp_dict = {}
+    for name, value in vnfs.iteritems():
+        create_string = "oclip vsp-create -j {} -o {} -e {} -x {} -y {} -i {} -c {} -g {} -u {} -p {} -m {}".format( in_list[0], \
+          parameters["onboarding-method"], parameters["vendor-name" ], value.get("vsp-name"), value.get("vsp-desc"), in_list[1], \
+          in_list[2], in_list[3], parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_onboarding_url"] )
+        command_out = (os.popen(create_string)).read()
+        out_list = get_out_helper(command_out)
+        vsp_id = out_list[3]
+        vsp_version = out_list[5]
+
+        os.system("oclip vsp-add-artifact -x {} -y {} -z {} -u {} -p {} -m {}".format(vsp_id, vsp_version, value.get("path"), \
+          parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_onboarding_url"]))
+
+        os.system("oclip vsp-validate -x {} -y {} -u {} -p {} -m {}".format(vsp_id, vsp_version, parameters["sdc_creator"], \
+          parameters["sdc_password"], parameters["sdc_onboarding_url"]))
+
+        os.system("oclip vsp-submit -x {} -y {} -u {} -p {} -m {}".format(vsp_id, vsp_version, parameters["sdc_creator"], \
+          parameters["sdc_password"], parameters["sdc_onboarding_url"]))
+
+        os.system("oclip vsp-package -x {} -y {} -u {} -p {} -m {}".format(vsp_id, vsp_version, parameters["sdc_creator"], \
+          parameters["sdc_password"], parameters["sdc_onboarding_url"]))
+
+        vsp_ids[name] = vsp_id
+    return vsp_ids
+
+def create_vf_model(parameters, vsp_dict):
+    vnfs = parameters["vnfs"]
+    vf_dict = {}
+    for name, value in vnfs.iteritems():
+        create_string = "oclip vf-model-create -y {} -g {} -x {} -z {} -b {} -u {} -p {} -m {}".format(value.get("vf-description"), \
+          value.get("vsp-version"), value.get("vf-name"), parameters["vendor-name"], vsp_dict[name], \
+          parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_catalog_url"])
+        os.system(create_string)
+
+        output = (os.popen("oclip vf-model-list -m {} -u {} -p {} | grep {}".format(parameters["sdc_catalog_url"], \
+          parameters["sdc_creator"], parameters["sdc_password"], value.get("vf-name")))).read()
+        output = (get_out_helper_2(output))
+
+        vf_unique_id = output[1]
+
+        os.system("oclip vf-model-certify -b {} -r {} -u {} -p {} -m {}".format(vf_unique_id, value.get("vf-remarks"), \
+          parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+        #Check for new parameters after certification
+        output = (os.popen("oclip vf-model-list -m {} -u {} -p {} | grep {}".format(parameters["sdc_catalog_url"], \
+                              parameters["sdc_creator"], parameters["sdc_password"], value.get("vf-name")))).read()
+        output = (get_out_helper_2(output))
+
+        vf_dict[name] = output[1]
+
+    return vf_dict
+
+
+def create_service_model(parameters, vf_dict):
+    vnfs = parameters["vnfs"]
+
+    create_string = "oclip service-model-create -z {} -y {} -e {} -x {} -c {} -b {} -u {} -p {} -m {} |grep ID".format(parameters["project-code"], \
+    parameters["service-model-desc"], parameters["icon-id"], parameters["service-model-name"], parameters["category-display"], \
+    parameters["category"],parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_catalog_url"])
+
+    service_model_id = (get_out_helper_2((os.popen(create_string)).read()))[1]
+
+    for name, value in vnfs.iteritems():
+        os.system("oclip service-model-add-vf -x {} -b {} -y {} -z {} -u {} -p {} -m {}".format(service_model_id, \
+                   parameters["vf-version"], vf_dict[name], value.get("vf-name"), parameters["sdc_creator"], \
+                   parameters["sdc_password"], parameters["sdc_catalog_url"] ))
+
+    os.system("oclip service-model-test-request -b {} -r {} -u {} -p {} -m {}".format(service_model_id, parameters["service-test-remarks"], \
+    parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+    os.system("oclip service-model-test-start -b {} -u {} -p {} -m {}".format(service_model_id, parameters["sdc_tester"], \
+    parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+    os.system("oclip service-model-test-accept -b {} -r {} -u {} -p {} -m {}".format(service_model_id, parameters["service-accept-remarks"], \
+    parameters["sdc_tester"], parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+    #Get uniqueId for the service model
+    service_model_values = (os.popen("oclip service-model-list -u {} -p {} -m {} |grep {}".format(parameters["sdc_creator"], \
+      parameters["sdc_password"], parameters["sdc_catalog_url"], parameters["service-model-name"]))).read()
+    service_model_values = get_out_helper_2(service_model_values)
+    service_model_uniqueId = (service_model_values)[1]
+
+    os.system("oclip service-model-approve -b {} -r {} -u {} -p {} -m {}".format(service_model_uniqueId, parameters["service-approve-remarks"], \
+    parameters["sdc_governor"], parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+    os.system("oclip service-model-distribute -b {} -u {} -p {} -m {}".format(service_model_uniqueId, parameters["sdc_operator"], \
+    parameters["sdc_password"], parameters["sdc_catalog_url"]))
+
+    return service_model_values
 
 def register_cloud_helper(cloud_region, values, parameters):
     #Create Cloud
@@ -78,6 +211,30 @@ def register_all_clouds(parameters):
     for cloud_region, cloud_region_values in cloud_dictionary.iteritems():
         register_cloud_helper(cloud_region, cloud_region_values, parameters)
 
+def create_service_type(parameters):
+    create_string = "oclip service-type-create -x {} -m {} -u {} -p {}".format( parameters["service_name"], \
+      parameters["aai_url"], parameters["aai_username"], parameters["aai_password"])
+    os.system(create_string)
+
+def create_customer(parameters):
+    create_string = "oclip customer-create -x {} -y {} -m {} -u {} -p {}".format( parameters["customer_name"], \
+    parameters["subscriber_name"], parameters["aai_url"], parameters["aai_username"], parameters["aai_password"])
+    os.system(create_string)
+
+def add_customer_subscription(parameters):
+    subscription_check = 0
+    for cloud_region, cloud_region_values in (parameters["cloud_region_data"]).iteritems():
+      if subscription_check == 0 :
+        subscription_string = "oclip subscription-create -x {} -c {} -z {} -e {} -y {} -r {} -m {} -u {} -p {}".format(\
+          parameters["customer_name"], cloud_region_values.get("tenant-id"), parameters["cloud-owner"], parameters["service_name"],\
+          cloud_region_values.get("default-tenant"), cloud_region, parameters["aai_url"], parameters["aai_username"], parameters["aai_password"] )
+      else:
+        subscription_string = "oclip subscription-cloud-add -x {} -c {} -z {} -e {} -y {} -r {} -m {} -u {} -p {}".format(\
+          parameters["customer_name"], cloud_region_values.get("tenant-id"), parameters["cloud-owner"], parameters["service_name"],\
+          cloud_region_values.get("default-tenant"), cloud_region, parameters["aai_url"], parameters["aai_username"], parameters["aai_password"] )
+      os.system(subscription_string)
+      subscription_check+=1
+
 def register_vnfm_helper(vnfm_key, values, parameters):
     #Create vnfm
     vnfm_create_string = 'oclip vnfm-create -b {} -c {} -e {} -v {} -g {} -x {} -i {} -j {} -q {} \
@@ -93,29 +250,116 @@ def register_vnfm(parameters):
     for vnfm_key, vnfm_values in vnfm_params.iteritems():
         register_vnfm_helper(vnfm_key, vnfm_values, parameters)
 
-
-#VNF Deployment Section
+def add_policy_models(parameters):
+    mydb = mysql.connector.connect(
+      host="policydb",
+      user="policy_user",
+      passwd="policy_user",
+      database="onap_sdk",
+    )
+
+    mycursor = mydb.cursor()
+    hpa_sql = "INSERT INTO optimizationmodels (modelname, description, dependency, imported_by, \
+              attributes, ref_attributes, sub_attributes, version, annotation, enumValues, \
+              dataOrderInfo) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"
+    hpa_val = ('hpaPolicy', 'HPA Tests Model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,resources=MANY-true,flavorFeatures=flavorFeatures_properties:MANY-true:description-null', \
+         '{"directives_properties":{"attributes":"directives_attributes_properties:required-false:MANY-true:description-null",\
+         "type":"string:defaultValue-null:required-false:MANY-false:description-null"},\
+         "directives_attributes_properties":{"attribute_name":"string:defaultValue-null:required-false:MANY-false:description-null",\
+         "attribute_value":"string:defaultValue-null:required-false:MANY-false:description-null"},\
+         "flavorProperties_properties":{"score":"string:defaultValue-null:required-false:MANY-false:description-null",\
+         "hpa-feature-attributes":"hpa-feature-attributes_properties:required-true:MANY-true:description-null",\
+         "directives":"directives_properties:required-true:MANY-true:description-null",\
+         "hpa-version":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "hpa-feature":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "mandatory":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "architecture":"string:defaultValue-null:required-true:MANY-false:description-null"},\
+         "flavorFeatures_properties":{"directives":"directives_properties:required-true:MANY-true:description-null",\
+         "flavorProperties":"flavorProperties_properties:required-true:MANY-true:description-null",\
+         "id":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "type":"string:defaultValue-null:required-true:MANY-false:description-null"},\
+         "hpa-feature-attributes_properties":{"unit":"string:defaultValue-null:required-false:MANY-false:description-null",\
+         "hpa-attribute-value":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "hpa-attribute-key":"string:defaultValue-null:required-true:MANY-false:description-null",\
+         "operator":"OPERATOR:defaultValue-null:required-false:MANY-false:description-null"}}', \
+         'test1', 'policyScope=matching-true, policyType=matching-true', \
+         'OPERATOR=[<,<equal-sign,>,>equal-sign,equal-sign,!equal-sign,any,all,subset,], POLICYTYPE=[hpa,]', '""')
+
+    mycursor.execute(hpa_sql, hpa_val)
+    
+    sql = "INSERT INTO microservicemodels (modelname, description, dependency, imported_by, \
+          attributes, ref_attributes, sub_attributes, version, annotation, enumValues, \
+          dataOrderInfo) VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)"
+    val = [
+        ('distancePolicy', 'distancePolicy', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,distanceProperties=distanceProperties_properties:MANY-false:description-null,policyType=POLICYTYPE:MANY-false,\
+          resources=MANY-true,applicableResources=APPLICABLERESOURCES:MANY-false', \
+         '{"distanceProperties_properties":{"locationInfo":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "distance":"distance_properties:required-true:MANY-false:description-null"},\
+           "distance_properties":{"unit":"UNIT:defaultValue-null:required-true:MANY-false:description-null",\
+           "value":"string:defaultValue-null:required-true:MANY-false:description-null","operator":"OPERATOR:defaultValue-null:required-true:MANY-false:description-null"}}', \
+           'test1', 'policyScope=matching-true, policyType=matching-true', \
+           'OPERATOR=[<,<equal-sign,>,>equal-sign,equal-sign,], APPLICABLERESOURCES=[any,all,], POLICYTYPE=[distance_to_location,] ', '""'),
+        ('optimizationPolicy', 'Optimization policy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'objectiveParameter=objectiveParameter_properties:MANY-false:description-null,policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,\
+          objective=objectiveParameter_properties:MANY-false:description-null', \
+         '{"parameterAttributes_properties":{"customerLocationInfo":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "parameter":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "resources":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "weight":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "operator":"OPERATOR:defaultValue-null:required-true:MANY-false:description-null"},\
+           "objectiveParameter_properties":{"parameterAttributes":"parameterAttributes_properties:required-true:MANY-true:description-null",\
+           "operator":"OPERATOR:defaultValue-null:required-true:MANY-false:description-null"}}', \
+           'test1', 'policyScope=matching-true, policyType=matching-true', 'OPERATOR=[*,+,-,/,%,], POLICYTYPE=[placement_optimization,]', '""'),
+        ('queryPolicy', 'Query policy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,queryProperties=queryProperties_properties:MANY-true:description-null', \
+         '{"queryProperties_properties":{"attribute_location":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "attribute":"string:defaultValue-null:required-true:MANY-false:description-null","value":"string:defaultValue-null:required-true:MANY-false:description-null"}}', \
+         'test1', 'policyScope=matching-true, policyType=matching-true', 'POLICYTYPE=[request_param_query,]', '""'),
+        ('vnfPolicy', 'VnfPolicy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,resources=MANY-true,\
+          vnfProperties=vnfProperties_properties:MANY-true:description-null,applicableResources=APPLICABLERESOURCES:MANY-false', \
+         '{"vnfProperties_properties":{"serviceType":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "inventoryProvider":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "inventoryType":"INVENTORYTYPE:defaultValue-null:required-true:MANY-false:description-null",\
+         "customerId":"string:defaultValue-null:required-true:MANY-false:description-null"}}', \
+         'test1', 'policyScope=matching-true, policyType=matching-true', \
+         'INVENTORYTYPE=[serviceInstanceId,vnfName,cloudRegionId,vimId,], APPLICABLERESOURCES=[any,all,], POLICYTYPE=[vnfPolicy,]', '""'),
+        ('vim_fit', 'Capacity policy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,capacityProperties=capacityProperties_properties:MANY-false:description-null,\
+          resources=MANY-true,applicableResources=APPLICABLERESOURCES:MANY-false', \
+         '{"capacityProperties_properties":{"request":"string:defaultValue-null:required-true:MANY-false:description-null",\
+           "controller":"string:defaultValue-null:required-true:MANY-false:description-null"}}', \
+           'test1', 'policyScope=matching-true, policyType=matching-true ', ' APPLICABLERESOURCES=[any,all,], POLICYTYPE=[vim_fit,]', '""'),
+        ('affinityPolicy', 'Affinity policy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,affinityProperties=affinityProperties_properties:MANY-false:description-null,\
+          resources=MANY-true,applicableResources=APPLICABLERESOURCES:MANY-false', \
+         '{"affinityProperties_properties":{"qualifier":"QUALIFIER:defaultValue-null:required-true:MANY-false:description-null",\
+           "category":"string:defaultValue-null:required-true:MANY-false:description-null"}}', \
+           'test1', 'policyScope=matching-true, policyType=matching-true ', ' APPLICABLERESOURCES=[any,all,], POLICYTYPE=[zone,], QUALIFIER=[same,different,]', '""'),
+        ('pciPolicy', 'Pci policy model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,resources=MANY-true,pciProperties=pciProperties_properties:MANY-true:description-null', \
+         '{"pciProperties_properties":{"pciOptimizationTimeConstraint":"string:defaultValue-null:required-false:MANY-false:description-null",\
+           "pciOptimizationNwConstraint":"string:defaultValue-null:required-false:MANY-false:description-null",\
+           "algoCategory":"string:defaultValue-null:required-false:MANY-false:description-null",\
+           "pciOptmizationAlgoName":"string:defaultValue-null:required-false:MANY-false:description-null",\
+           "pciOptimizationPriority":"string:defaultValue-null:required-false:MANY-false:description-null"}}', \
+           'test1', 'olicyScope=matching-true, policyType=matching-true ', ' POLICYTYPE=[pciPolicy,]', '""'),
+        ('subscriberPolicy', 'Subscriber Policy Model', '[]', 'demo', 'identity=string:defaultValue-null:required-true:MANY-false:description-null', \
+         'policyScope=MANY-true,policyType=POLICYTYPE:MANY-false,properties=properties_properties:MANY-false:description-type of a policy', \
+         '{"properties_properties":{"provStatus":"PROVSTATUS:defaultValue-null:required-true:MANY-false:description-null",\
+           "subscriberName":"SUBSCRIBERNAME:defaultValue-null:required-true:MANY-false:description-null",\
+           "subscriberRole":"SUBSCRIBERROLE:defaultValue-null:required-true:MANY-false:description-null"}}', \
+         'test1', 'policyScope=matching-true, policyType=matching-true, properties=matching-true ', \
+         ' SUBSCRIBERNAME=[], SUBSCRIBERROLE=[], POLICYTYPE=[subscriberPolicy,], PROVSTATUS=[]', '""')
+    ]
+
+    mycursor.executemany(sql, val)
+    mydb.commit()
+    print(mycursor.rowcount, "was inserted.")
+    
 def add_policies(parameters):
-    resource_string = (os.popen("oclip get-resource-module-name  -u {} -p {} -m {} |grep {}".format(\
-      parameters["sdc_creator"], parameters["sdc_password"], parameters["sdc_catalog_url"], \
-      parameters["service-model-name"] ))).read()
-    resource_module_name =   (get_out_helper_2(resource_string))[1]
-
-   #Put in the right resource module name in all policies located in parameters["policy_directory"]
-    os.system("find {}/ -type f -exec sed -i 's/{}/{}/g' {{}} \;".format(
-      parameters["policy_directory"], parameters["temp_resource_module_name"], resource_module_name))
-
-   #Upload policy models
-    for model in os.listdir(parameters["policy_models_directory"]):
-      os.system("oclip policy-type-create -x {} -u {} -p {} -m {}".format(model, parameters["policy_username"], \
-        parameters["policy_password"], parameters["policy_url"]))
-      time.sleep(0.5)
-
-    #print("Put in the resourceModuleName {} in your policy files in {}. ".format(resource_module_name, \
-    #(parameters["policy_directory"])))
-    #raw_input("Press Enter to continue...")
-
-
     #Loop through policy, put in resource_model_name and create policies
     for policy in os.listdir(parameters["policy_directory"]):
       policy_name = "{}.{}".format(parameters["policy_scope"], os.path.splitext(policy)[0])
@@ -135,8 +379,9 @@ def onboard_vnf(parameters):
     vnf_onboard_outputs = {}
 
     for key, value in vnfs.items():
-        vnf_onboard_string = 'oclip vfc-catalog-onboard-vnf -c {}'.format(value.get("csar-id"))
-        vnf_onboard_outs[key] = (os.popen(ns_onboard_string)).read()
+        vnf_onboard_string = 'oclip vfc-catalog-onboard-vnf -m {} -c {}'\
+            .format(value.get("url"), value.get("csar-id"))
+        vnf_onboard_outputs[key] = (os.popen(vnf_onboard_string)).read()
     return vnf_onboard_outputs
 
 def onboard_ns(parameters):
@@ -146,8 +391,8 @@ def onboard_ns(parameters):
 
 def create_ns(parameters, csar_id):
     ns = parameters["ns"]
-    ns_create_string = 'oclip vfc-nslcm-create -m {} -c {} -n {}'.format(parameters["vfc-url"], \
-       csar_id, ns.get("name"))
+    ns_create_string = 'oclip vfc-nslcm-create -m {} -c {} -n {} -q {} -S {}'.format(parameters["vfc-url"], \
+       csar_id, ns.get("name"), parameters["customer_name"], parameters["service_name"])
     print ns_create_string
     ns_create_out = (os.popen(ns_create_string)).read()
     print ns_create_out
@@ -203,13 +448,14 @@ def upload_vnf_package(parameters, vnf_package_output):
 #Run Functions
 parser = argparse.ArgumentParser()
 parser.add_argument('-f', action='store', dest='config_file_path', help='Store config file path')
-parser.add_argument('-t', action='store', dest='type', help='Store config file path')
+parser.add_argument('-t', action='store', dest='model', help='Store config file path')
 
 parser.add_argument('--version', action='version', version='%(prog)s 1.0')
 
 results = parser.parse_args()
 
 config_file_path = results.config_file_path
+model = results.model
 if config_file_path is None:
     sys.exit(1)
 config_file = open(config_file_path)
@@ -221,9 +467,14 @@ set_open_cli_env(parameters)
 # 2.Create cloud complex
 create_complex(parameters)
 
-# 3.Register all clouds
+# 3.Register all clouds
 register_all_clouds(parameters)
 
+# 3.2 create service and customer
+create_service_type(parameters)
+create_customer(parameters)
+add_customer_subscription(parameters)
+
 # 4.Register vnfm
 register_vnfm(parameters)
 
@@ -234,12 +485,17 @@ register_vnfm(parameters)
 # We just do run time automation 
 ns_package_output = ""
 
-if type == "sdc":
+if model == "sdc":
     print "use csar file is distributed by sdc"
-    # vnf_onboard_output = onboard_vnf(parameters)
-    # print vnf_onboard_output
-    # ns_onboard_out = onboard_ns(parameters)
-    # print ns_onboard_out
+    # output = create_vlm(parameters)
+    # vsp_dict = create_vsp(parameters, output)
+    # vf_dict = create_vf_model(parameters, vsp_dict)
+    # service_model_list = create_service_model(parameters, vf_dict)
+   
+    vnf_onboard_output = onboard_vnf(parameters)
+    print vnf_onboard_output
+    ns_onboard_out = onboard_ns(parameters)
+    print ns_onboard_out
 else:
     print "use csar file is uploaded by local"
     vnf_package_output = create_vnf_package(parameters)
@@ -252,7 +508,8 @@ else:
     print upload_ns_out
 
 # 6.add_policies function not currently working, using curl commands
-# add_policies(parameters)
+add_policy_models(parameters)
+add_policies(parameters)
 
 # 7. VFC part
 ns_instance_id = create_ns(parameters, ns_package_output)