From e923c507e85a91c908b24ca0e5eff1022d66d9d0 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Wed, 17 Apr 2019 09:31:48 +0200 Subject: fixing backEnd local workflow type Change-Id: Ifd6f0718135d38135f57496e4f816e48324cfb7d Issue-ID: VID-401 Signed-off-by: Bartosz Gardziejewski --- vid-app-common/src/main/java/org/onap/vid/model/SOWorkflows.kt | 4 ++-- .../java/org/onap/vid/services/LocalWorkflowsServiceImpl.java | 8 ++++---- .../changeManagement/mso_invoke_workflow01.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vid-app-common/src/main/java/org/onap/vid/model/SOWorkflows.kt b/vid-app-common/src/main/java/org/onap/vid/model/SOWorkflows.kt index 00cc7b943..ea13a76a2 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/SOWorkflows.kt +++ b/vid-app-common/src/main/java/org/onap/vid/model/SOWorkflows.kt @@ -46,12 +46,12 @@ data class SOWorkflows @JvmOverloads constructor( enum class SOWorkflowType( val type: String) { - STRING("STRING") + text("text") } enum class LocalWorkflowType( val type: String) { - STRING("STRING"), + text("text"), FILE("FILE") } diff --git a/vid-app-common/src/main/java/org/onap/vid/services/LocalWorkflowsServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/LocalWorkflowsServiceImpl.java index 733d275d8..39d433d6a 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/LocalWorkflowsServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/LocalWorkflowsServiceImpl.java @@ -33,14 +33,14 @@ public class LocalWorkflowsServiceImpl implements LocalWorkflowsService { Map WORKFLOWS_WITH_PARAMETERS = ImmutableMap.builder() .put("VNF Scale Out", new LocalWorkflowParameterDefinitions( ImmutableList.of( - new LocalWorkflowParameterDefinition(1, "Configuration Parameters", true, LocalWorkflowType.STRING,".*") + new LocalWorkflowParameterDefinition(1, "Configuration Parameters", true, LocalWorkflowType.text,".*") ) )) .put("VNF In Place Software Update", new LocalWorkflowParameterDefinitions( ImmutableList.of( - new LocalWorkflowParameterDefinition(2, "Operations timeout",true, LocalWorkflowType.STRING,"[0-9]+"), - new LocalWorkflowParameterDefinition(3, "Existing software version", true, LocalWorkflowType.STRING, "[-a-zA-Z0-9.]+"), - new LocalWorkflowParameterDefinition(4, "New software version", true, LocalWorkflowType.STRING, "[-a-zA-Z0-9.]+") + new LocalWorkflowParameterDefinition(2, "Operations timeout",true, LocalWorkflowType.text,"[0-9]+"), + new LocalWorkflowParameterDefinition(3, "Existing software version", true, LocalWorkflowType.text, "[-a-zA-Z0-9.]+"), + new LocalWorkflowParameterDefinition(4, "New software version", true, LocalWorkflowType.text, "[-a-zA-Z0-9.]+") ) )) .put("VNF Config Update", new LocalWorkflowParameterDefinitions( diff --git a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_invoke_workflow01.json b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_invoke_workflow01.json index afbfde207..b49cb413f 100644 --- a/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_invoke_workflow01.json +++ b/vid-ext-services-simulator/src/main/resources/preset_registration/changeManagement/mso_invoke_workflow01.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method" : "POST", - "path" : "/onap/so/infra/instanceManagement/v1/serviceInstances/[a-fA-F0-9-]*/vnfs/[a-fA-F0-9-]*/workflows/[a-fA-F0-9-]*", + "path" : "/instanceManagement/v1/serviceInstances/[a-fA-F0-9-]*/vnfs/[a-fA-F0-9-]*/workflows/[a-fA-F0-9-]*", "body" : { "requestDetails": { "cloudConfiguration": { -- cgit 1.2.3-korg