diff options
| author |   Itohan Ukponmwan <itohan.ukponmwan@intel.com> | 2019-09-13 00:08:39 +0000 |
|---|---|---|
| committer | Itohan Ukponmwan <itohan.ukponmwan@intel.com> | 2019-09-13 00:46:18 +0000 |
| commit | 63929cfc099d8a39bf9854dd7fbb1f32490e1147 (patch) | |
| tree | 841dcf831655ed805f7572a525e9864532b8555f | |
| parent | 0b06f78094bf11112f57d32d741e349108c34042 (diff) | |
Fixed Bugs in HPA automtion script
Signed-off-by: Itohan Ukponmwan <itohan.ukponmwan@intel.com>
Issue-ID: INT-1137
Change-Id: I89fefb02d7d58453d490499716c581cb66895b59
| -rwxr-xr-x | test/hpa_automation/heat/hpa_automation.py | 6 | ||||
| -rwxr-xr-x | test/hpa_automation/heat/hpa_automation_config.json | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/test/hpa_automation/heat/hpa_automation.py b/test/hpa_automation/heat/hpa_automation.py index 86c908adf..212b8adfc 100755 --- a/test/hpa_automation/heat/hpa_automation.py +++ b/test/hpa_automation/heat/hpa_automation.py @@ -229,7 +229,7 @@ def create_service_model(parameters, vf_unique_id): #VNF Deployment Section def upload_policy_models(parameters): - os.system("python insert_policy_models.py {} {} {}".format(parameters["policy_db_ip"], \ + os.system("python insert_policy_models_heat.py {} {} {}".format(parameters["policy_db_ip"], \ parameters["policy_db_user"], parameters["policy_db_password"])) def add_policies(parameters): @@ -488,8 +488,8 @@ db_dict = query_db(parameters, service_model_uuid, vf_id) #Wait for Service instance to be created then create VNF Instance while True: #Check if service instance has been created" - check_service_instance = os.popen("oclip service-instance-list -u {} -p {} -m {} |grep {}".format(parameters["aai_username"], \ - parameters["aai_password"], parameters["aai_url"], parameters["instance-name"])).read() + check_service_instance = os.popen("oclip service-instance-list -u {} -p {} -m {} |grep {}-{}".format(parameters["aai_username"], \ + parameters["aai_password"], parameters["aai_url"], parameters["instance-name"], parameters["service_name"])).read() if check_service_instance: print "service instance created successfully" #Create VNF Instance diff --git a/test/hpa_automation/heat/hpa_automation_config.json b/test/hpa_automation/heat/hpa_automation_config.json index 94ef7c81b..0ae106368 100755 --- a/test/hpa_automation/heat/hpa_automation_config.json +++ b/test/hpa_automation/heat/hpa_automation_config.json @@ -1,7 +1,7 @@ { "open_cli_product" : "onap-dublin", -"open_cli_home" : "/root/cli/deployment/zip/target/deployunzip", +"open_cli_home" : "/opt/oclip", "aai_url" : "https://10.12.6.235:30233", "aai_username" : "AAI", "aai_password" : "AAI", @@ -13,10 +13,10 @@ "sdc_governor" : "gv0001", "sdc_operator" : "op0001", "csar-file-path" : "/root/automation_stuff/hpa_zip_files/vfw_hpa.zip", -"sdnc_url" : "http://10.12.6.235:30202", +"sdnc_url" : "http://10.12.6.235:30208", "sdnc_user" : "admin", "sdnc_password" : "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U", -"sdnc_preload_file" : "/root/automation_stuff/vfw_hpa_preload.txt", +"sdnc_preload_file" : "/root/integration/test/hpa_automation/heat/sample_vfw_hpa_preload.txt", "so_url" : "http://10.12.6.235:30277", "so_username" : "InfraPortalClient", "so_password" : "password1$", @@ -28,8 +28,8 @@ "policy_url" : "https://10.12.6.235:30694", "policy_username" : "testpdp", "policy_password" : "alpha123", -"policy_directory" : "/root/automation_stuff/vfw_policies", -"policy_scope" : "OSDF_CASABLANCA", +"policy_directory" : "/root/integration/test/hpa_automation/heat/sample_vfw_policies", +"policy_scope" : "OSDF_DUBLIN", "policy_onapName" : "SampleDemo", "policy_config_type": "MicroService", "policy_pdp_group" : "default", |