aboutsummaryrefslogtreecommitdiffstats
path: root/mso-api-handlers/mso-api-handler-infra/src
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-06-05 16:24:37 -0400
committerSmokowski, Steve (ss835w) <ss835w@us.att.com>2019-06-06 11:26:38 -0400
commit560e84158798cb884de65e3cf33ab657f0e6e6df (patch)
tree83a5aedb750eed64fcff623742bebc63a2a07161 /mso-api-handlers/mso-api-handler-infra/src
parent5f4c4f3f3215eb136f9c4f84f51dc8fcd5fe0353 (diff)
parent59eff996497691e0fc82b627dcda306e861655b3 (diff)
Merge remote-tracking branch 'origin/dublin' into 'origin/master'
Change-Id: I551ea3f29a76dc99532455ea4d7e84a316f9bf38 Issue-ID: SO-1980 Signed-off-by: Smokowski, Steve (ss835w) <ss835w@us.att.com>
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src')
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java2
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java15
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml4
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java71
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence1_Response.json20
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence2_Response.json20
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence3_Response.json20
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters1_Response.json103
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters2_Response.json103
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters3_Response.json103
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters1_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters2_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters3_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters4_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters5_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters6_Response.json13
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowActivitySpecSequence_Response.json480
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecifications.json17
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecificationsQuery_Response.json966
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/workflow_Response.json3
20 files changed, 1105 insertions, 900 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
index c1f55c7555..c582e429ff 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/InstanceManagement.java
@@ -253,7 +253,7 @@ public class InstanceManagement {
if (workflow == null) {
return null;
} else {
- String workflowName = workflow.getArtifactName();
+ String workflowName = workflow.getName();
recipeUri = "/mso/async/services/" + workflowName;
}
return new RecipeLookupResult(recipeUri, 180);
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
index c480bdfbd3..bba8064f7c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java
@@ -50,6 +50,8 @@ import org.onap.so.db.catalog.beans.WorkflowActivitySpecSequence;
import org.onap.so.db.catalog.client.CatalogDbClient;
import org.onap.so.logger.ErrorCode;
import org.onap.so.logger.MessageEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.JsonProcessingException;
@@ -69,7 +71,9 @@ public class WorkflowSpecificationsHandler {
@Autowired
private CatalogDbClient catalogDbClient;
+ private static Logger logger = LoggerFactory.getLogger(WorkflowSpecificationsHandler.class);
private static final String ARTIFACT_TYPE_WORKFLOW = "workflow";
+ private static final String NATIVE_WORKFLOW = "native";
@Path("/{version:[vV]1}/workflows")
@GET
@@ -85,6 +89,12 @@ public class WorkflowSpecificationsHandler {
mapper1.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
List<Workflow> workflows = catalogDbClient.findWorkflowByModelUUID(vnfModelVersionId);
+
+ List<Workflow> nativeWorkflows = catalogDbClient.findWorkflowBySource(NATIVE_WORKFLOW);
+ if (nativeWorkflows != null && nativeWorkflows.size() != 0) {
+ workflows.addAll(nativeWorkflows);
+ }
+
WorkflowSpecifications workflowSpecifications = mapWorkflowsToWorkflowSpecifications(workflows);
String jsonResponse = null;
@@ -153,6 +163,7 @@ public class WorkflowSpecificationsHandler {
if (activitySpec != null) {
ActivitySequence activitySequence = new ActivitySequence();
activitySequence.setName(activitySpec.getName());
+ logger.debug("Adding activity: " + activitySpec.getName());
activitySequence.setDescription(activitySpec.getDescription());
activitySequences.add(activitySequence);
}
@@ -164,7 +175,7 @@ public class WorkflowSpecificationsHandler {
private List<WorkflowInputParameter> buildWorkflowInputParameters(Workflow workflow) {
List<WorkflowActivitySpecSequence> workflowActivitySpecSequences = workflow.getWorkflowActivitySpecSequence();
if (workflowActivitySpecSequences == null || workflowActivitySpecSequences.size() == 0) {
- return null;
+ return new ArrayList<WorkflowInputParameter>();
}
Map<String, WorkflowInputParameter> workflowInputParameterMap = new HashMap<String, WorkflowInputParameter>();
for (WorkflowActivitySpecSequence workflowActivitySpecSequence : workflowActivitySpecSequences) {
@@ -188,7 +199,7 @@ public class WorkflowSpecificationsHandler {
}
if (workflowInputParameterMap.size() == 0) {
- return null;
+ return new ArrayList<WorkflowInputParameter>();
}
List<WorkflowInputParameter> workflowInputParameterList =
workflowInputParameterMap.values().stream().collect(Collectors.toList());
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
index e709758223..03934edf20 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
@@ -7,7 +7,7 @@ server:
mso:
infra:
- auditInventory: true
+ auditInventory: false
default:
versions:
apiMinorVersion: 0
@@ -70,4 +70,4 @@ org:
so:
adapters:
network:
- encryptionKey: aa3871669d893c7fb8abbcda31b88b4f \ No newline at end of file
+ encryptionKey: aa3871669d893c7fb8abbcda31b88b4f
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java
index 48abeacbc5..0beab1bd13 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java
@@ -87,6 +87,66 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest {
.withBody(getWiremockResponseForCatalogdb("WorkflowActivitySpecSequence_Response.json"))
.withStatus(org.apache.http.HttpStatus.SC_OK)));
+ wireMockServer.stubFor(get(urlMatching("/workflowActivitySpecSequence/1/activitySpec"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecSequence1_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/workflowActivitySpecSequence/2/activitySpec"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecSequence2_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/workflowActivitySpecSequence/3/activitySpec"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecSequence3_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpec/1/activitySpecUserParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecUserParameters1_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpec/2/activitySpecUserParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecUserParameters2_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpec/3/activitySpecUserParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("ActivitySpecUserParameters3_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/1/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters1_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/2/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters2_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/3/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters3_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/4/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters4_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/5/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters5_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
+ wireMockServer.stubFor(get(urlMatching("/activitySpecUserParameters/6/userParameters"))
+ .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
+ .withBody(getWiremockResponseForCatalogdb("UserParameters6_Response.json"))
+ .withStatus(org.apache.http.HttpStatus.SC_OK)));
+
UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(createURLWithPort(basePath))
.queryParam("vnfModelVersionId", "b5fa707a-f55a-11e7-a796-005056856d52");
@@ -237,6 +297,17 @@ public class WorkflowSpecificationsHandlerTest extends BaseTest {
workflow.setWorkflowActivitySpecSequence(workflowActivitySpecSequences);
workflows.add(workflow);
+ Workflow workflowNative = new Workflow();
+ workflowNative.setArtifactUUID("da6478e4-ea33-3346-ac12-ab121284a333");
+ workflowNative.setArtifactName("VnfInPlaceUpdate.bpmn");
+ workflowNative.setVersion(1.0);
+ workflowNative.setDescription("native workflow");
+ workflowNative.setName("VnfInPlaceUpdate");
+ workflowNative.setOperationName("inPlaceSoftwareUpdate");
+ workflowNative.setSource("native");
+ workflowNative.setResourceTarget("vnf");
+ workflows.add(workflowNative);
+
WorkflowSpecifications workflowSpecifications =
workflowSpecificationsHandler.mapWorkflowsToWorkflowSpecifications(workflows);
ObjectMapper mapper = new ObjectMapper();
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence1_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence1_Response.json
new file mode 100644
index 0000000000..37e32631fb
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence1_Response.json
@@ -0,0 +1,20 @@
+{
+ "name": "VNFQuiesceTrafficActivity",
+ "description": "Activity to QuiesceTraffic on VNF",
+ "version": null,
+ "created": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecActivitySpecParameters": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpec/1"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/activitySpec/1"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpec/1/activitySpecUserParameters"
+ }
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence2_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence2_Response.json
new file mode 100644
index 0000000000..ee2a02ba33
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence2_Response.json
@@ -0,0 +1,20 @@
+{
+ "name": "VNFHealthCheckActivity",
+ "description": "Activity to HealthCheck VNF",
+ "version": null,
+ "created": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecActivitySpecParameters": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpec/2"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/activitySpec/2"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpec/2/activitySpecUserParameters"
+ }
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence3_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence3_Response.json
new file mode 100644
index 0000000000..69390eea6b
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecSequence3_Response.json
@@ -0,0 +1,20 @@
+{
+ "name": "FlowCompleteActivity",
+ "description": "Activity to Complete the BPMN Flow",
+ "version": null,
+ "created": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecActivitySpecParameters": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpec/3"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/activitySpec/3"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpec/3/activitySpecUserParameters"
+ }
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters1_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters1_Response.json
new file mode 100644
index 0000000000..e88691b4d8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters1_Response.json
@@ -0,0 +1,103 @@
+{
+ "_embedded": {
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": 1,
+ "userParametersId": 1,
+ "activitySpec": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 2,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 3,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 4,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 5,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 6,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6/userParameters"
+ }
+ }
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters2_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters2_Response.json
new file mode 100644
index 0000000000..e88691b4d8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters2_Response.json
@@ -0,0 +1,103 @@
+{
+ "_embedded": {
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": 1,
+ "userParametersId": 1,
+ "activitySpec": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 2,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 3,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 4,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 5,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 6,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6/userParameters"
+ }
+ }
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters3_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters3_Response.json
new file mode 100644
index 0000000000..e88691b4d8
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/ActivitySpecUserParameters3_Response.json
@@ -0,0 +1,103 @@
+{
+ "_embedded": {
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": 1,
+ "userParametersId": 1,
+ "activitySpec": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/1/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 2,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/2/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 3,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/3/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 4,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/4/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 5,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/5/userParameters"
+ }
+ }
+ },
+ {
+ "activitySpecId": 1,
+ "userParametersId": 6,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "activitySpecUserParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6"
+ },
+ "userParameters": {
+ "href": "http://localhost:8090/activitySpecUserParameters/6/userParameters"
+ }
+ }
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters1_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters1_Response.json
new file mode 100644
index 0000000000..017add4cd5
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters1_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "operations_timeout",
+ "payloadLocation": "userParams",
+ "label": "Operations Timeout",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters2_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters2_Response.json
new file mode 100644
index 0000000000..655d659c16
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters2_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "existing_software_version",
+ "payloadLocation": "userParams",
+ "label": "Existing Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters3_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters3_Response.json
new file mode 100644
index 0000000000..13e02e7dd6
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters3_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "cloudOwner",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Owner",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters4_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters4_Response.json
new file mode 100644
index 0000000000..e30ec0da88
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters4_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "tenantId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Tenant/Project ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 36,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters5_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters5_Response.json
new file mode 100644
index 0000000000..98b18522da
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters5_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "new_software_version",
+ "payloadLocation": "userParams",
+ "label": "New Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters6_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters6_Response.json
new file mode 100644
index 0000000000..4d8d03b6a7
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/UserParameters6_Response.json
@@ -0,0 +1,13 @@
+{
+ "name": "lcpCloudRegionId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Region ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowActivitySpecSequence_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowActivitySpecSequence_Response.json
index 3192865b52..3df17380d6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowActivitySpecSequence_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowActivitySpecSequence_Response.json
@@ -1,432 +1,54 @@
{
"_embedded": {
-
- "workflowActivitySpecSequence": [
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "VNFQuiesceTrafficActivity",
- "description": "Activity to QuiesceTraffic on VNF",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
-
- },
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "VNFHealthCheckActivity",
- "description": "Activity to HealthCheck VNF",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
- },
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "FlowCompleteActivity",
- "description": "Activity to Complete the BPMN Flow",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
- }
- ]
-
-}
+ "workflowActivitySpecSequence": [
+ {
+ "activitySpecId": 1,
+ "workflowId": 1,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence//1/workflowActivitySpecSequence"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/1/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/1/activitySpec"
+ }
+ }
+ },
+ {
+ "activitySpecId": 2,
+ "workflowId": 1,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/2/workflowActivitySpecSequence"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/2/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/2/activitySpec"
+ }
+ }
+ },
+ {
+ "activitySpecId": 3,
+ "workflowId": 1,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/3"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/3/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflowActivitySpecSequence/3/activitySpec"
+ }
+ }
+ }
+ ]
+ }
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecifications.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecifications.json
index 5556c602be..59bc12d92d 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecifications.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecifications.json
@@ -108,6 +108,23 @@
}
]
}
+ },
+ {
+ "workflowSpecification": {
+
+ "artifactInfo": {
+ "artifactType": "workflow",
+ "artifactUuid": "da6478e4-ea33-3346-ac12-ab121284a333",
+ "artifactName": "VnfInPlaceUpdate.bpmn",
+ "artifactVersion": "1.0",
+ "artifactDescription": "native workflow",
+ "workflowName": "VnfInPlaceUpdate",
+ "operationName": "inPlaceSoftwareUpdate",
+ "workflowSource": "native",
+ "workflowResourceTarget": "vnf"
+ },
+ "workflowInputParameters": []
+ }
}
]
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecificationsQuery_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecificationsQuery_Response.json
index c12365649e..8919dbbf2c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecificationsQuery_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/WorkflowSpecificationsQuery_Response.json
@@ -1,468 +1,504 @@
{
"_embedded": {
- "workflows" :[
- {
- "artifactUUID": "ab6478e4-ea33-3346-ac12-ab121484a333",
- "artifactName": "inPlaceSoftwareUpdate-1_0.bpmn",
- "name": "inPlaceSoftwareUpdate",
- "operationName": "inPlaceSoftwareUpdate",
- "version": 1,
- "description": "xyz xyz",
- "body": null,
- "resourceTarget": "vnf",
- "source": "sdc",
- "timeoutMinutes": null,
- "artifactChecksum": null,
- "created": null,
- "vnfResourceWorkflow": null,
- "workflowActivitySpecSequence": [
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "VNFQuiesceTrafficActivity",
- "description": "Activity to QuiesceTraffic on VNF",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID[?]vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
-
- },
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "VNFHealthCheckActivity",
- "description": "Activity to HealthCheck VNF",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
- },
- {
- "activitySpecId": null,
- "workflowId": null,
- "activitySpec": {
- "name": "FlowCompleteActivity",
- "description": "Activity to Complete the BPMN Flow",
- "version": null,
- "created": null,
- "workflowActivitySpecSequence": null,
- "activitySpecActivitySpecCategories": null,
- "activitySpecUserParameters": [
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "operations_timeout",
- "payloadLocation": "userParams",
- "label": "Operations Timeout",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "existing_software_version",
- "payloadLocation": "userParams",
- "label": "Existing Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "cloudOwner",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Owner",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "tenantId",
- "payloadLocation": "cloudConfiguration",
- "label": "Tenant/Project ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 36,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "new_software_version",
- "payloadLocation": "userParams",
- "label": "New Software Version",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 50,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- },
- {
- "activitySpecId": null,
- "userParametersId": null,
- "activitySpec": null,
- "userParameters": {
- "name": "lcpCloudRegionId",
- "payloadLocation": "cloudConfiguration",
- "label": "Cloud Region ID",
- "type": "text",
- "description": null,
- "isRequried": true,
- "maxLength": 7,
- "allowableChars": "someRegEx",
- "created": null,
- "activitySpecUserParameters": null,
- "id": null
- },
- "id": null
- }
- ],
- "activitySpecActivitySpecParameters": null,
- "id": null
- },
- "workflow": null,
- "id": null,
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
- }
- ],
- "id": null,
-
- "_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/1/workflowActivitySpecSequence"
- }
-
- }
-
- }
-]
-},
-"_links": {
- "self": {
- "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
- },
- "workflowActivitySpecSequence": {
- "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
- }
-
- }
+ "workflows": [
+ {
+ "artifactUUID": "ab6478e4-ea33-3346-ac12-ab121484a333",
+ "artifactName": "inPlaceSoftwareUpdate-1_0.bpmn",
+ "name": "inPlaceSoftwareUpdate",
+ "operationName": "inPlaceSoftwareUpdate",
+ "version": 1,
+ "description": "xyz xyz",
+ "body": null,
+ "resourceTarget": "vnf",
+ "source": "sdc",
+ "timeoutMinutes": null,
+ "artifactChecksum": null,
+ "created": null,
+ "vnfResourceWorkflow": null,
+ "workflowActivitySpecSequence": [
+ {
+ "activitySpecId": null,
+ "workflowId": null,
+ "activitySpec": {
+ "name": "VNFQuiesceTrafficActivity",
+ "description": "Activity to QuiesceTraffic on VNF",
+ "version": null,
+ "created": null,
+ "workflowActivitySpecSequence": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "operations_timeout",
+ "payloadLocation": "userParams",
+ "label": "Operations Timeout",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "existing_software_version",
+ "payloadLocation": "userParams",
+ "label": "Existing Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "cloudOwner",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Owner",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "tenantId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Tenant/Project ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 36,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "new_software_version",
+ "payloadLocation": "userParams",
+ "label": "New Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "lcpCloudRegionId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Region ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ }
+ ],
+ "activitySpecActivitySpecParameters": null,
+ "id": null
+ },
+ "workflow": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID[?]vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
+ },
+ {
+ "activitySpecId": null,
+ "workflowId": null,
+ "activitySpec": {
+ "name": "VNFHealthCheckActivity",
+ "description": "Activity to HealthCheck VNF",
+ "version": null,
+ "created": null,
+ "workflowActivitySpecSequence": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "operations_timeout",
+ "payloadLocation": "userParams",
+ "label": "Operations Timeout",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "existing_software_version",
+ "payloadLocation": "userParams",
+ "label": "Existing Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "cloudOwner",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Owner",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "tenantId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Tenant/Project ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 36,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "new_software_version",
+ "payloadLocation": "userParams",
+ "label": "New Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "lcpCloudRegionId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Region ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ }
+ ],
+ "activitySpecActivitySpecParameters": null,
+ "id": null
+ },
+ "workflow": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
+ },
+ {
+ "activitySpecId": null,
+ "workflowId": null,
+ "activitySpec": {
+ "name": "FlowCompleteActivity",
+ "description": "Activity to Complete the BPMN Flow",
+ "version": null,
+ "created": null,
+ "workflowActivitySpecSequence": null,
+ "activitySpecActivitySpecCategories": null,
+ "activitySpecUserParameters": [
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "operations_timeout",
+ "payloadLocation": "userParams",
+ "label": "Operations Timeout",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "existing_software_version",
+ "payloadLocation": "userParams",
+ "label": "Existing Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "cloudOwner",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Owner",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "tenantId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Tenant/Project ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 36,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "new_software_version",
+ "payloadLocation": "userParams",
+ "label": "New Software Version",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 50,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ },
+ {
+ "activitySpecId": null,
+ "userParametersId": null,
+ "activitySpec": null,
+ "userParameters": {
+ "name": "lcpCloudRegionId",
+ "payloadLocation": "cloudConfiguration",
+ "label": "Cloud Region ID",
+ "type": "text",
+ "description": null,
+ "isRequried": true,
+ "maxLength": 7,
+ "allowableChars": "someRegEx",
+ "created": null,
+ "activitySpecUserParameters": null,
+ "id": null
+ },
+ "id": null
+ }
+ ],
+ "activitySpecActivitySpecParameters": null,
+ "id": null
+ },
+ "workflow": null,
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
+ }
+ ],
+ "id": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/1/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
+ },
+ {
+ "artifactUUID": "da6478e4-ea33-3346-ac12-ab121284a333",
+ "artifactName": "VnfInPlaceUpdate.bpmn",
+ "name": "VnfInPlaceUpdate",
+ "operationName": "inPlaceSoftwareUpdate",
+ "version": 1,
+ "description": "native workflow",
+ "body": null,
+ "resourceTarget": "vnf",
+ "source": "native",
+ "timeoutMinutes": null,
+ "artifactChecksum": null,
+ "created": null,
+ "vnfResourceWorkflow": null,
+ "workflowActivitySpecSequence": [],
+ "id": null,
+ "workflow": null,
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflows/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
+ }
+ ]
+ },
+ "_links": {
+ "self": {
+ "href": "http://localhost:8090/workflow/search/findWorkflowByModelUUID?vnfResourceModelUUID=b5fa707a-f55a-11e7-a796-005056856d52"
+ },
+ "workflowActivitySpecSequence": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/workflowActivitySpecSequence"
+ },
+ "activitySpec": {
+ "href": "http://localhost:8090/workflow/b5fa707a-f55a-11e7-a796-005056856d52/activitySpec"
+ }
+ }
} \ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/workflow_Response.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/workflow_Response.json
index 6e358f7e17..d6ed585537 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/workflow_Response.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/__files/catalogdb/workflow_Response.json
@@ -1,4 +1,5 @@
{
"artifactUUID": "71526781-e55c-4cb7-adb3-97e09d9c76be",
- "artifactName": "testingWorkflow"
+ "artifactName": "testingWorkflow.bpmn",
+ "name": "testingWorkflow"
} \ No newline at end of file