From 74515e6a9045f0db0bd83053c6c3d567cc148f4c Mon Sep 17 00:00:00 2001 From: DR695H Date: Wed, 19 Jun 2019 18:56:34 -0400 Subject: move cds templates to template folder Issue-ID: TEST-158 Change-Id: I492de0574080a9b1e8420e513b53477f133b98d5 Signed-off-by: DR695H --- robot/assets/cds/template_so_request.json | 48 ---------------------- robot/assets/cds/template_vfmodule.json | 16 -------- robot/assets/cds/template_vnf.json | 23 ----------- robot/assets/templates/cds/so_request.template | 48 ++++++++++++++++++++++ robot/assets/templates/cds/vfmodule.template | 16 ++++++++ robot/assets/templates/cds/vnf.template | 23 +++++++++++ .../vnf_orchestration_with_cds_test_template.robot | 6 +-- 7 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 robot/assets/cds/template_so_request.json delete mode 100644 robot/assets/cds/template_vfmodule.json delete mode 100644 robot/assets/cds/template_vnf.json create mode 100644 robot/assets/templates/cds/so_request.template create mode 100644 robot/assets/templates/cds/vfmodule.template create mode 100644 robot/assets/templates/cds/vnf.template (limited to 'robot') diff --git a/robot/assets/cds/template_so_request.json b/robot/assets/cds/template_so_request.json deleted file mode 100644 index bf0a8edb..00000000 --- a/robot/assets/cds/template_so_request.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "requestDetails" : { - "subscriberInfo" : { - "globalSubscriberId" : "${subscriber_id}" - }, - "requestInfo" : { - "suppressRollback" : true, - "productFamilyId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "requestorId" : "ym9479", - "instanceName" : "${service_instance_name}", - "source" : "VID" - }, - "requestParameters" : { - "subscriptionServiceType" : "${subscription_service_type}", - "userParams" : [ - { - "service" : { - "instanceParams" : [], - "instanceName" : "${service_instance_name}", - "resources" : { - "vnfs" : ${vnfs} - }, - "modelInfo" : { - "modelType" : "service", - "modelName" : "${service_model_name}", - "modelVersionId" : "${service_model_UUID}" - } - } - } - ], - "aLaCarte" : false - }, - "project" : { - "projectName" : "some project name" - }, - "owningEntity" : { - "owningEntityName" : "PACKET CORE", - "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489" - }, - "modelInfo" : { - "modelVersion" : "10.0", - "modelVersionId" : "${service_model_UUID}", - "modelInvariantId" : "${service_model_invariantUUID}", - "modelName" : "${service_model_name}", - "modelType" : "service" - } - } -} diff --git a/robot/assets/cds/template_vfmodule.json b/robot/assets/cds/template_vfmodule.json deleted file mode 100644 index bde231e0..00000000 --- a/robot/assets/cds/template_vfmodule.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "modelInfo": { - "modelType": "vfModule", - "modelName": "${vf_module_model_name}", - "modelVersionId": "${vf_module_model_version_id}", - "modelCustomizationId": "${vf_module_model_customization_id}" - }, - "instanceName": "${vf_module_name}", - "instanceParams": [ - { - "vfw_param1": "24", - "vfw_param2": "24", - "vfw_param3": "24" - } - ] -} diff --git a/robot/assets/cds/template_vnf.json b/robot/assets/cds/template_vnf.json deleted file mode 100644 index 954654e6..00000000 --- a/robot/assets/cds/template_vnf.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "modelInfo": { - "modelType": "vnf", - "modelName": "${vnf_model_name}", - "modelVersionId": "${vnf_model_version_id}", - "modelCustomizationName": "${vnf_model_customization_name}", - "modelCustomizationId": "${vnf_model_customization_id}" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "${cloud_region}", - "tenantId": "${tenant_id}" - }, - "platform": { - "platformName": "test" - }, - "lineOfBusiness": { - "lineOfBusinessName": "someValue" - }, - "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "instanceName": "${vnf_name}", - "instanceParams": [], - "vfModules": [${vf_modules}] -} diff --git a/robot/assets/templates/cds/so_request.template b/robot/assets/templates/cds/so_request.template new file mode 100644 index 00000000..bf0a8edb --- /dev/null +++ b/robot/assets/templates/cds/so_request.template @@ -0,0 +1,48 @@ +{ + "requestDetails" : { + "subscriberInfo" : { + "globalSubscriberId" : "${subscriber_id}" + }, + "requestInfo" : { + "suppressRollback" : true, + "productFamilyId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "requestorId" : "ym9479", + "instanceName" : "${service_instance_name}", + "source" : "VID" + }, + "requestParameters" : { + "subscriptionServiceType" : "${subscription_service_type}", + "userParams" : [ + { + "service" : { + "instanceParams" : [], + "instanceName" : "${service_instance_name}", + "resources" : { + "vnfs" : ${vnfs} + }, + "modelInfo" : { + "modelType" : "service", + "modelName" : "${service_model_name}", + "modelVersionId" : "${service_model_UUID}" + } + } + } + ], + "aLaCarte" : false + }, + "project" : { + "projectName" : "some project name" + }, + "owningEntity" : { + "owningEntityName" : "PACKET CORE", + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489" + }, + "modelInfo" : { + "modelVersion" : "10.0", + "modelVersionId" : "${service_model_UUID}", + "modelInvariantId" : "${service_model_invariantUUID}", + "modelName" : "${service_model_name}", + "modelType" : "service" + } + } +} diff --git a/robot/assets/templates/cds/vfmodule.template b/robot/assets/templates/cds/vfmodule.template new file mode 100644 index 00000000..bde231e0 --- /dev/null +++ b/robot/assets/templates/cds/vfmodule.template @@ -0,0 +1,16 @@ +{ + "modelInfo": { + "modelType": "vfModule", + "modelName": "${vf_module_model_name}", + "modelVersionId": "${vf_module_model_version_id}", + "modelCustomizationId": "${vf_module_model_customization_id}" + }, + "instanceName": "${vf_module_name}", + "instanceParams": [ + { + "vfw_param1": "24", + "vfw_param2": "24", + "vfw_param3": "24" + } + ] +} diff --git a/robot/assets/templates/cds/vnf.template b/robot/assets/templates/cds/vnf.template new file mode 100644 index 00000000..954654e6 --- /dev/null +++ b/robot/assets/templates/cds/vnf.template @@ -0,0 +1,23 @@ +{ + "modelInfo": { + "modelType": "vnf", + "modelName": "${vnf_model_name}", + "modelVersionId": "${vnf_model_version_id}", + "modelCustomizationName": "${vnf_model_customization_name}", + "modelCustomizationId": "${vnf_model_customization_id}" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "${cloud_region}", + "tenantId": "${tenant_id}" + }, + "platform": { + "platformName": "test" + }, + "lineOfBusiness": { + "lineOfBusinessName": "someValue" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "${vnf_name}", + "instanceParams": [], + "vfModules": [${vf_modules}] +} diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index 9c424b37..e5ffc97e 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -35,9 +35,9 @@ Library Collections *** Variables *** ${service_template} robot/assets/cds/service-Vfirewall0911-template.yml ${env} robot/assets/cds/env.yml -${so_request_template} robot/assets/cds/template_so_request.json -${vnf_template_name} robot/assets/cds/template_vnf.json -${vfmodule_template_name} robot/assets/cds/template_vfmodule.json +${so_request_template} robot/assets/templates/cds/so_request.template +${vnf_template_name} robot/assets/templates/cds/vnf.template +${vfmodule_template_name} robot/assets/templates/cds/vfmodule.template ${so_uri_path} /onap/so/infra/serviceInstantiation/v7/serviceInstances *** Variables *** -- cgit 1.2.3-korg