Merge "add modeling genericparser"

diff --git a/deployment/heat/onap-rke/env/windriver/onap-oom.env b/deployment/heat/onap-rke/env/windriver/onap-oom.env
index 60bf284..c95978f 100644 (file)
--- a/deployment/heat/onap-rke/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-rke/env/windriver/onap-oom.env
@@ -67,6 +67,7 @@ parameters:
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
     sdnc:
+      image: onap/sdnc-image:1.5.1
       enabled: true
       replicaCount: 1
       config:
@@ -92,6 +93,8 @@ parameters:
           periodSeconds: 600
     portal:
       enabled: true
+      portal-app:
+        image: onap/portal-app:2.5.0-STAGING-20190430T150225
       portal-cassandra:
         liveness:
           periodSeconds: 600

diff --git a/test/hpa_automation/hpa_automation.py b/test/hpa_automation/hpa_automation.py
index a5b8b4d..1bbf3a4 100644 (file)
--- a/test/hpa_automation/hpa_automation.py
+++ b/test/hpa_automation/hpa_automation.py
@@ -177,14 +177,21 @@ def create_vf_model(parameters, vsp_id):
       parameters["sdc_creator"], parameters["sdc_password"], parameters["vf-name"]))).read()
     output = (get_out_helper_2(output))
 
-    vf_id = output[0]
     vf_unique_id = output[1]
-    vf_model_invariant_uuid = output[2]
-    vf_model_version = output[4]
 
     os.system("oclip vf-model-certify -b {} -r {} -u {} -p {} -m {}".format(vf_unique_id, parameters["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"], parameters["vf-name"]))).read()
+    output = (get_out_helper_2(output))
+
+    vf_id = output[0]
+    vf_unique_id = output[1]
+    vf_model_invariant_uuid = output[2]
+    vf_model_version = output[4]
+
     out_dict = {}
     out_dict["vf_id"] = vf_id
     out_dict["vf_unique_id"] = vf_unique_id
@@ -237,15 +244,20 @@ def add_policies(parameters):
       parameters["service-model-name"] ))).read()
     resource_module_name =   (get_out_helper_2(resource_string))[1]
 
-    #Upload policy models
+   #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...")
+    #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"]):
@@ -430,12 +442,12 @@ def create_vf_module(parameters, service_dict, vnf_dict, db_dict):
 
 
     os.system("oclip vf-module-create -w {} -mn '{}' -x {} -l {} -sv {} -vc {} -vm {} -mv {} -i {} -vf {} -vi {}  -r {} \
-      -mc {} -api {} -mi {} -vid {} -y {} -R {} -si {} -up {} -sd {} -z {} -vn {} -vv {} -u {} -p {} -m {}".format(tenant_id, \
+      -mc {} -api {} -mi {} -vid {} -y {} -R {} -si {} -up {} -sd {} -z {} -vn {} -vv {} -co {} -u {} -p {} -m {}".format(tenant_id, \
         vf_model_customization_name, service_instance_id, cloud_region, service_version, vf_module_customization_id, vf_module_model_version,\
          vf_model_version, parameters["vf-module-name"], parameters["vf-name"], vf_module_model_invariant_id, parameters["supress-rollback"], \
          vf_model_customization_id, parameters["test-api"], vf_model_invariant_uuid, vf_model_id, vnf_instance_id, parameters["requestor-id"], \
          service_uuid, parameters["use-preload"], service_invariant_uuid, parameters["service-model-name"], vf_module_model_name, \
-         vf_module_model_version_id, parameters["so_username"], parameters["so_password"], parameters["so_url"]))
+         vf_module_model_version_id, parameters["cloud-owner"], parameters["so_username"], parameters["so_password"], parameters["so_url"]))
 
 
 

diff --git a/test/hpa_automation/hpa_automation_config.json b/test/hpa_automation/hpa_automation_config.json
index 4c062a6..ff21bfe 100644 (file)
--- a/test/hpa_automation/hpa_automation_config.json
+++ b/test/hpa_automation/hpa_automation_config.json
@@ -34,7 +34,8 @@
 "policy_onapName" : "SampleDemo",
 "policy_config_type": "MicroService",
 "policy_pdp_group" : "default",
-
+"//" : "Put in a temp resource module name, should be the same in policy files, script will replace it in policies",
+"temp_resource_module_name" : "resource_name",
 
 "//" : "#Parameters required to create cloud complex",
 "complex_name" : "clli1",

diff --git a/test/security/check_for_jdwp.sh b/test/security/check_for_jdwp.sh
index 7bcbade..0facbff 100755 (executable)
--- a/test/security/check_for_jdwp.sh
+++ b/test/security/check_for_jdwp.sh
@@ -47,7 +47,8 @@ do_jdwp_handshake() {
        local jdwp_challenge="JDWP-Handshake\n"
        local jdwp_response="JDWP-Handshake"
 
-       local response=`nc $ip $port <<<$jdwp_challenge`
+       # 10s timeout to avoid hangs when service doesn't answer at all
+       local response=`nc -w 10 $ip $port <<<$jdwp_challenge | tr '\0' '\n'`
        if [[ $response == *"$jdwp_response"* ]]; then
                return 0
        fi

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 3b41cdd..01230bd 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -68,9 +68,9 @@ onap/msb/msb_discovery,1.2.3-STAGING-latest
 onap/multicloud/azure,1.2.1
 onap/multicloud/framework,1.3.2-STAGING
 onap/multicloud/openstack-lenovo,1.3.2-STAGING
-onap/multicloud/openstack-ocata,1.3.0-STAGING
-onap/multicloud/openstack-pike,1.3.0-STAGING
-onap/multicloud/openstack-windriver,1.3.0-STAGING
+onap/multicloud/openstack-ocata,1.3.2-STAGING
+onap/multicloud/openstack-pike,1.3.2-STAGING
+onap/multicloud/openstack-windriver,1.3.2-STAGING
 onap/multicloud/vio,1.3.1-STAGING
 onap/music/cassandra_3_11,3.0.24
 onap/music/cassandra_job,3.0.24
@@ -132,7 +132,7 @@ onap/sdnc-ansible-server-image,1.5-STAGING-latest
 onap/sdnc-dmaap-listener-image,1.5-STAGING-latest
 onap/sdnc-image,1.5-STAGING-latest
 onap/sdnc-ueb-listener-image,1.5-STAGING-latest
-onap/search-data-service,1.4.2
+onap/search-data-service,1.4.3
 onap/service-decomposition,1.5.0-SNAPSHOT-latest
 onap/sniroemulator,1.0.0
 onap/so/api-handler-infra,1.4.0-STAGING-latest