diff options
Diffstat (limited to 'robot/assets')
| -rw-r--r-- | robot/assets/templates/so/cds_request.jinja | 34 | ||||
| -rw-r--r-- | robot/assets/templates/so/cds_service_template.jinja | 38 |
2 files changed, 40 insertions, 32 deletions
diff --git a/robot/assets/templates/so/cds_request.jinja b/robot/assets/templates/so/cds_request.jinja index b39767ff..625df95b 100644 --- a/robot/assets/templates/so/cds_request.jinja +++ b/robot/assets/templates/so/cds_request.jinja @@ -4,26 +4,36 @@ "globalSubscriberId" : "{{subscriber_id}}" }, "requestInfo" : { - "suppressRollback" : true, + "suppressRollback" : false, "productFamilyId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "requestorId" : "ym9479", + "requestorId" : "robot-ete", "instanceName" : "{{service_instance_name}}", "source" : "VID" }, + "cloudConfiguration":{ + "lcpCloudRegionId":"{{GLOBAL_INJECTED_REGION}}", + "tenantId":"{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}", + "cloudOwner":"{{cloud_owner}}" + }, "requestParameters" : { "subscriptionServiceType" : "{{subscription_service_type}}", "userParams" : [ { + "Homing_Solution":"{{homing_solution}}" + }, + { "service" : { "instanceParams" : [], "instanceName" : "{{service_instance_name}}", "resources" : { "vnfs" : {{vnfs} }, - "modelInfo" : { - "modelType" : "service", - "modelName" : "{{service_model_name}}", - "modelVersionId" : "{{service_model_UUID}}" + "modelInfo":{ + "modelVersion":"1.0", + "modelVersionId":"{{service_model_uuid}}", + "modelInvariantId":"{{service_model_invariantuuid}}", + "modelName":"{{service_model_name}}", + "modelType":"service" } } } @@ -31,16 +41,16 @@ "aLaCarte" : false }, "project" : { - "projectName" : "some project name" + "projectName" : "Project-Demonstration" }, "owningEntity" : { - "owningEntityName" : "PACKET CORE", - "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489" + "owningEntityId":"{{owning_entity_id}}", + "owningEntityName":"{{owning_entity}}" }, "modelInfo" : { - "modelVersion" : "10.0", - "modelVersionId" : "{{service_model_UUID}}", - "modelInvariantId" : "{{service_model_invariantUUID}}", + "modelVersion":"1.0", + "modelVersionId" : "{{service_model_uuid}}", + "modelInvariantId" : "{{service_model_invariantuuid}}", "modelName" : "{{service_model_name}}", "modelType" : "service" } diff --git a/robot/assets/templates/so/cds_service_template.jinja b/robot/assets/templates/so/cds_service_template.jinja index de2a36f1..9b6e1cc2 100644 --- a/robot/assets/templates/so/cds_service_template.jinja +++ b/robot/assets/templates/so/cds_service_template.jinja @@ -1,32 +1,30 @@ { "requestDetails":{ "subscriberInfo":{ - "globalSubscriberId":"{{customer}}" + "globalSubscriberId":"{{subscriber_id}}" }, "requestInfo":{ "suppressRollback":false, "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "requestorId":"adt", - "instanceName":"{{cds_instance_name}}", + "requestorId":"robot-ete", + "instanceName":"{{service_instance_name}}", "source":"VID" }, "cloudConfiguration":{ "lcpCloudRegionId":"{{GLOBAL_INJECTED_REGION}}", "tenantId":"{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}", - "cloudOwner":"{{cloudOwner}}" + "cloudOwner":"{{cloud_owner}}" }, "requestParameters":{ - "subscriptionServiceType":"{{subscriptionServiceType}}", + "subscriptionServiceType":"{{subscription_service_type}}", "userParams":[ { - "Homing_Solution":"none" + "Homing_Solution":"{{homing_solution}}" }, { "service":{ - "instanceParams":[ - - ], - "instanceName":"{{cds_instance_name}}", + "instanceParams" : [], + "instanceName":"{{service_instance_name}}", "resources":{ "vnfs":[ { @@ -134,11 +132,11 @@ ] }, "modelInfo":{ - "modelVersion":"1.0", - "modelVersionId":"{{service_uuid}}", - "modelInvariantId":"{{service_invariantUUID}}", - "modelName":"{{cds_service_model}}", - "modelType":"service" + "modelVersion":"1.0", + "modelVersionId":"{{service_model_uuid}}", + "modelInvariantId":"{{service_model_invariantuuid}}", + "modelName":"{{service_model_name}}", + "modelType":"service" } } } @@ -149,14 +147,14 @@ "projectName":"Project-Demonstration" }, "owningEntity":{ - "owningEntityId":"67f2e84c-734d-4e90-a1e4-d2ffa2e75849", - "owningEntityName":"OE-Demonstration" + "owningEntityId":"{{owning_entity_id}}", + "owningEntityName":"{{owning_entity}}" }, "modelInfo":{ "modelVersion":"1.0", - "modelVersionId":"{{service_uuid}}", - "modelInvariantId":"{{service_invariantUUID}}", - "modelName":"{{cds_service_model}}", + "modelVersionId":"{{service_model_uuid}}", + "modelInvariantId":"{{service_model_invariantuuid}}", + "modelName":"{{service_model_name}}", "modelType":"service" } } |