From f7f3bf3b67f8c32291ea57f7a083dfd1436d0ee7 Mon Sep 17 00:00:00 2001 From: kaihlavi Date: Wed, 21 Aug 2019 17:42:11 +0300 Subject: Adjust SDC-DCAE-DS to integration test changes Backport improvements made to corresponding integration test in https://gerrit.onap.org/r/#/c/testsuite/+/92864/ to CSIT Change-Id: Iadc7463b81a9860f1b625abdaff66a125b4a9c46 Issue-ID: SDC-2480 Signed-off-by: kaihlavi --- .../sdc-dcae-d/dcaed/assets/catalog_service.jinja | 42 ---------------------- .../dcaed/assets/catalog_service_monitoring.jinja | 42 ++++++++++++++++++++++ .../dcaed/assets/component_catalog_resource.jinja | 41 --------------------- .../dcaed/assets/dcae_component_microservice.jinja | 41 +++++++++++++++++++++ 4 files changed, 83 insertions(+), 83 deletions(-) delete mode 100755 tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja create mode 100755 tests/sdc-dcae-d/dcaed/assets/catalog_service_monitoring.jinja delete mode 100644 tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja create mode 100644 tests/sdc-dcae-d/dcaed/assets/dcae_component_microservice.jinja (limited to 'tests/sdc-dcae-d/dcaed/assets') diff --git a/tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja b/tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja deleted file mode 100755 index 3cd326e4..00000000 --- a/tests/sdc-dcae-d/dcaed/assets/catalog_service.jinja +++ /dev/null @@ -1,42 +0,0 @@ -{ - "artifacts": {}, - "toscaArtifacts": {}, - "contactId": "cs0008", - "categories": [ - { - "name": "Network L4+", - "normalizedName": "network l4+", - "uniqueId": "serviceNewCategory.network l4+", - "icons": [ - "network_l_4" - ], - "subcategories": null, - "version": null, - "ownerId": null, - "empty": false, - "type": null - } - ], - "description": "Created by robot for monitoring template", - "icon": "defaulticon", - "componentInstancesProperties": {}, - "componentInstancesAttributes": {}, - "name": "{{service_name}}", - "tags": [ - "robot-ete", - "{{service_name}}" - ], - "capabilities": {}, - "requirements": {}, - "deploymentArtifacts": {}, - "componentType": "SERVICE", - "projectCode": "123456", - "componentInstances": [], - "properties": [], - "attributes": [], - "forwardingPaths": {}, - "ecompGeneratedNaming": true, - "serviceApiArtifacts": {}, - "instantiationType": "A-la-carte", - "environmentContext": "General_Revenue-Bearing" -} diff --git a/tests/sdc-dcae-d/dcaed/assets/catalog_service_monitoring.jinja b/tests/sdc-dcae-d/dcaed/assets/catalog_service_monitoring.jinja new file mode 100755 index 00000000..3cd326e4 --- /dev/null +++ b/tests/sdc-dcae-d/dcaed/assets/catalog_service_monitoring.jinja @@ -0,0 +1,42 @@ +{ + "artifacts": {}, + "toscaArtifacts": {}, + "contactId": "cs0008", + "categories": [ + { + "name": "Network L4+", + "normalizedName": "network l4+", + "uniqueId": "serviceNewCategory.network l4+", + "icons": [ + "network_l_4" + ], + "subcategories": null, + "version": null, + "ownerId": null, + "empty": false, + "type": null + } + ], + "description": "Created by robot for monitoring template", + "icon": "defaulticon", + "componentInstancesProperties": {}, + "componentInstancesAttributes": {}, + "name": "{{service_name}}", + "tags": [ + "robot-ete", + "{{service_name}}" + ], + "capabilities": {}, + "requirements": {}, + "deploymentArtifacts": {}, + "componentType": "SERVICE", + "projectCode": "123456", + "componentInstances": [], + "properties": [], + "attributes": [], + "forwardingPaths": {}, + "ecompGeneratedNaming": true, + "serviceApiArtifacts": {}, + "instantiationType": "A-la-carte", + "environmentContext": "General_Revenue-Bearing" +} diff --git a/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja b/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja deleted file mode 100644 index a3661b36..00000000 --- a/tests/sdc-dcae-d/dcaed/assets/component_catalog_resource.jinja +++ /dev/null @@ -1,41 +0,0 @@ -{ - "artifacts": {}, - "toscaArtifacts": {}, - "contactId": "cs0008", - "categories": [ - { - "name": "DCAE Component", - "normalizedName": "dcaecomponent", - "uniqueId": "resourceNewCategory.dcaecomponent", - "subcategories": [ - { - "name": "Microservice", - "normalizedName": "microservice", - "uniqueId": "resourceNewCategory.dcaecomponent.microservice", - "icons": [ - "dcae_microservice" - ] - } - ] - } - ], - "description": "virtual function", - "icon": "defaulticon", - "componentInstancesProperties": {}, - "componentInstancesAttributes": {}, - "name": "{{resource_name}}", - "tags": [ - "{{resource_name}}" - ], - "capabilities": {}, - "requirements": {}, - "deploymentArtifacts": {}, - "componentType": "RESOURCE", - "vendorName": "{{vendor_name}}", - "vendorRelease": "1.0", - "componentInstances": [], - "properties": [], - "attributes": [], - "groups": [], - "resourceType": "VF" -} diff --git a/tests/sdc-dcae-d/dcaed/assets/dcae_component_microservice.jinja b/tests/sdc-dcae-d/dcaed/assets/dcae_component_microservice.jinja new file mode 100644 index 00000000..a3661b36 --- /dev/null +++ b/tests/sdc-dcae-d/dcaed/assets/dcae_component_microservice.jinja @@ -0,0 +1,41 @@ +{ + "artifacts": {}, + "toscaArtifacts": {}, + "contactId": "cs0008", + "categories": [ + { + "name": "DCAE Component", + "normalizedName": "dcaecomponent", + "uniqueId": "resourceNewCategory.dcaecomponent", + "subcategories": [ + { + "name": "Microservice", + "normalizedName": "microservice", + "uniqueId": "resourceNewCategory.dcaecomponent.microservice", + "icons": [ + "dcae_microservice" + ] + } + ] + } + ], + "description": "virtual function", + "icon": "defaulticon", + "componentInstancesProperties": {}, + "componentInstancesAttributes": {}, + "name": "{{resource_name}}", + "tags": [ + "{{resource_name}}" + ], + "capabilities": {}, + "requirements": {}, + "deploymentArtifacts": {}, + "componentType": "RESOURCE", + "vendorName": "{{vendor_name}}", + "vendorRelease": "1.0", + "componentInstances": [], + "properties": [], + "attributes": [], + "groups": [], + "resourceType": "VF" +} -- cgit 1.2.3-korg