summaryrefslogtreecommitdiffstats
path: root/robot/resources/test_templates
diff options
context:
space:
mode:
authorKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-09-15 10:05:48 +0200
committerKrzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>2020-09-15 08:18:23 +0000
commit56521ebd9c8b76047d12f39df04f72d167fb3563 (patch)
tree958c8244c2f35292d494a45d59f8dda8648a881e /robot/resources/test_templates
parentb91ba0f3a6c662776d68f58a5adacaf80e2ac7f8 (diff)
Remove from CI PNF registration test that uses deprecated vnf api
fix OE issue in xtesting gating and master Issue-ID: INT-1668 Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com> Change-Id: Ia8d62b7e5f98dc96692f39a6636f3726dfd15604
Diffstat (limited to 'robot/resources/test_templates')
-rw-r--r--robot/resources/test_templates/pnf_orchestration_test_template.robot3
-rw-r--r--robot/resources/test_templates/pnf_registration_without_SO_template.robot3
2 files changed, 3 insertions, 3 deletions
diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot
index 0302ef65..6ecd2a02 100644
--- a/robot/resources/test_templates/pnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot
@@ -35,7 +35,7 @@ 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} ${project_name}=Project-Demonstration ${owning_entity}=OE-Demonstration ${lineOfBusinessName}=LOB-Demonstration ${platformName}=Platform-Demonstration
+ [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
${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,7 +47,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}
- ${owningEntityId}= Get Owning Entity Id ${owning_entity}
${uuid}= Generate UUID4
${full_customer_name}= Catenate ${customer_name}_${uuid}
${service_name}= Catenate Service_Ete_Name${uuid}
diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
index fd8aaed1..6dd88ac7 100644
--- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot
+++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot
@@ -133,8 +133,9 @@ Instantiate PNF_macro service and succesfully registrate PNF template
Load OwningEntity owningEntity OE-${customer_name}
Load OwningEntity lineOfBusiness LOB-${customer_name}
Load OwningEntity platform Platform-${customer_name}
+ ${uuid_oe}= Generate UUID4
${service_instance_id} ${request_id} ${full_customer_name} Run Keyword If "${building_block_flow}"=='false' Orchestrate PNF Macro Flow ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${tenant_id} ${tenant_name} ${service_name} ${region} Project-${customer_name} OE-${customer_name}
- ... ELSE Orchestrate PNF Building Block Flow ${catalog_service_name} ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${region} project_name=Project-${customer_name} owning_entity=OE-${customer_name} lineOfBusinessName=LOB-${customer_name} platformName=Platform-${customer_name}
+ ... ELSE Orchestrate PNF Building Block Flow ${catalog_service_name} ${customer_name} ${service} ${product_family} ${pnf_correlation_id} ${region} owning_entity=OE-${customer_name}-${uuid_oe} owningEntityId=${uuid_oe} project_name=Project-${customer_name} lineOfBusinessName=LOB-${customer_name} platformName=Platform-${customer_name}
Wait Until Keyword Succeeds 180s 40s Send and verify VES integration request in SO and A&AI ${request_id} ${PNF_entry_dict}
Run Keyword If "${building_block_flow}"=='true' Check PNF orchestration status in A&AI ${pnf_correlation_id} Active
[Teardown] Instantiate PNF_macro service Teardown ${catalog_service_id} ${catalog_resource_ids} ${PNF_entry_dict}