Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

15 files changed, 101 insertions, 82 deletions

diff --git a/common/src/test/resources/__files/aai/bulkprocess/test-request-small.json b/common/src/test/resources/__files/aai/bulkprocess/test-request-small.json
new file mode 100644
index 0000000000..973928108f
--- /dev/null
+++ b/common/src/test/resources/__files/aai/bulkprocess/test-request-small.json
@@ -0,0 +1,10 @@
+{
+  "transactions" : [ {
+    "put" : [ {
+      "uri" : "/network/generic-vnfs/generic-vnf/test1/relationship-list/relationship",
+      "body" : {
+        "related-link" : "/cloud-infrastructure/pservers/pserver/test2"
+      }
+    } ] 
+  } ] 
+}
\ No newline at end of file
diff --git a/common/src/test/resources/__files/aai/resources/e2e-complex.json b/common/src/test/resources/__files/aai/resources/e2e-complex.json
index 6fc9cb36e6..21bacbd5ce 100644
--- a/common/src/test/resources/__files/aai/resources/e2e-complex.json
+++ b/common/src/test/resources/__files/aai/resources/e2e-complex.json
@@ -24,7 +24,7 @@
                                 "relationship": [
                                     {
                                         "related-to": "vpls-pe",
-                                        "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vpls-pes/vpls-pe/sfcca301vr1",
+                                        "related-link": "https://localhost:8443/aai/v9/network/vpls-pes/vpls-pe/sfcca301vr1",
                                         "relationship-data": [
                                             {
                                                 "relationship-key": "vpls-pe.equipment-name",
@@ -48,7 +48,7 @@
                     "relationship": [
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/a9fec18e-1ea3-40e4-a6c0-a89b3de07053",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/a9fec18e-1ea3-40e4-a6c0-a89b3de07053",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -64,7 +64,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj104snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj104snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -79,7 +79,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj105snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj105snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -94,7 +94,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/compute_host",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/compute_host",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -109,7 +109,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj106snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj106snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -124,7 +124,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj126sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj126sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -139,7 +139,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/8ae1e5f8-61f1-4c71-913a-b40cc4593cb9",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/8ae1e5f8-61f1-4c71-913a-b40cc4593cb9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -155,7 +155,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102sta",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102sta",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -170,7 +170,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax102",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax102",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -185,7 +185,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj107snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj107snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -200,7 +200,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj118snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj118snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -215,7 +215,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj110snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj110snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -230,7 +230,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj109snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj109snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -245,7 +245,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj114snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj114snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -260,7 +260,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj119snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj119snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -275,7 +275,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj116snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj116snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -290,7 +290,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/a2935fa9-b743-49f4-9813-a127f13c4e93",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/a2935fa9-b743-49f4-9813-a127f13c4e93",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -306,7 +306,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj108snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj108snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -321,7 +321,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj123sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj123sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -336,7 +336,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -351,7 +351,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj102snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -366,7 +366,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax101",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnjtax101",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -381,7 +381,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj113snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj113snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -396,7 +396,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj111snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj111snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -411,7 +411,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj103snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj103snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -426,7 +426,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj117snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj117snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -441,7 +441,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101sta",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj101sta",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -456,7 +456,7 @@
                         },
                         {
                             "related-to": "vce",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/network/vces/vce/c7fe7698-8063-4e26-8bd3-ca3edde0b0d4",
+                            "related-link": "https://localhost:8443/aai/v9/network/vces/vce/c7fe7698-8063-4e26-8bd3-ca3edde0b0d4",
                             "relationship-data": [
                                 {
                                     "relationship-key": "vce.vnf-id",
@@ -472,7 +472,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj120snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj120snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -487,7 +487,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj124sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj124sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -502,7 +502,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj125sd9",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj125sd9",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -517,7 +517,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj112snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj112snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -532,7 +532,7 @@
                         },
                         {
                             "related-to": "pserver",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj115snd",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/pservers/pserver/mtcnj115snd",
                             "relationship-data": [
                                 {
                                     "relationship-key": "pserver.hostname",
@@ -547,7 +547,7 @@
                         },
                         {
                             "related-to": "cloud-region",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtcnj2",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtcnj2",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -567,7 +567,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/f9263cat-4eaa-43a0-bea4-adcf6e123456",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/f9263cat-4eaa-43a0-bea4-adcf6e123456",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -591,7 +591,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/b9263fab-4eaa-43a0-bea4-adcf6e999999",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/b9263fab-4eaa-43a0-bea4-adcf6e999999",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -615,7 +615,7 @@
                         },
                         {
                             "related-to": "oam-network",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/cf33dc95-c5d2-48fd-8078-fd949363f63b",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/oam-networks/oam-network/cf33dc95-c5d2-48fd-8078-fd949363f63b",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
@@ -639,7 +639,7 @@
                         },
                         {
                             "related-to": "availability-zone",
-                            "related-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/availability-zones/availability-zone/mtcnj-esx-az01",
+                            "related-link": "https://localhost:8443/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/availability-zones/availability-zone/mtcnj-esx-az01",
                             "relationship-data": [
                                 {
                                     "relationship-key": "cloud-region.cloud-owner",
diff --git a/common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json b/common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
index 6ec513e4bb..0fa9515820 100644
--- a/common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
+++ b/common/src/test/resources/__files/aai/resources/service-instance-pathed-query.json
@@ -2,7 +2,7 @@
   "results": [
     {
       "resource-type": "service-instance",
-      "resource-link": "https://aai-conexus-e2e.test.att.com:8443/aai/v9/business/customers/customer/key1/service-subscriptions/service-subscription/key2/service-instances/service-instance/key3"
+      "resource-link": "https://localhost:8443/aai/v9/business/customers/customer/key1/service-subscriptions/service-subscription/key2/service-instances/service-instance/key3"
     }
   ]
 }
\ No newline at end of file
diff --git a/common/src/test/resources/__files/grm/endpoints.json b/common/src/test/resources/__files/grm/endpoints.json
index 20947540b4..7e92c21c9e 100644
--- a/common/src/test/resources/__files/grm/endpoints.json
+++ b/common/src/test/resources/__files/grm/endpoints.json
@@ -7,7 +7,7 @@
             "minor": 0,
             "patch": "0"
          },
-         "hostAddress": "135.144.120.218",
+         "hostAddress": "192.168.120.218",
          "listenPort": "32004",
          "latitude": "37.7022",
          "longitude": "121.9358",
@@ -54,7 +54,7 @@
             "minor": 0,
             "patch": "0"
          },
-         "hostAddress": "135.144.120.22",
+         "hostAddress": "192.168.120.22",
          "listenPort": "32004",
          "latitude": "1.0",
          "longitude": "1.0",
@@ -101,7 +101,7 @@
             "minor": 0,
             "patch": "0"
          },
-         "hostAddress": "135.144.120.218",
+         "hostAddress": "192.168.120.218",
          "listenPort": "32002",
          "latitude": "1.0",
          "longitude": "1.0",
diff --git a/common/src/test/resources/dmaap.properties b/common/src/test/resources/dmaap.properties
index 8adb8e4976..7ce101996c 100644
--- a/common/src/test/resources/dmaap.properties
+++ b/common/src/test/resources/dmaap.properties
@@ -1,7 +1,7 @@
-sdno.health-check.dmaap.username=m04768@mso.ecomp.att.com
+sdno.health-check.dmaap.username=testuser
 sdno.health-check.dmaap.password=eHQ1cUJrOUc
 sdno.health-check.dmaap.subscriber.topic=com.att.sdno.test-health-diagnostic-v02
 sdno.health-check.dmaap.publisher.topic=com.att.sdno.test-health-diagnostic-v02
-ruby.create-ticket-request.dmaap.username=m04768@mso.ecomp.att.com
+ruby.create-ticket-request.dmaap.username=testuser
 ruby.create-ticket-request.dmaap.password=eHQ1cUJrOUc
 ruby.create-ticket-request.publisher.topic=com.att.pdas.st1.msoCMFallout-v1
\ No newline at end of file
diff --git a/common/src/test/resources/logback-test.xml b/common/src/test/resources/logback-test.xml
index b1888ac986..c4248bf985 100644
--- a/common/src/test/resources/logback-test.xml
+++ b/common/src/test/resources/logback-test.xml
@@ -21,6 +21,7 @@
 <configuration scan="false" debug="true">
   <!--<jmxConfigurator /> -->
   <!-- directory path for all other type logs -->
+
   <property name="logDir" value="./target" />
   
   <!-- directory path for debugging type logs -->
@@ -44,15 +45,8 @@
 
   <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
   <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
-  
-
-  <!-- Example evaluator filter applied against console appender -->
-  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>${defaultPattern}</pattern>
-    </encoder>
-  </appender>
 
+  <appender name="test" class="org.onap.so.utils.TestAppender"/>
   <!-- ============================================================================ -->
   <!-- EELF Appenders -->
   <!-- ============================================================================ -->
@@ -148,24 +142,35 @@
     <includeCallerData>true</includeCallerData>
   </appender>
  
-  
+  	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] |%X{RequestId}| %-5level
+				%logger{1024} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
+	
   <!-- ============================================================================ -->
   <!--  EELF loggers -->
   <!-- ============================================================================ -->
 
-  <logger name="com.att.eelf.audit" level="info" additivity="false">
-    <appender-ref ref="asyncEELFAudit" />
+  <logger name="com.att.eelf.audit" level="${so.log.level:-DEBUG}" additivity="false">
+    <appender-ref ref="asyncEELFAudit" /> 
   </logger>
   
-  <logger name="com.att.eelf.metrics" level="info" additivity="false">
-        <appender-ref ref="asyncEELFMetrics" />
+  <logger name="METRIC" level="${so.log.level:-DEBUG}" additivity="true">
+    <appender-ref ref="asyncEELFMetrics" />
+    <appender-ref ref="test" />
   </logger>
 
-  <logger name="com.att.eelf.error" level="debug" additivity="false">
+  <logger name="com.att.eelf.error" level="${so.log.level:-DEBUG}" additivity="false">
     <appender-ref ref="asyncEELFError" />
-  </logger> 
-  <root level="INFO">
+  </logger>
+  
+  <root level="${so.log.level:-DEBUG}">
     <appender-ref ref="asyncEELFDebug" />
+    <appender-ref ref="STDOUT" />
   </root>
 
-</configuration>
+
+</configuration>
\ No newline at end of file
diff --git a/common/src/test/resources/mso-bad.json b/common/src/test/resources/mso-bad.json
index 57b271459e..1aaea50042 100644
--- a/common/src/test/resources/mso-bad.json
+++ b/common/src/test/resources/mso-bad.json
@@ -1,20 +1,20 @@
 {
-  "asdc-connections":{,
-    "asdc-controller1":{
-        "asdcUser": "user1",
-        "asdcConsumerGroup": "consumer1",
-        "asdcConsumerId": "consumer1",
-        "asdcEnvironmentName": "PROD",
-        "asdcAddress": "localhost:8443",
-        "asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
-    },
-    "asdc-controller2":{
-        "asdcUser": "user2",
-        "asdcConsumerGroup": "consumer2",
-        "asdcConsumerId": "consumer2",
-        "asdcEnvironmentName": "E2E",
-        "asdcAddress": "localhost:8443",
-        "asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
-    }
-  }
-}
+	"asdc-connections": {
+		"asdc-controller1": {
+			"asdcUser": "user1",
+			"asdcConsumerGroup": "consumer1",
+			"asdcConsumerId": "consumer1",
+			"asdcEnvironmentName": "PROD",
+			"asdcAddress": "localhost:8443",
+			"asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
+		},
+		"asdc-controller2": {
+			"asdcUser": "user2",
+			"asdcConsumerGroup": "consumer2",
+			"asdcConsumerId": "consumer2",
+			"asdcEnvironmentName": "E2E",
+			"asdcAddress": "localhost:8443",
+			"asdcPassword": "1c551b8b5ab91fcd5a0907b11c304199"
+		}
+	}
+}
\ No newline at end of file
diff --git a/common/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json b/common/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
index e388d3e9ad..e388d3e9ad 100644
--- a/common/src/test/resources/org/openecomp/mso/client/ruby/create-ticket/create-ticket-request.json
+++ b/common/src/test/resources/org/onap/so/client/ruby/create-ticket/create-ticket-request.json
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
index 8c3ca1938d..2c46b5a8cb 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-post-check-request.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-post-check-request.json
@@ -7,6 +7,7 @@
 				"request-id": "test-request-id",
 				"health-diagnostic-code": "VROUTER000004",
 				"operation-type": "lport_mirroring_check",
+				"send-detailed-cmd-response": "false",
 				"aai-param-list": [
 					{
 						"key": "configuration-id",
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
index 08220abe2d..bf168b0028 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-lport-mirror-pre-check-request.json
@@ -7,6 +7,7 @@
 				"request-id": "test-request-id",
 				"health-diagnostic-code": "VROUTER000003",
 				"operation-type": "lport_mirroring_check",
+				"send-detailed-cmd-response": "false",
 				"aai-param-list": [
 					{
 						"key": "configuration-id",
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
index 834fcc8e72..89e505e7d0 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-post-check-request.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-post-check-request.json
@@ -7,6 +7,7 @@
 				"request-id": "test-request-id",
 				"health-diagnostic-code": "VROUTER000004",
 				"operation-type": "mirroring_check",
+				"send-detailed-cmd-response": "false",
 				"aai-param-list": [
 					{
 						"key": "configuration-id",
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
index 19d934d291..86897c8a1f 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/health-check/custom-port-mirror-pre-check-request.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/health-check/custom-port-mirror-pre-check-request.json
@@ -7,6 +7,7 @@
 				"request-id": "test-request-id",
 				"health-diagnostic-code": "VROUTER000003",
 				"operation-type": "mirroring_check",
+				"send-detailed-cmd-response": "false",
 				"aai-param-list": [
 					{
 						"key": "configuration-id",
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json b/common/src/test/resources/org/onap/so/client/sdno/output-failure.json
index 15160b9dd9..8cf0a820cd 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/output-failure.json
+++ b/common/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/common/src/test/resources/org/openecomp/mso/client/sdno/output-success.json b/common/src/test/resources/org/onap/so/client/sdno/output-success.json
index a6794327d8..a6794327d8 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/output-success.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/output-success.json
diff --git a/common/src/test/resources/org/openecomp/mso/client/sdno/response.json b/common/src/test/resources/org/onap/so/client/sdno/response.json
index 2355e86938..2355e86938 100644
--- a/common/src/test/resources/org/openecomp/mso/client/sdno/response.json
+++ b/common/src/test/resources/org/onap/so/client/sdno/response.json