diff options
| author |   krzysztof kuzmicki <krzysztof.kuzmicki@nokia.com> | 2019-07-31 20:08:36 +0200 |
|---|---|---|
| committer |   Daniel Rose <dr695h@att.com> | 2019-08-02 19:23:00 +0000 |
| commit | dadd0e69a24c6a43534086cb04672dc6d4ddc18b (patch) | |
| tree | 83ba7fac3fe3367da96642ab5289a01d2eaa0097 /robot/assets | |
| parent | e971ed9437e004b415b4321edc75883d69eca3e5 (diff) | |
ROBOT test cases improvements for PnP PNF in El Alto release
Issue-ID: INT-1179
Signed-off-by: Krzysztof Kuzmicki <krzysztof.kuzmicki@nokia.com>
Change-Id: I7b840e4fa53c9058d74872cbaf3e1922651b7997
Diffstat (limited to 'robot/assets')
4 files changed, 25 insertions, 3 deletions
diff --git a/robot/assets/templates/openstack/keystone_get_v3_auth.jinja b/robot/assets/templates/openstack/keystone_get_v3_auth.jinja index 30b15568..0d827a85 100644 --- a/robot/assets/templates/openstack/keystone_get_v3_auth.jinja +++ b/robot/assets/templates/openstack/keystone_get_v3_auth.jinja @@ -6,7 +6,7 @@ ], "password": { "user": { - "name": "{{username}", + "name": "{{username}}", "domain": { "id": "{{domain_id}}" }, diff --git a/robot/assets/templates/sdc/catalog_resource.jinja b/robot/assets/templates/sdc/catalog_resource.jinja index 6839beda..5cab07f6 100644 --- a/robot/assets/templates/sdc/catalog_resource.jinja +++ b/robot/assets/templates/sdc/catalog_resource.jinja @@ -37,7 +37,7 @@ "properties": [], "attributes": [], "groups": [], - "resourceType": "VF", + "resourceType": "{{resource_type}}", "csarUUID": "{{software_product_id}}", "csarVersion": "1.0" }
\ No newline at end of file diff --git a/robot/assets/templates/sdc/catalog_service.jinja b/robot/assets/templates/sdc/catalog_service.jinja index 09c56301..64a71ada 100644 --- a/robot/assets/templates/sdc/catalog_service.jinja +++ b/robot/assets/templates/sdc/catalog_service.jinja @@ -37,6 +37,6 @@ "forwardingPaths": {}, "ecompGeneratedNaming": true, "serviceApiArtifacts": {}, - "instantiationType": "A-la-carte", + "instantiationType": "{{instantiation_type}}", "environmentContext": "General_Revenue-Bearing" }
\ No newline at end of file diff --git a/robot/assets/templates/so/service_recipe.jinja b/robot/assets/templates/so/service_recipe.jinja new file mode 100644 index 00000000..c7c3ebc8 --- /dev/null +++ b/robot/assets/templates/so/service_recipe.jinja @@ -0,0 +1,22 @@ +{ + "id" : "{{id}}", + "serviceModelUUID" : "{{service_model_UUID}}" , + "action" : "createInstance", + "description" : "Vnf api recipe to create service-instance", + "orchestrationUri" : "{{orchestrationUri}}", + "paramXsd" : null, + "recipeTimeout" : 180, + "serviceTimeoutInterim" : null, + "created" : "2017-10-05T18:52:03.000+0000", + "_links" : { + "self" : { + "href" : "http://so-catalog-db-adapter:8082/serviceRecipe/{{id}}" + }, + "serviceRecipe" : { + "href" : "http://so-catalog-db-adapter:8082/serviceRecipe/{{id}}" + }, + "service" : { + "href" : "http://so-catalog-db-adapter:8082/serviceRecipe/{{id}}/service" + } + } + }
\ No newline at end of file |