summaryrefslogtreecommitdiffstats
path: root/robot/resources
diff options
context:
space:
mode:
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-09-17 14:39:36 +0200
committerKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-09-17 15:32:06 +0200
commitc970d4003939c94eaf1fb45e70af47a9190db9f7 (patch)
treefc68be1457faf4c136d6e0e0b0c36595ba466c1c /robot/resources
parentda8e4c387c06cd481964169a5612e2905abfb6b7 (diff)
fix Get Service Id issue in pnf registartion test case in xtesting gating and master
Issue-ID: INT-1668 Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> Change-Id: I0fab128f2759f2bda5fb83403fe11069244f9873
Diffstat (limited to 'robot/resources')
-rw-r--r--robot/resources/aai/create_service.robot1
-rw-r--r--robot/resources/test_templates/pnf_orchestration_test_template.robot10
2 files changed, 6 insertions, 5 deletions
diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot
index 1c036ec3..43764849 100644
--- a/robot/resources/aai/create_service.robot
+++ b/robot/resources/aai/create_service.robot
@@ -64,6 +64,7 @@ Get Service Id
[Arguments] ${service_description}
${resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${INDEX PATH}${ROOT_SERVICE_PATH} auth=${GLOBAL_AAI_AUTHENTICATION}
${resp_json}= Set Variable ${resp.json()}
+ ${id}= Set Variable
@{list}= Copy List ${resp_json['service']}
:FOR ${map} IN @{list}
\ ${service_type}= Get From Dictionary ${map} service-description
diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot
index 6ecd2a02..c46e74ba 100644
--- a/robot/resources/test_templates/pnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot
@@ -36,6 +36,11 @@ Orchestrate PNF Macro Flow
Orchestrate PNF Building Block Flow
[Documentation] Use ONAP to Orchestrate a PNF using GR api
[Arguments] ${service_model_name} ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${region} ${owning_entity} ${owningEntityId} ${project_name}=Project-Demonstration ${lineOfBusinessName}=LOB-Demonstration ${platformName}=Platform-Demonstration
+ ${uuid}= Generate UUID4
+ ${full_customer_name}= Catenate ${customer_name}_${uuid}
+ ${service_name}= Catenate Service_Ete_Name${uuid}
+ ${service_type}= Set Variable ${service}
+ Create Customer For PNF ${full_customer_name} ${full_customer_name} INFRA ${service_type} ${GLOBAL_AAI_CLOUD_OWNER} ${tenant_id} ${region}
${json_resp}= Get Service Catalog ${service_model_name}
${service_model_uuid}= Set Variable ${json_resp["uuid"]}
${service_model_invariant_uuid }= Set Variable ${json_resp["invariantUUID"]}
@@ -47,11 +52,6 @@ Orchestrate PNF Building Block Flow
${nf_model_uuid}= Set Variable ${json_resp["uuid"]}
${nf_model_name}= Set Variable ${json_resp["name"]}
${productFamilyId}= Get Service Id ${product_family}
- ${uuid}= Generate UUID4
- ${full_customer_name}= Catenate ${customer_name}_${uuid}
- ${service_name}= Catenate Service_Ete_Name${uuid}
- ${service_type}= Set Variable ${service}
- Create Customer For PNF ${full_customer_name} ${full_customer_name} INFRA ${service_type} ${GLOBAL_AAI_CLOUD_OWNER} ${tenant_id} ${region}
${arguments}= Create Dictionary service_model_invariant_uuid=${service_model_invariant_uuid}
Set To Dictionary ${arguments} service_model_uuid ${service_model_uuid}
Set To Dictionary ${arguments} service_model_name ${service_model_name}