9 files changed, 93 insertions, 72 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json
new file mode 100644
index 0000000000..e9172c5ba0
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/avpn/dmaap/avpnDmaapAsyncRequestStatus.json
@@ -0,0 +1,21 @@
+{
+  "asyncRequestStatus" : {
+    "requestId" : "rq1234d1-5a33-55df-13ab-12abad84e331",
+    "clientSource" : "SPP",
+    "correlator" : "myClientId123",
+    "instanceReferences" : {
+      "serviceInstanceId" : "bc305d54-75b4-431b-adb2-eb6b9e546014"
+    },
+    "startTime" : "2017-11-17T09:30:47Z",
+    "finishTime" : "2017-11-17T09:30:47Z",
+    "requestScope" : "service",
+    "requestType" : "createInstance",
+    "requestStatus" : {
+      "timestamp" : "2017-11-17T09:30:47Z",
+      "requestState" : "COMPLETE",
+      "statusMessage" : "Success",
+      "percentProgress" : "100",
+      "wasRolledBack" : true
+    }
+  }
+}
+\ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
index e388d3e9ad..e388d3e9ad 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
index b9ad7a1f94..8c3ca1938d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
@@ -1,26 +1,26 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000004",
-				"operation-type": "lport_mirroring_check",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					},
-					{
-						"key": "interface-id",
-						"value": "test-interface-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000004",
+				"operation-type": "lport_mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					},
+					{
+						"key": "interface-id",
+						"value": "test-interface-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
 \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
index ee28da86b9..08220abe2d 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
@@ -1,26 +1,26 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000003",
-				"operation-type": "lport_mirroring_check",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					},
-					{
-						"key": "interface-id",
-						"value": "test-interface-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000003",
+				"operation-type": "lport_mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					},
+					{
+						"key": "interface-id",
+						"value": "test-interface-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
 \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
index 95746ec3f9..834fcc8e72 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
@@ -1,22 +1,22 @@
-{
-	"body": {
-		"input": {
-			"request-hd-custom": {
-				"request-client-name": "MSO",
-				"request-user-id": "test-user",
-				"request-id": "test-request-id",
-				"health-diagnostic-code": "VROUTER000004",
-				"operation-type": "mirroring_check",
-				"aai-param-list": [
-					{
-						"key": "configuration-id",
-						"value": "test-configuration-id"
-					}
-				]
-			}
-		}
-	},
-	"operation": "health-diagnostic-custom",
-	"nodeLoc": "test-clli",
-	"nodeType": "VROUTER"
+{
+	"body": {
+		"input": {
+			"request-hd-custom": {
+				"request-client-name": "MSO",
+				"request-user-id": "test-user",
+				"request-id": "test-request-id",
+				"health-diagnostic-code": "VROUTER000004",
+				"operation-type": "mirroring_check",
+				"aai-param-list": [
+					{
+						"key": "configuration-id",
+						"value": "test-configuration-id"
+					}
+				]
+			}
+		}
+	},
+	"operation": "health-diagnostic-custom",
+	"nodeLoc": "test-clli",
+	"nodeType": "VROUTER"
 }
 \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
index 19d934d291..19d934d291 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-failure.json
index 15160b9dd9..8cf0a820cd 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-failure.json
@@ -8,7 +8,7 @@
 				"response-id": "191bf423-8473-4f7c-9fbb-e5dcbb40a12b",
 				"remote_end_time": "2017-10-13T14:51:53.490+0000",
 				"response-client-name": "MSO",
-				"user_id": "md5621",
+				"user_id": "xxxxxx",
 				"remote_start_time": "2017-10-13T14:51:53.173+0000",
 				"error-message": "my error message",
 				"connection-failure-msg": "SDNO was unable to connect to an Ansible REST API server; Please ensure Ansible REST server is running"
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-success.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-success.json
index a6794327d8..a6794327d8 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/output-success.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/output-success.json
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/response.json b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/response.json
index 2355e86938..2355e86938 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/org/openecomp/mso/client/sdno/response.json
+++ b/bpmn/MSOCommonBPMN/src/test/resources/org/onap/so/client/sdno/response.json