From 5082ac877cab66770e1cce651e49d634c77e8057 Mon Sep 17 00:00:00 2001 From: mojahidi Date: Fri, 7 Sep 2018 11:07:49 +0530 Subject: Interface operation support for service - BDD Added flow test for Interface operation support for service Change-Id: I0f4ed8fbc6c124b63ff167cbeaf0921c544b5b79 Issue-ID: SDC-1739 Signed-off-by: mojahidi --- .../resources/json/operation/createOperation.json | 22 +---- .../operation/createOperationWithInputOutput.json | 29 ++++++ .../resources/json/operation/createService.json | 102 +++++++++++++++++++++ .../resources/json/operation/createVF.json | 101 ++++++++++++++++++++ .../json/operation/createVF_From_Catalog.json | 70 -------------- .../resources/json/operation/updateOperation.json | 17 +++- 6 files changed, 249 insertions(+), 92 deletions(-) create mode 100644 openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json create mode 100644 openecomp-bdd/resources/json/operation/createService.json create mode 100644 openecomp-bdd/resources/json/operation/createVF.json delete mode 100644 openecomp-bdd/resources/json/operation/createVF_From_Catalog.json (limited to 'openecomp-bdd/resources') diff --git a/openecomp-bdd/resources/json/operation/createOperation.json b/openecomp-bdd/resources/json/operation/createOperation.json index 5d494402e5..10c34ba8f2 100644 --- a/openecomp-bdd/resources/json/operation/createOperation.json +++ b/openecomp-bdd/resources/json/operation/createOperation.json @@ -1,30 +1,14 @@ { "interfaceOperations": { - "create": { + "operation": { "description": "abcd description", "inputParams": { - "listToscaDataDefinition": [ - { - "paramName": "sd", - "paramId": "67c72959-0a05-4436-9339-534aa44c9fd0.nf_naming" - }, - { - "paramName": "sdf", - "paramId": "67c72959-0a05-4436-9339-534aa44c9fd0.nf_naming_code" - } - ] }, "outputParams": { - "listToscaDataDefinition": [ - { - "paramName": "op1", - "paramId": "68443b9d-9405-458e-811f-b62dd4975fcb.nf_naming" - } - ] }, "operationType": "create", - "workflowId" : "w_id1", - "workflowVersionId" : "w_version_id11" + "workflowId" : null, + "workflowVersionId" : null } } } \ No newline at end of file diff --git a/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json b/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json new file mode 100644 index 0000000000..013d615999 --- /dev/null +++ b/openecomp-bdd/resources/json/operation/createOperationWithInputOutput.json @@ -0,0 +1,29 @@ +{ + "interfaceOperations": { + "operation": { + "description": "abcd description", + "inputParams": { + "listToscaDataDefinition": [ + { + "name": "inp1", + "type": "string", + "property": "97477d27-8fe2-45a1-83cb-83368ef2a402.nf_naming_code", + "mandatory": true + } + ] + }, + "outputParams": { + "listToscaDataDefinition": [ + { + "name": "op", + "mandatory": true, + "type": "String" + } + ] + }, + "operationType": "create", + "workflowId" : null, + "workflowVersionId" : null + } + } +} \ No newline at end of file diff --git a/openecomp-bdd/resources/json/operation/createService.json b/openecomp-bdd/resources/json/operation/createService.json new file mode 100644 index 0000000000..e7afe2aa21 --- /dev/null +++ b/openecomp-bdd/resources/json/operation/createService.json @@ -0,0 +1,102 @@ +{ + "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": "service1 for bdd", + "icon": "defaulticon", + "componentInstancesProperties": { + + }, + "componentInstancesAttributes": { + + }, + "name": "service1", + "tags": [ + "service1" + ], + "capabilities": { + + }, + "requirements": { + + }, + "deploymentArtifacts": { + + }, + "componentType": "SERVICE", + "projectCode": "010203", + "componentInstances": [ + + ], + "properties": [ + + ], + + "inputs": [ + { + "uniqueId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4.test1_dasddas", + "type": "scalar-unit.size", + "required": false, + "definition": false, + "schema": { + "properties": { + + }, + "property": { + "type": "", + "required": false, + "definition": true, + "password": false, + "hidden": false, + "immutable": false, + "getInputProperty": false, + "empty": false + }, + "empty": false + }, + "password": false, + "name": "test1_dasddas", + "hidden": false, + "immutable": false, + "instanceUniqueId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4", + "propertyId": "03eeb10e-cf2a-41b8-9d8e-d2dbd094f9d4.dasddas", + "parentUniqueId": "cs0008", + "schemaType": "", + "getInputProperty": false, + "ownerId": "cs0008", + "empty": false + } + ], + + "attributes": [ + + ], + "forwardingPaths": { + + }, + "ecompGeneratedNaming": true, + "serviceApiArtifacts": { + + }, + "instantiationType": "A-la-carte", + "environmentContext": "General_Revenue-Bearing" +} \ No newline at end of file diff --git a/openecomp-bdd/resources/json/operation/createVF.json b/openecomp-bdd/resources/json/operation/createVF.json new file mode 100644 index 0000000000..6fe9688caa --- /dev/null +++ b/openecomp-bdd/resources/json/operation/createVF.json @@ -0,0 +1,101 @@ +{ + "artifacts": { + + }, + "toscaArtifacts": { + + }, + "contactId": "cs0008", + "categories": [ + { + "name": "Allotted Resource", + "normalizedName": "allotted resource", + "uniqueId": "resourceNewCategory.allotted resource", + "icons": null, + "subcategories": [ + { + "name": "Tunnel XConnect", + "normalizedName": "tunnel xconnect", + "uniqueId": "resourceNewCategory.allotted resource.tunnel xconnect", + "icons": [ + "tunnel_x_connect" + ], + "groupings": null, + "ownerId": null, + "empty": false + } + ], + "ownerId": null, + "empty": false + } + ], + "description": "sd", + "icon": "defaulticon", + "componentInstancesProperties": { + + }, + "componentInstancesAttributes": { + + }, + "name": "REPLACE", + "tags": [ + "REPLACE" + ], + "capabilities": { + + }, + "requirements": { + + }, + "deploymentArtifacts": { + + }, + "componentType": "RESOURCE", + "vendorName": "vendor", + "vendorRelease": "vendor release", + "componentInstances": [ + + ], + "inputs": [{ + "uniqueId": "abcdef", + "type": "org.openecomp.datatypes.Naming", + "required": false, + "definition": false, + "defaultValue": null, + "description": null, + "schema": null, + "password": false, + "name": "abcdef", + "value": null, + "label": null, + "hidden": false, + "immutable": false, + "inputPath": null, + "status": null, + "inputId": null, + "instanceUniqueId": null, + "propertyId": null, + "annotations": null, + "parentUniqueId": "abcd", + "getInputValues": null, + "constraints": null, + "inputs": null, + "properties": null, + "getInputProperty": false, + "schemaType": null, + "schemaProperty": null, + "version": null, + "ownerId": null, + "empty": false + } ], + "properties": [ + + ], + "attributes": [ + + ], + "groups": [ + + ], + "resourceType": "VF" +} \ No newline at end of file diff --git a/openecomp-bdd/resources/json/operation/createVF_From_Catalog.json b/openecomp-bdd/resources/json/operation/createVF_From_Catalog.json deleted file mode 100644 index 7dcafc63c1..0000000000 --- a/openecomp-bdd/resources/json/operation/createVF_From_Catalog.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "artifacts": { - - }, - "toscaArtifacts": { - - }, - "contactId": "cs0008", - "categories": [ - { - "name": "Allotted Resource", - "normalizedName": "allotted resource", - "uniqueId": "resourceNewCategory.allotted resource", - "icons": null, - "subcategories": [ - { - "name": "Tunnel XConnect", - "normalizedName": "tunnel xconnect", - "uniqueId": "resourceNewCategory.allotted resource.tunnel xconnect", - "icons": [ - "tunnel_x_connect" - ], - "groupings": null, - "ownerId": null, - "empty": false - } - ], - "ownerId": null, - "empty": false - } - ], - "description": "sd", - "icon": "defaulticon", - "componentInstancesProperties": { - - }, - "componentInstancesAttributes": { - - }, - "name": "REPLACE", - "tags": [ - "REPLACE" - ], - "capabilities": { - - }, - "requirements": { - - }, - "deploymentArtifacts": { - - }, - "componentType": "RESOURCE", - "vendorName": "vendor", - "vendorRelease": "vendor release", - "componentInstances": [ - - ], - "inputs": [ ], - "properties": [ - - ], - "attributes": [ - - ], - "groups": [ - - ], - "resourceType": "VF" -} \ No newline at end of file diff --git a/openecomp-bdd/resources/json/operation/updateOperation.json b/openecomp-bdd/resources/json/operation/updateOperation.json index b74262f9f4..698d38c612 100644 --- a/openecomp-bdd/resources/json/operation/updateOperation.json +++ b/openecomp-bdd/resources/json/operation/updateOperation.json @@ -1,12 +1,23 @@ { "interfaceOperations": { - "create": { + "operation": { "description": "create operation_Updated", "inputParams": { "listToscaDataDefinition": [ { - "paramName": "inp1", - "paramId": "REPLACE FROM CONTEXT" + "name": "inp1", + "type": "string", + "property": "97477d27-8fe2-45a1-83cb-83368ef2a402.nf_naming_code", + "mandatory": true + } + ] + }, + "outputParams": { + "listToscaDataDefinition": [ + { + "name": "op", + "mandatory": true, + "type": "String" } ] }, -- cgit 1.2.3-korg