Merge "Merge remote-tracking branch 'origin/dublin' into 'origin/master'"

16 files changed, 1018 insertions, 895 deletions

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