From b734ea21ac7be393c59cf9976f0e5ddeaf27d568 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Thu, 22 Nov 2018 13:37:31 +0530 Subject: Service Workflow changes Service workflow change with few bug fixes Change-Id: Ice2376565bf46fb8d86fb6062654ec54bb2daa43 Issue-ID: SDC-1937 Signed-off-by: siddharth0905 --- .../TestResourceInterfaceOperation.feature | 2 +- .../TestServiceInterfaceOperation.feature | 2 +- .../operation/createOperation-with-workflow.json | 30 +++++++++++++++ .../stepDefinitions/InterfaceOperationSteps.js | 45 ++++++++++++++-------- 4 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 openecomp-bdd/resources/json/operation/createOperation-with-workflow.json (limited to 'openecomp-bdd') diff --git a/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature b/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature index 9f3cd5490f..ed09f2fb20 100644 --- a/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature +++ b/openecomp-bdd/features/InterfaceOperation/TestResourceInterfaceOperation.feature @@ -7,7 +7,7 @@ Feature: Interface Operation Feature #Create Operations When I want to create an Operation Then I want to check property "uniqueId" exists - And I want to create an Operation + And I want to create an Operation with workflow Then I want to check property "uniqueId" exists And I want to create an Operation Then I want to check property "uniqueId" exists diff --git a/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature b/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature index 1ad2377e1b..1ff0ba3f1b 100644 --- a/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature +++ b/openecomp-bdd/features/InterfaceOperation/TestServiceInterfaceOperation.feature @@ -7,7 +7,7 @@ Feature: Interface Operation Feature #Create Operations When I want to create an Operation Then I want to check property "uniqueId" exists - And I want to create an Operation + And I want to create an Operation with workflow Then I want to check property "uniqueId" exists And I want to create an Operation Then I want to check property "uniqueId" exists diff --git a/openecomp-bdd/resources/json/operation/createOperation-with-workflow.json b/openecomp-bdd/resources/json/operation/createOperation-with-workflow.json new file mode 100644 index 0000000000..e9693adf2a --- /dev/null +++ b/openecomp-bdd/resources/json/operation/createOperation-with-workflow.json @@ -0,0 +1,30 @@ +{ + "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", + "workflowAssociationType": "EXISTING", + "workflowId" : "workflowId", + "workflowVersionId" : "workflowVersionId" + } + } +} \ No newline at end of file diff --git a/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js b/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js index f4a81d6110..408db9e9f8 100644 --- a/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js +++ b/openecomp-bdd/stepDefinitions/InterfaceOperationSteps.js @@ -26,7 +26,7 @@ When('I want to create a VF', function() { var type = "resources"; let path = '/catalog/' + type; - return util.request(this.context, 'POST', path, inputData, false, 'vf').then(result => { + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then(result => { this.context.component = {uniqueId : result.data.uniqueId, type : type, id : result.data.inputs[0].uniqueId}; }); }); @@ -39,7 +39,7 @@ When('I want to create a Service', function() { var type = "services"; let path = '/catalog/' + type; - return util.request(this.context, 'POST', path, inputData, false, 'vf').then(result => { + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then(result => { this.context.component = {uniqueId : result.data.uniqueId, type : type, id : result.data.inputs[0].uniqueId}; }); }); @@ -64,33 +64,48 @@ When('I want to create an Operation with input output', function() { inputData.interfaceOperations.operation.operationType = makeType(); inputData.interfaceOperations.operation.description = makeType(); - return util.request(this.context, 'POST', path, inputData, false, 'vf').then(result => { - this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then(result => { + this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; }); }); - When('I want to create an Operation', function() { let path = '/catalog/' + this.context.component.type + '/' + this.context.component.uniqueId + '/interfaceOperations'; - let inputData = util.getJSONFromFile('resources/json/operation/createOperation.json'); + let inputData = util.getJSONFromFile('resources/json/operation/createOperation.json'); inputData.interfaceOperations.operation.operationType = makeType(); inputData.interfaceOperations.operation.description = makeType(); - return util.request(this.context, 'POST', path, inputData, false, 'vf').then(result => { + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then(result => { this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; }); }); +When('I want to create an Operation with workflow', function() { + let path = '/catalog/' + this.context.component.type + '/' + this.context.component.uniqueId + '/interfaceOperations'; + let inputData = util.getJSONFromFile('resources/json/operation/createOperation-with-workflow.json'); + + inputData.interfaceOperations.operation.inputParams.listToscaDataDefinition[0].name = util.random(); + inputData.interfaceOperations.operation.inputParams.listToscaDataDefinition[0].property = this.context.component.id; + inputData.interfaceOperations.operation.outputParams.listToscaDataDefinition[0].name = util.random(); + inputData.interfaceOperations.operation.operationType = makeType(); + inputData.interfaceOperations.operation.description = makeType(); + inputData.interfaceOperations.operation.workflowId = makeType(); + inputData.interfaceOperations.operation.workflowVersionId = makeType(); + + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then(result => { + this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; +}); +}); When('I want to list Operations', function () { let path = '/catalog/'+ this.context.component.type + '/' + this.context.component.uniqueId + '/filteredDataByParams?include=interfaces'; - return util.request(this.context, 'GET', path, null, false, 'vf').then((result)=> { + return util.request(this.context, 'GET', path, null, false, 'catalog').then((result)=> { }); }); When('I want to get an Operation by Id', function () { let path = '/catalog/'+ this.context.component.type + '/' + this.context.component.uniqueId + '/interfaceOperations/' + this.context.operation.uniqueId; - return util.request(this.context, 'GET', path, null, false, 'vf').then((result)=> { + return util.request(this.context, 'GET', path, null, false, 'catalog').then((result)=> { this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; }); }); @@ -103,7 +118,7 @@ When('I want to update an Operation', function () { inputData.interfaceOperations.operation.inputParams.listToscaDataDefinition[0].name = util.random(); inputData.interfaceOperations.operation.inputParams.listToscaDataDefinition[0].property = this.context.component.id; inputData.interfaceOperations.operation.outputParams.listToscaDataDefinition[0].name = util.random(); - return util.request(this.context, 'PUT', path, inputData, false, 'vf').then((result)=> { + return util.request(this.context, 'PUT', path, inputData, false, 'catalog').then((result)=> { this.context.operation = {uniqueId : result.data.uniqueId, operationType : result.data.operationType}; }); }); @@ -111,14 +126,14 @@ When('I want to update an Operation', function () { When('I want to delete an Operation', function() { let path = '/catalog/'+ this.context.component.type + '/'+ this.context.component.uniqueId +'/interfaceOperations/' + this.context.operation.uniqueId; - return util.request(this.context, 'DELETE', path, null, false, 'vf'); + return util.request(this.context, 'DELETE', path, null, false, 'catalog'); }); When('I want to checkin this component', function () { let path = '/catalog/'+ this.context.component.type + '/' + this.context.component.uniqueId + '/lifecycleState/CHECKIN' ; let inputData = {userRemarks: 'checkin'}; - return util.request(this.context, 'POST', path, inputData, false, 'vf').then((result)=> { + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then((result)=> { this.context.component = {uniqueId : result.data.uniqueId, type : this.context.component.type}; }); }); @@ -127,15 +142,15 @@ When('I want to checkin this component', function () { Then('I want to submit this component', function () { let path = '/catalog/'+ this.context.component.type + '/' + this.context.component.uniqueId + '/lifecycleState/certificationRequest' ; let inputData = {userRemarks: 'submit'}; - return util.request(this.context, 'POST', path, inputData, false, 'vf').then((result)=> { - this.context.vf = {uniqueId : result.data.uniqueId}; + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then((result)=> { + this.context.component = {uniqueId : result.data.uniqueId}; }); }); Then('I want to certify this component', function () { let path = '/catalog/'+ this.context.component.type +'/' + this.context.component.uniqueId + '/lifecycleState/certify' ; let inputData = {userRemarks: 'certify'}; - return util.request(this.context, 'POST', path, inputData, false, 'vf').then((result)=> { + return util.request(this.context, 'POST', path, inputData, false, 'catalog').then((result)=> { this.context.component = {uniqueId : result.data.uniqueId}; }); }); \ No newline at end of file -- cgit 1.2.3-korg