Platform Hardening for DG - Part 8

Issue-ID: APPC-305 Change-Id: I70fa76837b02314bdd3211190306cfbd3564d639 Signed-off-by: Skip Wonnell <skip@att.com>
author: Skip Wonnell <skip@att.com> 2017-12-23 00:18:18 -0600
committer: Patrick Brady <pb071s@att.com> 2018-01-03 18:57:22 +0000
commit: caa5768a32a385bf7997029929f29fe3b156348e (patch)
tree: 15e5671b75577de5cd19473eea278c3f731d9e7a /appc-directed-graph
parent: e7752e8d2dd4e4460bf68a7b36548282cc68d0e9 (diff)
105 files changed, 3116 insertions, 2991 deletions
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/.gitignore b/appc-directed-graph/appc-dgraph/provider/src/main/resources/.gitignore
new file mode 100644
index 000000000..a9fe5db96
--- /dev/null
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/.gitignore
@@ -0,0 +1 @@
+xml
diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
index 971c7bfaa..02abdcb6c 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_setInputParams.json
@@ -1,67 +1,67 @@
 [
     {
-        "id": "7fca76b4.17223",
+        "id": "a6983c0.b9a8cc8",
         "type": "execute",
         "name": "execute saveTxLog",
         "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"log\" />\n<parameter name=\"message\" value=\"SetInputData action complete\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 291.6111373901367,
-        "y": 975.9444494247437,
-        "z": "29005224.e84c46",
+        "x": 355.6111373901367,
+        "y": 938.9444494247437,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "29ad6619.56be1a"
+                "10afeb0c.c7ae15"
             ]
         ]
     },
     {
-        "id": "29ad6619.56be1a",
+        "id": "10afeb0c.c7ae15",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 544.3611488342285,
-        "y": 978.8610963821411,
-        "z": "29005224.e84c46",
+        "x": 608.3611488342285,
+        "y": 941.8610963821411,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "487dbd4.fae6244"
+                "293004e3.f67484"
             ]
         ]
     },
     {
-        "id": "487dbd4.fae6244",
+        "id": "293004e3.f67484",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 762.6944465637207,
-        "y": 979.3611373901367,
-        "z": "29005224.e84c46",
+        "x": 826.6944465637207,
+        "y": 942.3611373901367,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d57f2a5b.6d9878",
+        "id": "3ffbfc03.c0cdcc",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 76,
-        "y": 100,
-        "z": "29005224.e84c46",
+        "x": 140,
+        "y": 63,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "eb65f1a6.67a2a8"
+                "a329045c.8f7118"
             ]
         ]
     },
     {
-        "id": "eb65f1a6.67a2a8",
+        "id": "a329045c.8f7118",
         "type": "service-logic",
         "name": "APPC 4.0.0",
         "module": "APPC",
@@ -69,1287 +69,1287 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='APPC' version='4.0.0'>",
         "outputs": 1,
-        "x": 229.8730125427246,
-        "y": 104.27777767181396,
-        "z": "29005224.e84c46",
+        "x": 293.8730125427246,
+        "y": 67.27777767181396,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "464bc66a.d400f"
+                "692d2daf.32ec64"
             ]
         ]
     },
     {
-        "id": "464bc66a.d400f",
+        "id": "692d2daf.32ec64",
         "type": "method",
         "name": "method setInputParams",
         "xml": "<method rpc='setInputParams' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 474.28175354003906,
-        "y": 104.33333110809326,
-        "z": "29005224.e84c46",
+        "x": 538.2817535400391,
+        "y": 67.33333110809326,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "76f327ef.78a5d"
+                "73f179e5.1f6b08"
             ]
         ]
     },
     {
-        "id": "76f327ef.78a5d",
+        "id": "73f179e5.1f6b08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 125.82540893554688,
-        "y": 192.7301435470581,
-        "z": "29005224.e84c46",
+        "x": 189.82540893554688,
+        "y": 155.7301435470581,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "7fca76b4.17223",
-                "ec38a1b5.f9fb78",
-                "f86b33c2.af5458",
-                "c6d02f55.f61f5",
-                "6b012bde.6f80a4",
-                "5cf8e6f0.d42f4",
-                "a24f31b2.4d18e",
-                "8d34313a.627aa8",
-                "990a0e31.6e0e5",
-                "895d6244.5f7778",
-                "a3f0b036.b07238",
-                "7b2f5687.8079a8",
-                "71fa2664.4d59f",
-                "1b1c550c.87631b"
+                "a6983c0.b9a8cc8",
+                "5108defa.2a8ad8",
+                "76e6a902.aa9f7",
+                "4e956b25.7384bc",
+                "917e8d75.36ed5",
+                "3272c506.7a2902",
+                "661b6930.9d8a7",
+                "7cd9ea4c.168d0c",
+                "b9a27f92.7134f",
+                "3abcb846.d4e0c8",
+                "34649294.8eafee",
+                "862c4ef9.c1b13",
+                "84b11aeb.34d5c",
+                "90827e69.15871"
             ]
         ]
     },
     {
-        "id": "ec38a1b5.f9fb78",
+        "id": "5108defa.2a8ad8",
         "type": "set",
         "name": "set params based on Dispatcher Input",
         "xml": "<set>\n<parameter name='vnf-id' value='`$input.action-identifiers.vnf-id`' /> \n<parameter name='service-instance-id' value='`$input.action-identifiers.service-instance-id`' />\n<parameter name='vserver-id' value='`$input.action-identifiers.vserver-id`' />\n<parameter name='vf-module-id' value='`$input.action-identifiers.vf-module-id`' />\n<parameter name='vnfc-name' value='`$input.action-identifiers.vnfc-name`' />\n\n<parameter name='request-id' value='`$input.common-header.request-id`' />\n<parameter name='originator-id' value='`$input.common-header.originator-id`' /> \n\n<parameter name='payload' value='`$input.payload`' /> \n<parameter name='api-ver' value='`$input.api-ver`' /> \n<parameter name='request-action' value='`$input.action`' />\n",
         "comments": "",
-        "x": 699.055534362793,
-        "y": 145.4166612625122,
-        "z": "29005224.e84c46",
+        "x": 763.055534362793,
+        "y": 108.4166612625122,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "6b012bde.6f80a4",
+        "id": "917e8d75.36ed5",
         "type": "execute",
         "name": "execute Convert payload to DG Context ",
         "xml": "<execute plugin=\"org.onap.sdnc.config.generator.convert.ConvertNode\" method=\"convertJson2DGContext\">\n<parameter name=\"jsonData\" value=\"`$input.payload`\" />\n<parameter name=\"isEscaped\" value=\"N\" />\n<parameter name=\"blockKeys\" value=\"configuration-parameters,configuration.configuration-string,configuration.configuration-json\" />\n<parameter name=\"responsePrefix\" value=\"tmp.convertnode\" />",
         "comments": "",
         "outputs": 1,
-        "x": 497.77784729003906,
-        "y": 261.83332920074463,
-        "z": "29005224.e84c46",
+        "x": 561.7778472900391,
+        "y": 224.83332920074463,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "995b69b3.150398",
-                "fe8257e4.b88f08"
+                "c0d21781.3af488",
+                "f04d3989.465d28"
             ]
         ]
     },
     {
-        "id": "995b69b3.150398",
+        "id": "c0d21781.3af488",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 820.583366394043,
-        "y": 234.91666889190674,
-        "z": "29005224.e84c46",
+        "x": 884.583366394043,
+        "y": 197.91666889190674,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "89a3cd6a.29c028"
+                "6ddaaca2.d95fd4"
             ]
         ]
     },
     {
-        "id": "fe8257e4.b88f08",
+        "id": "f04d3989.465d28",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 823.2778167724609,
-        "y": 281.30555057525635,
-        "z": "29005224.e84c46",
+        "x": 887.2778167724609,
+        "y": 244.30555057525635,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "83571f1f.4fec7"
+                "bc6e8091.072088"
             ]
         ]
     },
     {
-        "id": "89a3cd6a.29c028",
+        "id": "6ddaaca2.d95fd4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1020.9444732666016,
-        "y": 235.27777767181396,
-        "z": "29005224.e84c46",
+        "x": 1084.9444732666016,
+        "y": 198.27777767181396,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3f186ad8.9acc1e"
+                "7cf9d173.b8ee1"
             ]
         ]
     },
     {
-        "id": "83571f1f.4fec7",
+        "id": "bc6e8091.072088",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1015.1944732666016,
-        "y": 283.2777786254883,
-        "z": "29005224.e84c46",
+        "x": 1079.1944732666016,
+        "y": 246.27777862548828,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "ab91d54a.f38b58"
+                "75da26bd.d800d8"
             ]
         ]
     },
     {
-        "id": "3f186ad8.9acc1e",
+        "id": "7cf9d173.b8ee1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.convertnode.error-message`\"/>\n\t\n\t",
         "comments": "",
-        "x": 1205.6944770812988,
-        "y": 235.52777767181396,
-        "z": "29005224.e84c46",
+        "x": 1269.6944770812988,
+        "y": 198.52777767181396,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "ab91d54a.f38b58",
+        "id": "75da26bd.d800d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to process input parameters\"/>\n\t",
         "comments": "",
-        "x": 1208.4444770812988,
-        "y": 285.0277795791626,
-        "z": "29005224.e84c46",
+        "x": 1272.4444770812988,
+        "y": 248.0277795791626,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "c6d02f55.f61f5",
+        "id": "4e956b25.7384bc",
         "type": "execute",
         "name": "execute saveTxLog",
         "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"saveConfigTransactionLog\">\n<parameter name=\"messageType\" value=\"request\" />\n<parameter name=\"message\" value=\"`$tmp.message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 534.6944580078125,
-        "y": 216.52777767181396,
-        "z": "29005224.e84c46",
+        "x": 598.6944580078125,
+        "y": 179.52777767181396,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "72fb1a20.ab554c"
+                "b7c3d8ef.324be8"
             ]
         ]
     },
     {
-        "id": "f86b33c2.af5458",
+        "id": "76e6a902.aa9f7",
         "type": "set",
         "name": "set tmp.message",
         "xml": "<set>\n<parameter name=\"tmp.message\" value=\"`$vnf-id + ' : ' + $request-action +  ': ' + $payload`\" />\n",
         "comments": "",
-        "x": 632.6389083862305,
-        "y": 178.66666889190674,
-        "z": "29005224.e84c46",
+        "x": 696.6389083862305,
+        "y": 141.66666889190674,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "72fb1a20.ab554c",
+        "id": "b7c3d8ef.324be8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 941.444450378418,
-        "y": 173.02777576446533,
-        "z": "29005224.e84c46",
+        "x": 1005.444450378418,
+        "y": 136.02777576446533,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "9f45e4b6.47b0b"
+                "c0877f7c.433918"
             ]
         ]
     },
     {
-        "id": "9f45e4b6.47b0b",
+        "id": "c0877f7c.433918",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1098.444450378418,
-        "y": 170.02777576446533,
-        "z": "29005224.e84c46",
+        "x": 1162.444450378418,
+        "y": 133.02777576446533,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b1c550c.87631b",
+        "id": "90827e69.15871",
         "type": "call",
         "name": "call: GetAaiInfo",
         "xml": "<call module=\"APPC\" rpc=\"GetAaiInfo\" mode=\"sync\">",
         "comments": "",
         "outputs": 1,
-        "x": 376.25,
-        "y": 617.361083984375,
-        "z": "29005224.e84c46",
+        "x": 440.25,
+        "y": 580.361083984375,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "d2fb9e84.53c39",
-                "53eaaf46.77b328"
+                "941b6e71.d3bf98",
+                "b7e619af.e003f8"
             ]
         ]
     },
     {
-        "id": "d2fb9e84.53c39",
+        "id": "941b6e71.d3bf98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 883.9166259765625,
-        "y": 652.9444580078125,
-        "z": "29005224.e84c46",
+        "x": 947.9166259765625,
+        "y": 615.9444580078125,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3cf17bd2.dc0954"
+                "366c9e2f.c3f70a"
             ]
         ]
     },
     {
-        "id": "3cf17bd2.dc0954",
+        "id": "366c9e2f.c3f70a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1065.861083984375,
-        "y": 662.6111450195312,
-        "z": "29005224.e84c46",
+        "x": 1129.861083984375,
+        "y": 625.6111450195312,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "a9218921.0e075"
+                "d5f3fe20.d4e54"
             ]
         ]
     },
     {
-        "id": "a9218921.0e075",
+        "id": "d5f3fe20.d4e54",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t",
         "comments": "",
-        "x": 1242.2777099609375,
-        "y": 657.111083984375,
-        "z": "29005224.e84c46",
+        "x": 1306.2777099609375,
+        "y": 620.111083984375,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "53eaaf46.77b328",
+        "id": "b7e619af.e003f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905.8056640625,
-        "y": 691.47216796875,
-        "z": "29005224.e84c46",
+        "x": 969.8056640625,
+        "y": 654.47216796875,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3cf17bd2.dc0954"
+                "366c9e2f.c3f70a"
             ]
         ]
     },
     {
-        "id": "5cf8e6f0.d42f4",
+        "id": "3272c506.7a2902",
         "type": "switchNode",
         "name": "switch isTemplateDriven.TEMPLATE",
         "xml": "<switch test='`$isTemplateDriven.TEMPLATE`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 382.6111145019531,
-        "y": 889.6111135482788,
-        "z": "29005224.e84c46",
+        "x": 446.6111145019531,
+        "y": 852.6111135482788,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "9d2cedd4.ab474",
-                "717d950.608c96c"
+                "a149144e.2149b",
+                "ee4d19a0.8de3b"
             ]
         ]
     },
     {
-        "id": "9d2cedd4.ab474",
+        "id": "a149144e.2149b",
         "type": "success",
         "name": "outcome: Y",
         "xml": "<outcome value=\"Y\">",
         "comments": "",
         "outputs": 1,
-        "x": 717.5357551574707,
-        "y": 859.5912027359009,
-        "z": "29005224.e84c46",
+        "x": 781.5357551574707,
+        "y": 822.5912027359009,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "d3749fed.e9b82"
+                "6b326a9f.993a9c"
             ]
         ]
     },
     {
-        "id": "717d950.608c96c",
+        "id": "ee4d19a0.8de3b",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 719.2738723754883,
-        "y": 917.7341413497925,
-        "z": "29005224.e84c46",
+        "x": 783.2738723754883,
+        "y": 880.7341413497925,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "626c366b.12ab4"
+                "4c3ddc8e.54b74c"
             ]
         ]
     },
     {
-        "id": "d3749fed.e9b82",
+        "id": "6b326a9f.993a9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 953.1627159118652,
-        "y": 865.8571519851685,
-        "z": "29005224.e84c46",
+        "x": 1017.1627159118652,
+        "y": 828.8571519851685,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "55166856.7789c8"
+                "2d3403df.ff424c"
             ]
         ]
     },
     {
-        "id": "626c366b.12ab4",
+        "id": "4c3ddc8e.54b74c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 983.2500839233398,
-        "y": 916.8056125640869,
-        "z": "29005224.e84c46",
+        "x": 1047.2500839233398,
+        "y": 879.8056125640869,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "55166856.7789c8",
+        "id": "2d3403df.ff424c",
         "type": "call",
         "name": "call: loadTeamplate",
         "xml": "<call module=\"APPC\" rpc=\"loadTeamplate\" mode=\"sync\">",
         "comments": "",
         "outputs": 1,
-        "x": 1156.750087738037,
-        "y": 865.8888502120972,
-        "z": "29005224.e84c46",
+        "x": 1220.750087738037,
+        "y": 828.8888502120972,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "eaef706.395761",
-                "c27756eb.b56cc"
+                "39b38f81.4e51",
+                "f09f87cb.4d24e8"
             ]
         ]
     },
     {
-        "id": "eaef706.395761",
+        "id": "39b38f81.4e51",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1325.9167594909668,
-        "y": 835.6389303207397,
-        "z": "29005224.e84c46",
+        "x": 1389.9167594909668,
+        "y": 798.6389303207397,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "41181dc0.443dd4"
+                "ff287b56.aa7eb8"
             ]
         ]
     },
     {
-        "id": "d0dd485b.2ad268",
+        "id": "fb45ee23.6fbab",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to load Template Information\"/>\n",
         "comments": "",
-        "x": 1719.7501068115234,
-        "y": 831.3055753707886,
-        "z": "29005224.e84c46",
+        "x": 1783.7501068115234,
+        "y": 794.3055753707886,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "41181dc0.443dd4",
+        "id": "ff287b56.aa7eb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n\n",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1502.9167251586914,
-        "y": 833.5555562973022,
-        "z": "29005224.e84c46",
+        "x": 1566.9167251586914,
+        "y": 796.5555562973022,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "d0dd485b.2ad268"
+                "fb45ee23.6fbab"
             ]
         ]
     },
     {
-        "id": "c27756eb.b56cc",
+        "id": "f09f87cb.4d24e8",
         "type": "failure",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1316.8333854675293,
-        "y": 948.2222166061401,
-        "z": "29005224.e84c46",
+        "x": 1380.8333854675293,
+        "y": 911.2222166061401,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3d62ad4c.6bdfba"
+                "5342721e.cb7a8c"
             ]
         ]
     },
     {
-        "id": "a24f31b2.4d18e",
+        "id": "661b6930.9d8a7",
         "type": "get-resource",
         "name": "get-resource: APPC.action-level",
         "xml": "<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT ACTION_LEVEL\n\t     FROM ACTION_LEVEL_REFERENCE\n         WHERE ACTION_IDENTIFIER = $action-identifier ;\"\n    force='true'\n\tpfx='APPC.action-level'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 435.1944580078125,
-        "y": 551.1944704055786,
-        "z": "29005224.e84c46",
+        "x": 499.1944580078125,
+        "y": 514.1944704055786,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "95b0c195.da7348",
-                "19e50c10.9c277c"
+                "be3e5499.fb065",
+                "fed29c92.eb62e8"
             ]
         ]
     },
     {
-        "id": "732257e6.5f321",
+        "id": "c9908b57.c91ad8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 894.9444580078125,
-        "y": 555.5277709960938,
-        "z": "29005224.e84c46",
+        "x": 958.9444580078125,
+        "y": 518.5277709960938,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "95b0c195.da7348",
+        "id": "be3e5499.fb065",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 710.361083984375,
-        "y": 554.1388549804688,
-        "z": "29005224.e84c46",
+        "x": 774.361083984375,
+        "y": 517.1388549804688,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "732257e6.5f321"
+                "c9908b57.c91ad8"
             ]
         ]
     },
     {
-        "id": "3d62ad4c.6bdfba",
+        "id": "5342721e.cb7a8c",
         "type": "call",
         "name": "call: MergeTemplateData",
         "xml": "<call module=\"APPC\" rpc=\"MergeTemplateData\" mode=\"sync\">",
         "comments": "",
         "outputs": 1,
-        "x": 1498.111099243164,
-        "y": 945.0277814865112,
-        "z": "29005224.e84c46",
+        "x": 1562.111099243164,
+        "y": 908.0277814865112,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "432b7e5d.93983",
-                "a0f71151.dc82a8"
+                "88c6cf75.06383",
+                "574e06cd.5864a8"
             ]
         ]
     },
     {
-        "id": "da151a8e.03b298",
+        "id": "4aae662b.d4c588",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 1891.6230392456055,
-        "y": 904.599232673645,
-        "z": "29005224.e84c46",
+        "x": 1955.6230392456055,
+        "y": 867.599232673645,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "e176531c.3b90b"
+                "5d233c99.db03ac"
             ]
         ]
     },
     {
-        "id": "432b7e5d.93983",
+        "id": "88c6cf75.06383",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1732.2658920288086,
-        "y": 905.3015851974487,
-        "z": "29005224.e84c46",
+        "x": 1796.2658920288086,
+        "y": 868.3015851974487,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "da151a8e.03b298"
+                "4aae662b.d4c588"
             ]
         ]
     },
     {
-        "id": "a0f71151.dc82a8",
+        "id": "574e06cd.5864a8",
         "type": "failure",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735.932559967041,
-        "y": 971.7301757335663,
-        "z": "29005224.e84c46",
+        "x": 1799.932559967041,
+        "y": 934.7301757335663,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "adcb7f0e.8d7018"
+                "3b5c490.997b9b8"
             ]
         ]
     },
     {
-        "id": "adcb7f0e.8d7018",
+        "id": "3b5c490.997b9b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1900.2182922363281,
-        "y": 971.3015871047974,
-        "z": "29005224.e84c46",
+        "x": 1964.2182922363281,
+        "y": 934.3015871047974,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "a8d7e1f2.7f37b"
+                "12cf0bf5.fe2074"
             ]
         ]
     },
     {
-        "id": "a8d7e1f2.7f37b",
+        "id": "12cf0bf5.fe2074",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$request-action`\"/>\n<parameter name=\"field3\" value=\"`$input.action`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2076.7897911071777,
-        "y": 972.9206256270409,
-        "z": "29005224.e84c46",
+        "x": 2140.7897911071777,
+        "y": 935.9206256270409,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "835d681f.fd9e78",
+        "id": "76526333.e0f49c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to Merge Template and Data Information\"/>\n",
         "comments": "",
-        "x": 2272.6112098693848,
-        "y": 901.5277814865112,
-        "z": "29005224.e84c46",
+        "x": 2336.6112098693848,
+        "y": 864.5277814865112,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "e176531c.3b90b",
+        "id": "5d233c99.db03ac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n\n",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2084.527786254883,
-        "y": 902.9444065093994,
-        "z": "29005224.e84c46",
+        "x": 2148.527786254883,
+        "y": 865.9444065093994,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "835d681f.fd9e78"
+                "76526333.e0f49c"
             ]
         ]
     },
     {
-        "id": "8d34313a.627aa8",
+        "id": "7cd9ea4c.168d0c",
         "type": "get-resource",
         "name": "get-resource: isTemplateDriven",
         "xml": "<get-resource\n\tplugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' \n\tresource='SQL'\n\tkey=\"SELECT TEMPLATE\n\t     FROM PROTOCOL_REFERENCE\n         WHERE ACTION = $input.action and VNF_TYPE = $vnf-type and ACTION_LEVEL= $action-level ;\"\n    force='true'\n\tpfx='isTemplateDriven'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 383.7777862548828,
-        "y": 827.1110906600952,
-        "z": "29005224.e84c46",
+        "x": 447.7777862548828,
+        "y": 790.1110906600952,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "e991d954.17bb88"
+                "7fd8557b.08d05c"
             ]
         ]
     },
     {
-        "id": "f9b86e0d.f41458",
+        "id": "caac6856.1e856",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 922.8611221313477,
-        "y": 811.1111373901367,
-        "z": "29005224.e84c46",
+        "x": 986.8611221313477,
+        "y": 774.1111373901367,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "cb70510a.cb926"
+                "3319eb2b.96b06c"
             ]
         ]
     },
     {
-        "id": "cb70510a.cb926",
+        "id": "3319eb2b.96b06c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n\t<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to retrieve Template Information from Reference table.\"/>\n\t",
         "comments": "",
-        "x": 1126.1111297607422,
-        "y": 805.5277423858643,
-        "z": "29005224.e84c46",
+        "x": 1190.1111297607422,
+        "y": 768.5277423858643,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "e991d954.17bb88",
+        "id": "7fd8557b.08d05c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 711.944450378418,
-        "y": 805.9444704055786,
-        "z": "29005224.e84c46",
+        "x": 775.944450378418,
+        "y": 768.9444704055786,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "f9b86e0d.f41458"
+                "caac6856.1e856"
             ]
         ]
     },
     {
-        "id": "990a0e31.6e0e5",
+        "id": "b9a27f92.7134f",
         "type": "set",
         "name": "set Payload params ",
         "xml": "<set>\n<!-- vnf type, name is from A&AI \n<parameter name='vnf-type' value='`$tmp.vnfInfo.vnf.vnf-type`' />\n<parameter name='vnf-name' value='`$tmp.vnfInfo.vnf.vnf-name`' />\n-->\n<!-- 17.07 Parameters from request -->\n<parameter name='template-name' value='`$request-parameters.template-name`' />\n<parameter name='vnf-host-ip-address' value='`$request-parameters.vnf-host-ip-address`' />\n<parameter name='vnfc-type' value='`$request-parameters.vnfc-type`' /> \n<parameter name='vnf-type' value='`$request-parameters.vnf-type`' />\n<parameter name='vnf-name' value='`$request-parameters.vnf-name`' />\n\n<parameter name='configurationblock' value='`$block_configuration`' />\n\n\n<!-- parameters to be merged with template provided as input-->\n<parameter name='configuration-params' value='`$block_configuration-parameters`' /> \n\n\n\n<!--1702 VM/VNFC Parameters when passed from Request--> \n<parameter name='VNFCTYPE' value='`$request-parameters.vm[0].vnfc[0].vnfc-type`' />\n<parameter name=\"VMNAME0\" value=\"`$request-parameters.vm[0].vm-name`\"/>\n<parameter name=\"VNFCNAME0\" value=\"`$request-parameters.vm[0].vnfc[0].vnfc-name`\"/>\n<parameter name=\"VMLENGTH\" value=\"`$size_request-parameters.vm`\"/>\n<parameter name=\"VNFCLENGTH\" value=\"`$size_request-parameters.vm[0].vnfc`\"/>\n<parameter name=\"CONFIGTYPE\" value=\"`$config-type`\"/>\n\n\n<!-- Not Used?\n<parameter name='site-location' value='`$request-parameters.site-location`' />\n<parameter name='file-name' value='`$request-parameters.file-name`' />\n-->\n\n\n\n\n",
         "comments": "",
-        "x": 453.8333740234375,
-        "y": 302.86109352111816,
-        "z": "29005224.e84c46",
+        "x": 517.8333740234375,
+        "y": 265.86109352111816,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "19e50c10.9c277c",
+        "id": "fed29c92.eb62e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 708.2222290039062,
-        "y": 612.111083984375,
-        "z": "29005224.e84c46",
+        "x": 772.2222290039062,
+        "y": 575.111083984375,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "9ab33177.739028"
+                "6d521919.0c0358"
             ]
         ]
     },
     {
-        "id": "9ab33177.739028",
+        "id": "6d521919.0c0358",
         "type": "set",
         "name": "set action-level ",
         "xml": "<set>\n<parameter name='action-level' value='`$APPC.action-level.ACTION-LEVEL`' />\n\n\n\n\n\n",
         "comments": "",
-        "x": 923.6388549804688,
-        "y": 610.1666259765625,
-        "z": "29005224.e84c46",
+        "x": 987.6388549804688,
+        "y": 573.1666259765625,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "895d6244.5f7778",
+        "id": "3abcb846.d4e0c8",
         "type": "switchNode",
         "name": "switch action-level",
         "xml": "<switch test='`$action-level`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 368.3611145019531,
-        "y": 671.6944723129272,
-        "z": "29005224.e84c46",
+        "x": 432.3611145019531,
+        "y": 634.6944723129272,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "35177e35.337e22",
-                "a0f1c6b2.00f718"
+                "4039cfc1.8ee828",
+                "e2ad80e3.49acf"
             ]
         ]
     },
     {
-        "id": "35177e35.337e22",
+        "id": "4039cfc1.8ee828",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 585.7777938842773,
-        "y": 698.1111135482788,
-        "z": "29005224.e84c46",
+        "x": 649.7777938842773,
+        "y": 661.1111135482788,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "c9dae8b.326fc18"
+                "ac68d1f3.f5c328"
             ]
         ]
     },
     {
-        "id": "a0f1c6b2.00f718",
+        "id": "e2ad80e3.49acf",
         "type": "success",
         "name": "outcome: vm",
         "xml": "<outcome value='vm'>",
         "comments": "",
         "outputs": 1,
-        "x": 575.7777938842773,
-        "y": 760.7778034210205,
-        "z": "29005224.e84c46",
+        "x": 639.7777938842773,
+        "y": 723.7778034210205,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "890c6652.009fe"
+                "7d4820db.d6004"
             ]
         ]
     },
     {
-        "id": "8fafb92f.4781f8",
+        "id": "2baa7a8.a37f206",
         "type": "success",
         "name": "outcome: ''",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1495.5277824401855,
-        "y": 445.44440841674805,
-        "z": "29005224.e84c46",
+        "x": 1559.5277824401855,
+        "y": 408.44440841674805,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "54258c13.b4dbec"
+                "7e720425.a9814c"
             ]
         ]
     },
     {
-        "id": "785b351e.2dc944",
+        "id": "abeb4c97.075028",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 1429.3494873046875,
-        "y": 541.9206590652466,
-        "z": "29005224.e84c46",
+        "x": 1493.3494873046875,
+        "y": 504.9206590652466,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "87c5e3a0.ba27c8"
+                "8dac068c.f4c7"
             ]
         ]
     },
     {
-        "id": "54258c13.b4dbec",
+        "id": "7e720425.a9814c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1026.3493194580078,
-        "y": 518.0158796310425,
-        "z": "29005224.e84c46",
+        "x": 1090.3493194580078,
+        "y": 481.0158796310425,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "56a763a8.8e56fc"
+                "77348d2a.c3cc3c"
             ]
         ]
     },
     {
-        "id": "87c5e3a0.ba27c8",
+        "id": "8dac068c.f4c7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 1622.6585693359375,
-        "y": 541.3254442214966,
-        "z": "29005224.e84c46",
+        "x": 1686.6585693359375,
+        "y": 504.3254442214966,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "fe793e70.4652a8"
+                "fd43fc86.ef38d8"
             ]
         ]
     },
     {
-        "id": "fe793e70.4652a8",
+        "id": "fd43fc86.ef38d8",
         "type": "set",
         "name": "setActionLevel VNF",
         "xml": "<set>\n<parameter name='action-level' value='vnf' />\n<parameter name='action-identifier' value='vnf-id' />",
         "comments": "",
-        "x": 1827.2777099609375,
-        "y": 541.1110887527466,
-        "z": "29005224.e84c46",
+        "x": 1891.2777099609375,
+        "y": 504.1110887527466,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "a3f0b036.b07238",
+        "id": "34649294.8eafee",
         "type": "switchNode",
         "name": "switch vnfc-name",
         "xml": "<switch test='`$vnfc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 417.6111526489258,
-        "y": 424.58331966400146,
-        "z": "29005224.e84c46",
+        "x": 481.6111526489258,
+        "y": 387.58331966400146,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "eef9ecae.76ad3",
-                "ffae425d.e075e"
+                "7e081cf7.6e39a4",
+                "5548ec3.b36db94"
             ]
         ]
     },
     {
-        "id": "eef9ecae.76ad3",
+        "id": "7e081cf7.6e39a4",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 691.1549301147461,
-        "y": 414.19843578338623,
-        "z": "29005224.e84c46",
+        "x": 755.1549301147461,
+        "y": 377.19843578338623,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "f1024b4b.2595e8"
+                "166bed32.13ee23"
             ]
         ]
     },
     {
-        "id": "f1024b4b.2595e8",
+        "id": "166bed32.13ee23",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 879.1031265258789,
-        "y": 425.3254804611206,
-        "z": "29005224.e84c46",
+        "x": 943.1031265258789,
+        "y": 388.3254804611206,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "680f282a.97649"
+                "654cc4f.29daf3c"
             ]
         ]
     },
     {
-        "id": "680f282a.97649",
+        "id": "654cc4f.29daf3c",
         "type": "set",
         "name": "setActionLevel VNFC",
         "xml": "<set>\n<parameter name='action-level' value='vnfc' />\n<parameter name='action-identifier' value='vnfc-name' />\n",
         "comments": "",
-        "x": 1166.6112365722656,
-        "y": 336.83330249786377,
-        "z": "29005224.e84c46",
+        "x": 1230.6112365722656,
+        "y": 299.83330249786377,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "93b4e2ac.d50e",
+        "id": "5b3c6cea.7cdb34",
         "type": "switchNode",
         "name": "switch vserver-id",
         "xml": "<switch test='`$vserver-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 884.4999465942383,
-        "y": 465.88883686065674,
-        "z": "29005224.e84c46",
+        "x": 948.4999465942383,
+        "y": 428.88883686065674,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3e91bc4d.46606c",
-                "48c9e57e.8c798c"
+                "7ded4a08.a8b1d4",
+                "ee0f6fe4.dfc61"
             ]
         ]
     },
     {
-        "id": "3e91bc4d.46606c",
+        "id": "7ded4a08.a8b1d4",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 1140.3771362304688,
-        "y": 388.6984214782715,
-        "z": "29005224.e84c46",
+        "x": 1204.3771362304688,
+        "y": 351.6984214782715,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "d2985a3c.4610a8"
+                "ac305201.a611f"
             ]
         ]
     },
     {
-        "id": "d2985a3c.4610a8",
+        "id": "ac305201.a611f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 1324.825340270996,
-        "y": 370.57544898986816,
-        "z": "29005224.e84c46",
+        "x": 1388.825340270996,
+        "y": 333.57544898986816,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "cc353017.0aa6d8"
+                "24aec62f.b4b7f2"
             ]
         ]
     },
     {
-        "id": "cc353017.0aa6d8",
+        "id": "24aec62f.b4b7f2",
         "type": "set",
         "name": "setActionLevel VM",
         "xml": "<set>\n<parameter name='action-level' value='vm' />\n<parameter name='action-identifier' value='vserver-id' />\n\n",
         "comments": "",
-        "x": 1512.694480895996,
-        "y": 360.7777500152588,
-        "z": "29005224.e84c46",
+        "x": 1576.694480895996,
+        "y": 323.7777500152588,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "56a763a8.8e56fc",
+        "id": "77348d2a.c3cc3c",
         "type": "switchNode",
         "name": "switch vnf-id",
         "xml": "<switch test='`$vnf-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1189.7778511047363,
-        "y": 518.6110944747925,
-        "z": "29005224.e84c46",
+        "x": 1253.7778511047363,
+        "y": 481.6110944747925,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "785b351e.2dc944",
-                "9d2ff18a.171238"
+                "abeb4c97.075028",
+                "2c8b13ad.625aac"
             ]
         ]
     },
     {
-        "id": "9d2ff18a.171238",
+        "id": "2c8b13ad.625aac",
         "type": "success",
         "name": "outcome: ''",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1423.8611068725586,
-        "y": 491.94440746307373,
-        "z": "29005224.e84c46",
+        "x": 1487.8611068725586,
+        "y": 454.94440746307373,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "b35053a9.d33238"
+                "c950d7af.bbae5"
             ]
         ]
     },
     {
-        "id": "b35053a9.d33238",
+        "id": "c950d7af.bbae5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1614.0993881225586,
-        "y": 488.34922313690186,
-        "z": "29005224.e84c46",
+        "x": 1678.0993881225586,
+        "y": 451.34922313690186,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "6d710e0e.4976e"
+                "b7b8431f.02d69"
             ]
         ]
     },
     {
-        "id": "6d710e0e.4976e",
+        "id": "b7b8431f.02d69",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Action identifier is missing in the request\"/>\n\t\n\t",
         "comments": "",
-        "x": 1812.6109886169434,
-        "y": 494.3610944747925,
-        "z": "29005224.e84c46",
+        "x": 1876.6109886169434,
+        "y": 457.3610944747925,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "8f73566a.1203d",
+        "id": "96ce6cb.c63729",
         "type": "switchNode",
         "name": "switch vf-module-id",
         "xml": "<switch test='`$vf-module-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1295.6230697631836,
-        "y": 429.21821117401123,
-        "z": "29005224.e84c46",
+        "x": 1359.6230697631836,
+        "y": 392.21821117401123,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "3af980e0.4a059",
-                "8fafb92f.4781f8"
+                "df9e15c1.92e878",
+                "2baa7a8.a37f206"
             ]
         ]
     },
     {
-        "id": "3af980e0.4a059",
+        "id": "df9e15c1.92e878",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 1509.944480895996,
-        "y": 402.86106300354004,
-        "z": "29005224.e84c46",
+        "x": 1573.944480895996,
+        "y": 365.86106300354004,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "febce556.d01168"
+                "3386fcf0.82fb6c"
             ]
         ]
     },
     {
-        "id": "febce556.d01168",
+        "id": "3386fcf0.82fb6c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 1715.5039291381836,
-        "y": 401.7659101486206,
-        "z": "29005224.e84c46",
+        "x": 1779.5039291381836,
+        "y": 364.7659101486206,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "503e3ecc.28c6b8"
+                "b4677ca9.16dfc"
             ]
         ]
     },
     {
-        "id": "503e3ecc.28c6b8",
+        "id": "b4677ca9.16dfc",
         "type": "set",
         "name": "setActionLevel VF-Module",
         "xml": "<set>\n<parameter name='action-level' value='vf-module' />\n<parameter name='action-identifier' value='vf-module-id' />\n",
         "comments": "",
-        "x": 1927.7897033691406,
-        "y": 400.63489818573,
-        "z": "29005224.e84c46",
+        "x": 1991.7897033691406,
+        "y": 363.63489818573,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "ffae425d.e075e",
+        "id": "5548ec3.b36db94",
         "type": "success",
         "name": "outcome: ''",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 685.9444313049316,
-        "y": 460.02777671813965,
-        "z": "29005224.e84c46",
+        "x": 749.9444313049316,
+        "y": 423.02777671813965,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "93b4e2ac.d50e"
+                "5b3c6cea.7cdb34"
             ]
         ]
     },
     {
-        "id": "48c9e57e.8c798c",
+        "id": "ee0f6fe4.dfc61",
         "type": "success",
         "name": "outcome: ''",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1104.8334159851074,
-        "y": 447.6666612625122,
-        "z": "29005224.e84c46",
+        "x": 1168.8334159851074,
+        "y": 410.6666612625122,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "8f73566a.1203d"
+                "96ce6cb.c63729"
             ]
         ]
     },
     {
-        "id": "7b2f5687.8079a8",
+        "id": "862c4ef9.c1b13",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`$request-action`\"/>\n<parameter name=\"field3\" value=\"`$action-identifier`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 391.61114501953125,
-        "y": 474.88889598846436,
-        "z": "29005224.e84c46",
+        "x": 455.61114501953125,
+        "y": 437.88889598846436,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "71fa2664.4d59f",
+        "id": "84b11aeb.34d5c",
         "type": "switchNode",
         "name": "switch vnfc-type",
         "xml": "<switch test='`$vnfc-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 427.0277862548828,
-        "y": 357.6666784286499,
-        "z": "29005224.e84c46",
+        "x": 491.0277862548828,
+        "y": 320.6666784286499,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "b6a4357c.618ce8",
-                "6529cb.63d45634"
+                "83b49328.3ccec",
+                "7389bac1.fb2664"
             ]
         ]
     },
     {
-        "id": "b6a4357c.618ce8",
+        "id": "83b49328.3ccec",
         "type": "success",
         "name": "outcome: Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 702.7937316894531,
-        "y": 322.83735847473145,
-        "z": "29005224.e84c46",
+        "x": 766.7937316894531,
+        "y": 285.83735847473145,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "74cf5abf.1acb4c"
+                "847bd123.f567b8"
             ]
         ]
     },
     {
-        "id": "74cf5abf.1acb4c",
+        "id": "847bd123.f567b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": null,
         "outputs": 1,
-        "x": 896.2975578308105,
-        "y": 325.0754690170288,
-        "z": "29005224.e84c46",
+        "x": 960.2975578308105,
+        "y": 288.0754690170288,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6529cb.63d45634",
+        "id": "7389bac1.fb2664",
         "type": "success",
         "name": "outcome: ''",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 698.6944046020508,
-        "y": 364.22221755981445,
-        "z": "29005224.e84c46",
+        "x": 762.6944046020508,
+        "y": 327.22221755981445,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "2a62c2f3.99fb8e"
+                "7eb0c4a4.d3b1f4"
             ]
         ]
     },
     {
-        "id": "2a62c2f3.99fb8e",
+        "id": "7eb0c4a4.d3b1f4",
         "type": "set",
         "name": "set vnfc-type ",
         "xml": "<set>\n<!-- 17.07 If vnfc-type is blank assign Parameters from request in array list -->\n<parameter name='vnfc-type' value='`$VNFCTYPE`' />\n\n\n\n\n\n\n\n\n\n\n\n",
         "comments": "",
-        "x": 897.0277328491211,
-        "y": 364.3333559036255,
-        "z": "29005224.e84c46",
+        "x": 961.0277328491211,
+        "y": 327.3333559036255,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "c9dae8b.326fc18",
+        "id": "ac68d1f3.f5c328",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 743.75,
-        "y": 704.75,
-        "z": "29005224.e84c46",
+        "x": 807.75,
+        "y": 667.75,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "ee42bea.ad995c"
+                "3ea77551.040252"
             ]
         ]
     },
     {
-        "id": "890c6652.009fe",
+        "id": "7d4820db.d6004",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 756.75,
-        "y": 764.75,
-        "z": "29005224.e84c46",
+        "x": 820.75,
+        "y": 727.75,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             [
-                "400b20c6.a313"
+                "d706fa3b.1a75a"
             ]
         ]
     },
     {
-        "id": "400b20c6.a313",
+        "id": "d706fa3b.1a75a",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n\n",
         "comments": "",
-        "x": 930.0833740234375,
-        "y": 759.7500610351562,
-        "z": "29005224.e84c46",
+        "x": 994.0833740234375,
+        "y": 722.7500610351562,
+        "z": "16b2bdc6.b4f10a",
         "wires": []
     },
     {
-        "id": "ee42bea.ad995c",
+        "id": "3ea77551.040252",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"level\" value=\"info\"/>\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Action Level is not VM:\"/>\n<parameter name=\"field3\" value=\"`$action-level`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1054.75,
-        "y": 715.75,
-        "z": "29005224.e84c46",
+        "x": 1118.75,
+        "y": 678.75,
+        "z": "16b2bdc6.b4f10a",
         "wires": [
             []
         ]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
index a64d0eb36..994fbc7b2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCheckConfigStatus.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -38,180 +42,180 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 public class TestCheckConfigStatus /* extends AbstractDGTestCase */ {
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestCheckConfigStatus.class);
-	public static String CheckConfigStatusXML = "src/main/resources/xml/APPC_CheckConfigStatus.xml";
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestCheckConfigStatus.class);
+    public static String CheckConfigStatusXML = "src/main/resources/xml/APPC_CheckConfigStatus.xml";
 
 
 
 /*
-	@Test
-	public void testCheckConfigStatusSuccess() {
-		try {
+    @Test
+    public void testCheckConfigStatusSuccess() {
+        try {
+
+            String propertyfileName = "APPC/CheckConfigStatus/CheckConfigStatus_Success.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Test
+    public void testCheckConfigStatusFailure() {
+        try {
+
+            String propertyfileName = "APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 
-			String propertyfileName = "APPC/CheckConfigStatus/CheckConfigStatus_Success.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-	
-			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+    @Test
+    public void testParseErrorLogFail() {
+        try {
 
+            String propertyfileName = "APPC/CheckConfigStatus/ParseErrorLogFail.properties";
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-		
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-	@Test
-	public void testCheckConfigStatusFailure() {
-		try {
 
-			String propertyfileName = "APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            //System.out.println("error-message "+  ctx.getAttribute("error-message"));
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-		
+    @Test
+    public void testParseErrorLogSuccess() {
+        try {
 
+            String propertyfileName = "APPC/CheckConfigStatus/ParseErrorLogSuccess.properties";
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-	
-	
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 
-	@Test
-	public void testParseErrorLogFail() {
-		try {
+            GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-			String propertyfileName = "APPC/CheckConfigStatus/ParseErrorLogFail.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			//System.out.println("error-message "+  ctx.getAttribute("error-message"));
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testParseErrorLogSuccess() { 
-		try {
 
-			String propertyfileName = "APPC/CheckConfigStatus/ParseErrorLogSuccess.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+    @Test
+    public void testMaxRetries() {
+        try {
 
+            String propertyfileName = "APPC/CheckConfigStatus/MaxRetries.properties";
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
 
-			
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	
-	@Test
-	public void testMaxRetries() { 
-		try {
 
-			String propertyfileName = "APPC/CheckConfigStatus/MaxRetries.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { CheckConfigStatusXML };
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "CheckConfigStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-			
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
index f7ee5abaa..3c939cbe3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestCommonConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -39,188 +43,187 @@ public class TestCommonConfig /* extends AbstractDGTestCase */ {
 
 /*
 
-	public String jsonPath = "src/main/resources/json";
-	public String xmlpath = "src/main/resources/xml";
-
-	@Test
-	public void testCommonConfig() {
-		try {
-			//DGXMLGenerator generator = new DGXMLGenerator();
-			//generator.generateXMLFromJSON(jsonPath, xmlpath, null);
+    public String jsonPath = "src/main/resources/json";
+    public String xmlpath = "src/main/resources/xml";
+
+    @Test
+    public void testCommonConfig() {
+        try {
+            //DGXMLGenerator generator = new DGXMLGenerator();
+            //generator.generateXMLFromJSON(jsonPath, xmlpath, null);
+
+            String propertyfileName = "APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties";
+
+            String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
+            String callGraph1XML = "src/main/resources/xml/APPC_GetConfigParams.xml";
+            String callGraph2XML = "src/main/resources/xml/APPC_Configure.xml";
+            String callGraph3XML = "src/main/resources/xml/APPC_SetStatus.xml";
+            String callGraph4XML = "src/main/resources/xml/APPC_DownloadRestconfConfig.xml";
+            String callGraph5XML = "src/main/resources/xml/APPC_GenerateConfig.xml";
+            String callGraph6XML = "src/main/resources/xml/APPC_DownloadXmlConfig.xml";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { commonConfigureXML,
+                    callGraph1XML,
+                    callGraph2XML,
+                    callGraph3XML,
+                    callGraph4XML,
+                    callGraph5XML,
+                    callGraph6XML };
+
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+
+    @Test
+    public void testGetConfigParamsFailure() {
+        try {
+            //DGXMLGenerator generator = new DGXMLGenerator();
+            //generator.generateXMLFromJSON(jsonPath, xmlpath, null);
+
+            String propertyfileName = "APPC/CommonConfiguration/GetConfigParamsFail.properties";
+
+            String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { commonConfigureXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+    @Test
+    public void testInvalidRequestAction() {
+        try {
+            //DGXMLGenerator generator = new DGXMLGenerator();
+            //generator.generateXMLFromJSON(jsonPath, xmlpath, null);
+
+            String propertyfileName = "APPC/CommonConfiguration/InvalidRequestAction.properties";
+
+            String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { commonConfigureXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+    @Test
+    public void testCommonConfigISBCTemplateSuccess() {
+        try {
+            //DGXMLGenerator generator = new DGXMLGenerator();
+            //generator.generateXMLFromJSON(jsonPath, xmlpath, null);
+
+            String propertyfileName = "APPC/CommonConfiguration/ISBCTemplateSuccess.properties";
+
+            String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
+            String callGraph1XML = "src/main/resources/xml/APPC_GetConfigParams.xml";
+            String callGraph2XML = "src/main/resources/xml/APPC_Configure.xml";
+            String callGraph3XML = "src/main/resources/xml/APPC_SetStatus.xml";
+            String callGraph4XML = "src/main/resources/xml/APPC_GenerateTemplateConfig.xml";
+            String callGraph5XML = "src/main/resources/xml/APPC_CheckConfigStatus.xml";
+            String callGraph6XML = "src/main/resources/xml/APPC_DownloadIsbcConfig.xml";
+            String callGraph7XML = "src/main/resources/xml/APPC_UpdateAaiInfo.xml";
+            String callGraph8XML = "src/main/resources/xml/APPC_GetVfModuleInfo.xml";
+            String callGraph9XML = "src/main/resources/xml/APPC_SaveRunningConfig.xml";
+            String callGraph10XML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { commonConfigureXML,
+                    callGraph1XML,
+                    callGraph2XML,
+                    callGraph3XML,
+                    callGraph4XML,
+                    callGraph5XML,
+                    callGraph6XML,
+                    callGraph7XML,
+                    callGraph8XML,
+                    callGraph9XML,
+                    callGraph10XML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
 
-			String propertyfileName = "APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties";
-
-			String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
-			String callGraph1XML = "src/main/resources/xml/APPC_GetConfigParams.xml";
-			String callGraph2XML = "src/main/resources/xml/APPC_Configure.xml";
-			String callGraph3XML = "src/main/resources/xml/APPC_SetStatus.xml";
-			String callGraph4XML = "src/main/resources/xml/APPC_DownloadRestconfConfig.xml";
-			String callGraph5XML = "src/main/resources/xml/APPC_GenerateConfig.xml";
-			String callGraph6XML = "src/main/resources/xml/APPC_DownloadXmlConfig.xml";
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { commonConfigureXML,
-					callGraph1XML,
-					callGraph2XML,
-					callGraph3XML,
-					callGraph4XML,
-					callGraph5XML,
-					callGraph6XML };
-		
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-			//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
-			serviceReferences.put("org.onap.appc.ccadaptor.ConfigComponentAdaptor", new MockConfigureNodeExecutor());
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	
-	
-
-	@Test
-	public void testGetConfigParamsFailure() {
-		try {
-			//DGXMLGenerator generator = new DGXMLGenerator();
-			//generator.generateXMLFromJSON(jsonPath, xmlpath, null);
-
-			String propertyfileName = "APPC/CommonConfiguration/GetConfigParamsFail.properties";
-
-			String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
-			
-
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { commonConfigureXML };
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			
-			
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-
-			
-			
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-
-	
-	@Test
-	public void testInvalidRequestAction() {
-		try {
-			//DGXMLGenerator generator = new DGXMLGenerator();
-			//generator.generateXMLFromJSON(jsonPath, xmlpath, null);
-
-			String propertyfileName = "APPC/CommonConfiguration/InvalidRequestAction.properties";
-
-			String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
-			
-
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { commonConfigureXML };
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			
-			
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
-	
-	@Test
-	public void testCommonConfigISBCTemplateSuccess() {
-		try {
-			//DGXMLGenerator generator = new DGXMLGenerator();
-			//generator.generateXMLFromJSON(jsonPath, xmlpath, null);
-
-			String propertyfileName = "APPC/CommonConfiguration/ISBCTemplateSuccess.properties";
-
-			String commonConfigureXML = "src/main/resources/xml/APPC_CommonConfiguration.xml";
-			String callGraph1XML = "src/main/resources/xml/APPC_GetConfigParams.xml";
-			String callGraph2XML = "src/main/resources/xml/APPC_Configure.xml";
-			String callGraph3XML = "src/main/resources/xml/APPC_SetStatus.xml";
-			String callGraph4XML = "src/main/resources/xml/APPC_GenerateTemplateConfig.xml";
-			String callGraph5XML = "src/main/resources/xml/APPC_CheckConfigStatus.xml";
-			String callGraph6XML = "src/main/resources/xml/APPC_DownloadIsbcConfig.xml";
-			String callGraph7XML = "src/main/resources/xml/APPC_UpdateAaiInfo.xml";
-			String callGraph8XML = "src/main/resources/xml/APPC_GetVfModuleInfo.xml";
-			String callGraph9XML = "src/main/resources/xml/APPC_SaveRunningConfig.xml";
-			String callGraph10XML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
-
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { commonConfigureXML,
-					callGraph1XML,
-					callGraph2XML,
-					callGraph3XML,
-					callGraph4XML,
-					callGraph5XML,
-					callGraph6XML,
-					callGraph7XML,
-					callGraph8XML,
-					callGraph9XML,
-					callGraph10XML };
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-		
-			
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "CommonConfiguration", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-			
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-	}
+    }
 */
 }
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
index 801b61097..9f6d676b7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigurationDocumentRequest.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -35,35 +39,35 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 public class TestConfigurationDocumentRequest /* extends AbstractDGTestCase */ {
 
 /*
-	@Test
-	public void testSDCMessage() {
-		try {
-			String propertyfileName = "SDC-MESSAGE_method_configuration-document-request_TC1.properties";
+    @Test
+    public void testSDCMessage() {
+        try {
+            String propertyfileName = "SDC-MESSAGE_method_configuration-document-request_TC1.properties";
 
-			String configurationDocumentRequestXML = "src/main/resources/xml/SDC-MESSAGE_method_configuration-document-request_3.0.0.xml";
+            String configurationDocumentRequestXML = "src/main/resources/xml/SDC-MESSAGE_method_configuration-document-request_3.0.0.xml";
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { configurationDocumentRequestXML};
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { configurationDocumentRequestXML};
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode",new org.onap.sdnc.config.generator.convert.ConvertNode());
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
 
-			GraphKey  graphKey = new GraphKey("SDC-MESSAGE", null, "configuration-document-request", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("SDC-MESSAGE", null, "configuration-document-request", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 */
 
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
index 052ad7848..6022ac834 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestConfigure.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -38,248 +42,248 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 public class TestConfigure /* extends AbstractDGTestCase */ {
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestConfigure.class);
-	public static String ConfigureXML = "src/main/resources/xml/APPC_Configure.xml";
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestConfigure.class);
+    public static String ConfigureXML = "src/main/resources/xml/APPC_Configure.xml";
 
 /*
-	@Test
-	public void testTemplateConfigureSuccess() {
-		try {
+    @Test
+    public void testTemplateConfigureSuccess() {
+        try {
+
+            String propertyfileName = "APPC/Configure/Configure_Success.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Test
+    public void testTemplateConfigureFailure() {
+        try {
+
+            String propertyfileName = "APPC/Configure/Configure_Failure.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Test
+    public void testGetTemplateFailure() {
+        try {
+
+            String propertyfileName = "APPC/Configure/GetTemplate_Failure.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    @Test
+    public void testGenerateTemplateConfigFailure() {
+        try {
 
-			String propertyfileName = "APPC/Configure/Configure_Success.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
+            String propertyfileName = "APPC/Configure/GenerateTemplateConfig_Failure.properties";
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-	
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-		
 
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 
-	@Test
-	public void testTemplateConfigureFailure() {
-		try {
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			String propertyfileName = "APPC/Configure/Configure_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-		
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+    @Test
+    public void testConfigBlockConfigureSuccess() {
+        try {
 
-		
+            String propertyfileName = "APPC/Configure/ConfigBlockConfigure_Success.properties";
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-	
-	@Test
-	public void testGetTemplateFailure() {
-		try {
 
-			String propertyfileName = "APPC/Configure/GetTemplate_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-		
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 
-	
-	@Test
-	public void testGenerateTemplateConfigFailure() {
-		try {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-			String propertyfileName = "APPC/Configure/GenerateTemplateConfig_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
+    @Test
+    public void testConfigBlockConfigureFailure() {
+        try {
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-	
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            String propertyfileName = "APPC/Configure/ConfigBlockConfigure_Failure.properties";
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
 
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testConfigBlockConfigureSuccess() {
-		try {
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			String propertyfileName = "APPC/Configure/ConfigBlockConfigure_Success.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-	
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
-	@Test
-	public void testConfigBlockConfigureFailure() {
-		try {
+    @Test
+    public void testGenerateConfigFailure() {
+        try {
 
-			String propertyfileName = "APPC/Configure/ConfigBlockConfigure_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
+            String propertyfileName = "APPC/Configure/GenerateConfig_Failure.properties";
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-	
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { ConfigureXML };
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
+            GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	
-	@Test
-	public void testGenerateConfigFailure() {
-		try {
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			String propertyfileName = "APPC/Configure/GenerateConfig_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { ConfigureXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-	
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "Configure", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
 
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
index 782493c2d..2f6f7459a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadCliConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -38,96 +42,96 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 public class TestDownloadCliConfig /* extends AbstractDGTestCase */ {
 
 /*
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestDownloadIsbcConfig.class);
-	public static String DownloadCliConfigXML = "src/main/resources/xml/APPC_DownloadCliConfig.xml";
-
-	@Test
-	public void testDownloadCliConfigSuccess() {
-		try {
-			String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_Success.properties";
-
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-			//DGMockUtils.printContext(ctx);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testDownloadCliConfigDBFailure() {
-		try {
-
-			String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties";
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-			//DGMockUtils.printContext(ctx);
-
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testDownloadCliConfigAdaptorFailure() {
-		try {
-
-			String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties";
-
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
-
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-			//DGMockUtils.printContext(ctx);
-
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestDownloadIsbcConfig.class);
+    public static String DownloadCliConfigXML = "src/main/resources/xml/APPC_DownloadCliConfig.xml";
+
+    @Test
+    public void testDownloadCliConfigSuccess() {
+        try {
+            String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_Success.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+            //DGMockUtils.printContext(ctx);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testDownloadCliConfigDBFailure() {
+        try {
+
+            String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties";
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+            //DGMockUtils.printContext(ctx);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testDownloadCliConfigAdaptorFailure() {
+        try {
+
+            String propertyfileName = "APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadCliConfigXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            GraphKey graphKey = new GraphKey("APPC", null, "DownloadCliConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+            //DGMockUtils.printContext(ctx);
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
index 92e39e862..231dd6b0a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestDownloadIsbcConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -37,115 +41,115 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 
 public class TestDownloadIsbcConfig /* extends AbstractDGTestCase */{
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestDownloadIsbcConfig.class);
-	public static String DownloadIsbcConfigXML = "src/main/resources/xml/APPC_DownloadIsbcConfig.xml";
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestDownloadIsbcConfig.class);
+    public static String DownloadIsbcConfigXML = "src/main/resources/xml/APPC_DownloadIsbcConfig.xml";
 
 /*
-	@Test
-	public void testDownloadIsbcConfigSuccess() {
-		try {
+    @Test
+    public void testDownloadIsbcConfigSuccess() {
+        try {
+
+            String propertyfileName = "APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+
+
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Test
+    public void testConfigFileFailure() {
+        try {
+
+            String propertyfileName = "APPC/DownloadIsbcConfig/ConfigFile_Failure.properties";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-			String propertyfileName = "APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-			
-		
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-		
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-	@Test
-	public void testConfigFileFailure() {
-		try {
 
-			String propertyfileName = "APPC/DownloadIsbcConfig/ConfigFile_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
+    @Test
+    public void testPutFailure() {
+        try {
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-		
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
+            String propertyfileName = "APPC/DownloadIsbcConfig/Put_Failure.properties";
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
 
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+            GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
 
-	
-	@Test
-	public void testPutFailure() {
-		try {
 
-			String propertyfileName = "APPC/DownloadIsbcConfig/Put_Failure.properties";
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { DownloadIsbcConfigXML };
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-		
-			
-		
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "DownloadIsbcConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
 
-			
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
index 8ead2afef..af0423b0d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -51,82 +55,82 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 
 public class TestGenerateConfig /* extends AbstractDGTestCase */ {
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGenerateConfig.class);
-	public static String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGenerateConfig.class);
+    public static String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
 
 /*
 
-	@Test
-	public void testGenerateConfigWithParameters() {
-		try {
+    @Test
+    public void testGenerateConfigWithParameters() {
+        try {
+
+            String propertyfileName = "APPC/GenerateConfig/GenerateConfigWithParams.properties";
+            //String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { generateConfigXML };
+
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
+
+            serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
-			String propertyfileName = "APPC/GenerateConfig/GenerateConfigWithParams.properties";
-			//String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { generateConfigXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-	
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-			//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
-			
-			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
-		
-			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
+    @Test
+    public void testGenerateConfigWithNoParameters() {
+        try {
 
+            String propertyfileName = "APPC/GenerateConfig/GenerateConfigNoParams.properties";
+            //String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
 
-	@Test
-	public void testGenerateConfigWithNoParameters() {
-		try {
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { generateConfigXML };
 
-			String propertyfileName = "APPC/GenerateConfig/GenerateConfigNoParams.properties";
-			//String generateConfigXML = "src/main/resources/xml/APPC_GenerateConfig.xml";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { generateConfigXML };
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            //serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
 
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-	
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
-			//serviceReferences.put("com.att.appc.config.generator.node.ConfigResourceNode", new MockConfigResourceNode());
-			
-			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+            serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "GenerateConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 
 */
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
index cd279f326..3223cb9e7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGenerateTemplateConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -40,72 +44,72 @@ import com.att.sdnctl.dgtestlibrary.GraphKey;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestGenerateTemplateConfig /* extends AbstractDGTestCase */ {
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGenerateTemplateConfig.class);
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGenerateTemplateConfig.class);
 /*
-	public static String generateConfigXML = "src/main/resources/xml/APPC_GenerateTemplateConfig.xml";
+    public static String generateConfigXML = "src/main/resources/xml/APPC_GenerateTemplateConfig.xml";
+
+    @Test
+    public void testGenerateTemplateConfigWithParameters() {
+        try {
+
+            String propertyfileName = "APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
 
-	@Test
-	public void testGenerateTemplateConfigWithParameters() {
-		try {
+            serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
 
-			String propertyfileName = "APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { generateConfigXML };
 
-			
-			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            GraphKey  graphKey = new GraphKey("APPC", null, "GenerateTemplateConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { generateConfigXML };
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateTemplateConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-		
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 
+    @Test
+    public void testGenerateTemplateConfigWithNoParameters() {
+        try {
 
-	@Test
-	public void testGenerateTemplateConfigWithNoParameters() {
-		try {
+            String propertyfileName = "APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			String propertyfileName = "APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-		
-			serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
-			serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
+            serviceReferences.put("org.onap.appc.data.services.node.ConfigResourceNode", new MockSvcLogicJavaPlugin());
+            serviceReferences.put("org.onap.sdnc.config.generator.merge.MergeNode", new org.onap.sdnc.config.generator.merge.MergeNode());
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { generateConfigXML };
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { generateConfigXML };
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GenerateTemplateConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "GenerateTemplateConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
index 6674054cb..f7307acb2 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetAaiInfo.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -41,106 +45,106 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 public class TestGetAaiInfo /* extends AbstractDGTestCase */{
 
 /*
-	
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetAaiInfo.class);
-	public static String getAaiInfoXML = "src/main/resources/xml/APPC_GetAaiInfo.xml";
-
-
-
-	
-	@Test
-	public void testGetSuccess() {
-		try {
-
-
-			String propertyfileName = "APPC/GetAaiInfo/GetInfoSuccess.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getAaiInfoXML};
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	
-	@Test
-	public void testGetVnfFail() {
-		try {
-
-
-			String propertyfileName = "APPC/GetAaiInfo/GetVnfFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getAaiInfoXML};
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Test
-	public void testGetVServerFail() {
-		try {
-
-
-			String propertyfileName = "APPC/GetAaiInfo/GetVServerFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getAaiInfoXML};
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-*/	
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetAaiInfo.class);
+    public static String getAaiInfoXML = "src/main/resources/xml/APPC_GetAaiInfo.xml";
+
+
+
+
+    @Test
+    public void testGetSuccess() {
+        try {
+
+
+            String propertyfileName = "APPC/GetAaiInfo/GetInfoSuccess.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getAaiInfoXML};
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    @Test
+    public void testGetVnfFail() {
+        try {
+
+
+            String propertyfileName = "APPC/GetAaiInfo/GetVnfFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getAaiInfoXML};
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Test
+    public void testGetVServerFail() {
+        try {
+
+
+            String propertyfileName = "APPC/GetAaiInfo/GetVServerFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getAaiInfoXML};
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+*/
 }
 
 
 
-	
+
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
index d14bb8339..52e20415e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetConfigParams.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -37,241 +41,241 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 
 public class TestGetConfigParams /* extends AbstractDGTestCase */ {
-	
+
 
 /*
-	
-	public static String getConfigParamsXML = "src/main/resources/xml/APPC_GetConfigParams.xml";
+
+    public static String getConfigParamsXML = "src/main/resources/xml/APPC_GetConfigParams.xml";
+
+
+
+    @Test
+    public void testGetConfigParamsWithDefaultTemplate() {
+        try {
+
+            String propertyfileName = "APPC/GetConfigParams/DefaultTemplate.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+
+    @Test
+    public void testGetConfigParamsWithTemplateName() {
+        try {
+
+
+            String propertyfileName = "APPC/GetConfigParams/TemplateName.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
 
 
 
-	@Test
-	public void testGetConfigParamsWithDefaultTemplate() {
-		try {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-			String propertyfileName = "APPC/GetConfigParams/DefaultTemplate.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
+    @Test
+    public void testGetConfigParamsWithCliString() {
+        try {
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
+            String propertyfileName = "APPC/GetConfigParams/CliString.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
-			
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-	}
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
 
-	@Test
-	public void testGetConfigParamsWithTemplateName() {
-		try {
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
+    @Test
+    public void testGetConfigParamsWithCliJson() {
+        try {
 
-			String propertyfileName = "APPC/GetConfigParams/TemplateName.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
+            String propertyfileName = "APPC/GetConfigParams/CliJson.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-		
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-	@Test
-	public void testGetConfigParamsWithCliString() {
-		try {
 
-			String propertyfileName = "APPC/GetConfigParams/CliString.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+    @Test
+    public void testGetConfigParamsForRestore() {
+        try {
+            String propertyfileName = "APPC/GetConfigParams/Restore.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-				
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
-	@Test
-	public void testGetConfigParamsWithCliJson() {
-		try {
 
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			String propertyfileName = "APPC/GetConfigParams/CliJson.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
-			
-		
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
 
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+    @Test
+    public void testGetConfigParamsCommonConfigFail() {
+        try {
+            String propertyfileName = "APPC/GetConfigParams/CommonConfigFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
+            serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-	@Test
-	public void testGetConfigParamsForRestore() {
-		try {
-			String propertyfileName = "APPC/GetConfigParams/Restore.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
-		
-		
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 
-	@Test
-	public void testGetConfigParamsCommonConfigFail() {
-		try {
-			String propertyfileName = "APPC/GetConfigParams/CommonConfigFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-		
-			serviceReferences.put("org.onap.sdnc.config.generator.convert.ConvertNode", new org.onap.sdnc.config.generator.convert.ConvertNode());
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
+    @Test
+    public void testGetConfigParamsJson2DGContextFail() {
+        try {
+            String propertyfileName = "APPC/GetConfigParams/Json2DGContextFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
 
-	
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
 
-	@Test
-	public void testGetConfigParamsJson2DGContextFail() {
-		try {
-			String propertyfileName = "APPC/GetConfigParams/Json2DGContextFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			
-		
-			
-		
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getConfigParamsXML };
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetConfigParams", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
 
-	
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
index 48fb106db..b84b0516e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetDeviceRunningConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -35,97 +39,97 @@ import com.att.sdnctl.dgtestlibrary.GraphKey;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public class TestGetDeviceRunningConfig /* extends AbstractDGTestCase */ {
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetConfigParams.class);
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetConfigParams.class);
 /*
-	public String jsonPath = "src/main/resources/json";
-	public String xmlpath = "src/main/resources/xml";
+    public String jsonPath = "src/main/resources/json";
+    public String xmlpath = "src/main/resources/xml";
 
-	@Test
-	public void testChefRunningConfigSuccess() {
-		try {
-			logger.info("********************************* testChefRunningConfigSuccess *************************************");
-			//DGMockUtils.generateXMLFile(jsonPath, xmlpath);
+    @Test
+    public void testChefRunningConfigSuccess() {
+        try {
+            logger.info("********************************* testChefRunningConfigSuccess *************************************");
+            //DGMockUtils.generateXMLFile(jsonPath, xmlpath);
 
-			String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Success.properties";
+            String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Success.properties";
 
-			String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
+            String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			assertContextWithProperty(ctx);
+            assertContextWithProperty(ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-	@Test
-	public void testChefRunningConfigFailure() {
-		try {
+    @Test
+    public void testChefRunningConfigFailure() {
+        try {
 
-			logger.info("********************************* testChefRunningConfigFailure *************************************");
-			String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Failure.properties";
+            logger.info("********************************* testChefRunningConfigFailure *************************************");
+            String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Failure.properties";
 
-			String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
+            String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			assertContextWithProperty(ctx);
+            assertContextWithProperty(ctx);
 
-			//DGMockUtils.printContext(ctx);
+            //DGMockUtils.printContext(ctx);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 
-	@Test
-	public void testChefRunningConfigOthers() {
-		try {
-			logger.info("********************************* testChefRunningConfigOthers *************************************");
-			String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Others.properties";
+    @Test
+    public void testChefRunningConfigOthers() {
+        try {
+            logger.info("********************************* testChefRunningConfigOthers *************************************");
+            String propertyfileName = "APPC/GetDeviceRunningConfig/Chef_Others.properties";
 
-			String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
+            String getDeviceRunningConfigXML = "src/main/resources/xml/APPC_GetDeviceRunningConfig.xml";
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getDeviceRunningConfigXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetDeviceRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setPropertyfileName(propertyfileName);
 
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			assertContextWithProperty(ctx);
+            assertContextWithProperty(ctx);
 
-			//DGMockUtils.printContext(ctx);
+            //DGMockUtils.printContext(ctx);
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
index 6bc64f233..6bc9d10e3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestGetVfModuleInfo.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -52,72 +56,72 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 public class TestGetVfModuleInfo /* extends AbstractDGTestCase */ {
 
-	//private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
+    //private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
 
 /*
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetVfModuleInfo.class);
-	public static String GetVfModuleInfoXML = "src/main/resources/xml/APPC_GetVfModuleInfo.xml";
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestGetVfModuleInfo.class);
+    public static String GetVfModuleInfoXML = "src/main/resources/xml/APPC_GetVfModuleInfo.xml";
+
+
 
+    @Test
+    public void testGetVfModuleInfoSuccess() {
+        try {
 
+            String propertyfileName = "APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-	@Test
-	public void testGetVfModuleInfoSuccess() {
-		try {
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { GetVfModuleInfoXML };
 
-			String propertyfileName = "APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { GetVfModuleInfoXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetVfModuleInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetVfModuleInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+    }
 
-	}
 
 
 
+    @Test
+    public void testGetVfModuleInfoFailure() {
+        try {
 
-	@Test
-	public void testGetVfModuleInfoFailure() {
-		try {
+            String propertyfileName = "APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			String propertyfileName = "APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { GetVfModuleInfoXML };
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { GetVfModuleInfoXML };
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "GetVfModuleInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "GetVfModuleInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+    }
 
-	}
 
-	
 */
 
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
index fd14d83cd..56b0bab3b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestProcessParameterDefinition.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -39,216 +43,216 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 
 public class TestProcessParameterDefinition /* extends AbstractDGTestCase */ {
-	
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestProcessParameterDefinition.class);
-	public static String getProcessPDXML = "src/main/resources/xml/APPC_ProcessParameterDefinition.xml";
+
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestProcessParameterDefinition.class);
+    public static String getProcessPDXML = "src/main/resources/xml/APPC_ProcessParameterDefinition.xml";
 
 /*
 
-	
-	@Test
-	public void testProcessPD() {
-		try {
-
-
-			String propertyfileName = "APPC/ProcessParameterDefinition/ProcessPD.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-		
-			serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
-
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-			//System.out.println(ctx.getAttribute("tmp.allParams.configuration-parameters"));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	
-	
-	@Test
-	public void testGetPDFail() {
-		try {
-
-
-			String propertyfileName = "APPC/ProcessParameterDefinition/GetPDFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-		
-			serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
-
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-	}	
-	@Test
-	public void testNoInstarParams() {
-			try {
-
-
-				String propertyfileName = "APPC/ProcessParameterDefinition/NoInstarParams.properties";
-				Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-				
-			
-				serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
-
-				
-				
-				// Register Call graphs
-				String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-				GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-				DGTestCase tc = new DGTestCase(graphKey);
-				tc.setInjectGraphXmls(injectGraphXmls);
-				tc.setServiceReferences(serviceReferences);
-				tc.setPropertyfileName(propertyfileName);
-				
-
-				SvcLogicContext ctx = new SvcLogicContext();
-				processTestCase(tc, ctx);
-				
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-	}
-	
-	
-	@Test
-	public void testGetInstarParamsFail() {
-			try {
-
-
-				String propertyfileName = "APPC/ProcessParameterDefinition/GetInstarParamsFail.properties";
-				Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-				
-			
-								
-				
-				// Register Call graphs
-				String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-				GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-				DGTestCase tc = new DGTestCase(graphKey);
-				tc.setInjectGraphXmls(injectGraphXmls);
-				tc.setServiceReferences(serviceReferences);
-				tc.setPropertyfileName(propertyfileName);
-				
-
-				SvcLogicContext ctx = new SvcLogicContext();
-				processTestCase(tc, ctx);
-				
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-	}
-	
-	
-	@Test
-	public void testMergeParamsFail() {
-			try {
-
-
-				String propertyfileName = "APPC/ProcessParameterDefinition/MergeParamsFail.properties";
-				Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-				
-			
-								
-				
-				// Register Call graphs
-				String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-				GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-				DGTestCase tc = new DGTestCase(graphKey);
-				tc.setInjectGraphXmls(injectGraphXmls);
-				tc.setServiceReferences(serviceReferences);
-				tc.setPropertyfileName(propertyfileName);
-				
-
-				SvcLogicContext ctx = new SvcLogicContext();
-				processTestCase(tc, ctx);
-				
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-	}
-	
-	
-	@Test
-	public void testSaveMdSal() {
-		try {
-
-
-			String propertyfileName = "APPC/ProcessParameterDefinition/SaveMdsalFail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
-
-			
-		
-			serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
-
-			
-			
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { getProcessPDXML };
-
-
-			GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			
-
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
-			
-			//System.out.println(ctx.getAttribute("tmp.allParams.configuration-parameters"));
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-*/	
+
+    @Test
+    public void testProcessPD() {
+        try {
+
+
+            String propertyfileName = "APPC/ProcessParameterDefinition/ProcessPD.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+            //System.out.println(ctx.getAttribute("tmp.allParams.configuration-parameters"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+
+
+    @Test
+    public void testGetPDFail() {
+        try {
+
+
+            String propertyfileName = "APPC/ProcessParameterDefinition/GetPDFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+    @Test
+    public void testNoInstarParams() {
+            try {
+
+
+                String propertyfileName = "APPC/ProcessParameterDefinition/NoInstarParams.properties";
+                Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+                serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
+
+
+
+                // Register Call graphs
+                String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+                GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+                DGTestCase tc = new DGTestCase(graphKey);
+                tc.setInjectGraphXmls(injectGraphXmls);
+                tc.setServiceReferences(serviceReferences);
+                tc.setPropertyfileName(propertyfileName);
+
+
+                SvcLogicContext ctx = new SvcLogicContext();
+                processTestCase(tc, ctx);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+    }
+
+
+    @Test
+    public void testGetInstarParamsFail() {
+            try {
+
+
+                String propertyfileName = "APPC/ProcessParameterDefinition/GetInstarParamsFail.properties";
+                Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+
+                // Register Call graphs
+                String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+                GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+                DGTestCase tc = new DGTestCase(graphKey);
+                tc.setInjectGraphXmls(injectGraphXmls);
+                tc.setServiceReferences(serviceReferences);
+                tc.setPropertyfileName(propertyfileName);
+
+
+                SvcLogicContext ctx = new SvcLogicContext();
+                processTestCase(tc, ctx);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+    }
+
+
+    @Test
+    public void testMergeParamsFail() {
+            try {
+
+
+                String propertyfileName = "APPC/ProcessParameterDefinition/MergeParamsFail.properties";
+                Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+
+
+                // Register Call graphs
+                String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+                GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+                DGTestCase tc = new DGTestCase(graphKey);
+                tc.setInjectGraphXmls(injectGraphXmls);
+                tc.setServiceReferences(serviceReferences);
+                tc.setPropertyfileName(propertyfileName);
+
+
+                SvcLogicContext ctx = new SvcLogicContext();
+                processTestCase(tc, ctx);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+    }
+
+
+    @Test
+    public void testSaveMdSal() {
+        try {
+
+
+            String propertyfileName = "APPC/ProcessParameterDefinition/SaveMdsalFail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+
+
+            serviceReferences.put("org.onap.sdnc.config.params.parser.PropertyDefinitionNode", new org.onap.sdnc.config.params.parser.PropertyDefinitionNode());
+
+
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { getProcessPDXML };
+
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "ProcessParameterDefinition", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+
+
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
+
+            //System.out.println(ctx.getAttribute("tmp.allParams.configuration-parameters"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+*/
 }
 
 
 
-	
+
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
index b00194d7a..8f20df720 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestPublishConfiguration.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
index c85bfb3f7..f2399729e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSaveRunningConfig.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -51,100 +55,100 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 
 public class TestSaveRunningConfig /* extends AbstractDGTestCase */{
-	//private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestSaveRunningConfig.class);
-	public static String SaveRunningConfigXML = "src/main/resources/xml/APPC_SaveRunningConfig.xml";
+    //private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestSaveRunningConfig.class);
+    public static String SaveRunningConfigXML = "src/main/resources/xml/APPC_SaveRunningConfig.xml";
 
 /*
 
 
-	@Test
-	public void testSaveRunningConfigSuccess() {
-		try {
+    @Test
+    public void testSaveRunningConfigSuccess() {
+        try {
+
+            String propertyfileName = "APPC/SaveRunningConfig/SaveRunningConfig_Success.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			String propertyfileName = "APPC/SaveRunningConfig/SaveRunningConfig_Success.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-	
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 
 
 
-	@Test
-	public void testSaveRunningConfigFailure() {
-		try {
+    @Test
+    public void testSaveRunningConfigFailure() {
+        try {
 
-			String propertyfileName = "APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            String propertyfileName = "APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
-	@Test
-	public void testSaveRunningUploadConfigFailure() {
-		try {
+    @Test
+    public void testSaveRunningUploadConfigFailure() {
+        try {
 
-			String propertyfileName = "APPC/SaveRunningConfig/UploadConfig_Failure.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            String propertyfileName = "APPC/SaveRunningConfig/UploadConfig_Failure.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SaveRunningConfigXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "SaveRunningConfig", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 
 */
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
index 4f7dc5cf1..943edf2c1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestSetStatus.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -51,102 +55,102 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 
 public class TestSetStatus /* extends AbstractDGTestCase */ {
-	//private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestSetStatus.class);
-	public static String SetStatusXML = "src/main/resources/xml/APPC_SetStatus.xml";
+    //private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestSetStatus.class);
+    public static String SetStatusXML = "src/main/resources/xml/APPC_SetStatus.xml";
 
 
 /*
-	@Test
-	public void testSetStatusSuccess() {
-		try {
+    @Test
+    public void testSetStatusSuccess() {
+        try {
+
+            String propertyfileName = "APPC/SetStatus/SetStatus_Success.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-			String propertyfileName = "APPC/SetStatus/SetStatus_Success.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SetStatusXML };
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SetStatusXML };
 
+            GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-	
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 
 
 
-	@Test
-	public void testSetStatusAaiFailure() {
-		try {
+    @Test
+    public void testSetStatusAaiFailure() {
+        try {
 
-			String propertyfileName = "APPC/SetStatus/SetStatus_AaiFailure.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            String propertyfileName = "APPC/SetStatus/SetStatus_AaiFailure.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SetStatusXML };
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SetStatusXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 
-	@Test
-	public void testSetStatusFailure() {
-		try {
+    @Test
+    public void testSetStatusFailure() {
+        try {
 
-			String propertyfileName = "APPC/SetStatus/SetStatus_SaveRunningFailure.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            String propertyfileName = "APPC/SetStatus/SetStatus_SaveRunningFailure.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { SetStatusXML };
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { SetStatusXML };
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            GraphKey  graphKey = new GraphKey("APPC", null, "SetStatus", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 
 */
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
index e8733b54e..9eed43e8b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/TestUpdateAaiInfo.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -52,115 +56,115 @@ import org.onap.ccsdk.sli.core.sli.provider.SvcLogicAdaptorFactory;
 
 
 public class TestUpdateAaiInfo /* extends AbstractDGTestCase */ {
-	//private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
-	private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestUpdateAaiInfo.class);
-	public static String UpdateAaiInfoXML = "src/main/resources/xml/APPC_UpdateAaiInfo.xml";
+    //private final static Logger logger = LoggerFactory.getLogger(TestGetParams.class);
+    private static final EELFLogger logger = EELFManager.getInstance().getLogger(TestUpdateAaiInfo.class);
+    public static String UpdateAaiInfoXML = "src/main/resources/xml/APPC_UpdateAaiInfo.xml";
 
 /*
 
-	@Test
-	public void testUpdateAaiInfoSuccess() {
-		try {
+    @Test
+    public void testUpdateAaiInfoSuccess() {
+        try {
+
+            String propertyfileName = "APPC/UpdateAaiInfo/Update_Success.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
+
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
+
+
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+
+
+            resourceReferences.put("org.openecomp.sdnc.sli.aai.AAIService", new MockAaiResource());
+
+            GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
+            tc.setResourceReferences(resourceReferences);
 
-			String propertyfileName = "APPC/UpdateAaiInfo/Update_Success.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
 
-			
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-			
-			resourceReferences.put("org.onap.ccsdk.sli.adaptors.aai.AAIService", new MockAaiResource());
+    }
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
-			tc.setResourceReferences(resourceReferences);
 
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
+    @Test
+    public void testUpdateAaiInfoFail() {
+        try {
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+            String propertyfileName = "APPC/UpdateAaiInfo/Update_Fail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-	}
 
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
 
-	@Test
-	public void testUpdateAaiInfoFail() {
-		try {
 
-			String propertyfileName = "APPC/UpdateAaiInfo/Update_Fail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
+            GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
 
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
 
-			
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-			
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-		
+    }
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
 
-	}
 
+    @Test
+    public void testGetVnfcRefFail() {
+        try {
 
+            String propertyfileName = "APPC/UpdateAaiInfo/GetVnfcRef_Fail.properties";
+            Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
-	@Test
-	public void testGetVnfcRefFail() {
-		try {
 
-			String propertyfileName = "APPC/UpdateAaiInfo/GetVnfcRef_Fail.properties";
-			Map<String, Object> serviceReferences = new HashMap<String, Object>();
 
+            // Register Call graphs
+            String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
 
 
-			// Register Call graphs
-			String injectGraphXmls[] = new String[] { UpdateAaiInfoXML };
+            GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
+            DGTestCase tc = new DGTestCase(graphKey);
+            tc.setInjectGraphXmls(injectGraphXmls);
+            tc.setServiceReferences(serviceReferences);
+            tc.setPropertyfileName(propertyfileName);
 
+            Map<String, Object> resourceReferences = new HashMap<String, Object>();
+            tc.setResourceReferences(resourceReferences);
 
-			GraphKey  graphKey = new GraphKey("APPC", null, "UpdateAaiInfo", null);
-			DGTestCase tc = new DGTestCase(graphKey);
-			tc.setInjectGraphXmls(injectGraphXmls);
-			tc.setServiceReferences(serviceReferences);
-			tc.setPropertyfileName(propertyfileName);
+            SvcLogicContext ctx = new SvcLogicContext();
+            processTestCase(tc, ctx);
 
-			Map<String, Object> resourceReferences = new HashMap<String, Object>();
-			tc.setResourceReferences(resourceReferences);
-			
-			SvcLogicContext ctx = new SvcLogicContext();
-			processTestCase(tc, ctx);
 
-		
 
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	}
+    }
 
 */
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
index 9f93b51a9..6d23d13ff 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockAaiResource.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
index 4d2e4c9b4..7c2247a26 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockConfigureNodeExecutor.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
index aeea98a97..c53e56689 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/java/org/onap/appc/dg/mock/instance/MockSvcLogicJavaPlugin.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
index 46532299b..4fc913f5b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,20 +17,22 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD =
 
 
 
 
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=failure
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=
 
 
 
@@ -37,5 +41,5 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=
 assertEquals.error-code=401
 assertEquals.error-message=Configuration Failed. No configuration success or error file found on the device
 assertEquals.i=9
-			
+
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
index 48a2313b0..9398aec37 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,27 +17,24 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD =
 
 
 input.configfilereference-success.TARGET-FILE-PATH=/tmp
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=
 
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.fullPathFileName=/tmp
 
-
-
-
 assertEquals.error-code=400
 assertEquals.error-message=SUCCESS - request has been processed successfully
 assertEquals.i=1
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties
index 0d5ddc8db..23aa92996 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.configfilereference-success.TARGET-FILE-PATH=SuccessFile
 input.configfilereference-failure.TARGET-FILE-PATH=FailureFile
 
-input.vnf-host-ip-address=135.2.2.2
+input.vnf-host-ip-address=
 
 
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
index 300010200..a086e175e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.configfilereference-success.TARGET-FILE-PATH=SuccessFile
 input.configfilereference-failure.TARGET-FILE-PATH=FailureFile
 input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile
-input.vnf-host-ip-address=135.1.1.1
+input.vnf-host-ip-address=
 input.fileContents=ERRORLOG
 org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure
 org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
index ee2d47f11..e02578d00 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.configfilereference-success.TARGET-FILE-PATH=SuccessFile
 input.configfilereference-failure.TARGET-FILE-PATH=FailureFile
 input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile
-input.vnf-host-ip-address=135.1.1.1
+input.vnf-host-ip-address=
 
 input.fileContents=ERRORLOG
 org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
index e13c68845..24ed8a213 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_json_config.json
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties
index 12ea74d92..7c34b8196 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
index a4a43f041..914a3d838 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_parameters_config.json
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties
index 4a9398b25..e7a3e9edf 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties
index f7866ca95..de51645ef 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD =
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -39,13 +43,12 @@ APPC.DownloadIsbcConfig.outCome=failure
 APPC.GenerateConfig.outCome=success
 
 
-assertEquals.host-ip-address=135.1.1.1
-assertEquals.device-login=root
-			
-assertEquals.device-password=!bootstrap
+assertEquals.host-ip-address=
+assertEquals.device-login=
+
+assertEquals.device-password=
 assertEquals.port-number=22
 assertEquals.protocol=CLI
 assertEquals.device-config=DUMMYFILECONTENT
 assertEquals.tmp.message=Download Failure : 401 : ISBC Config Failed
-			
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties
index a6d9f747f..86270457f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,21 +17,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
 
 input.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig
 
-
-
 # DG  properties
 APPC.DownloadIsbcConfig.outCome=success
 APPC.GenerateConfig.outCome=success
@@ -37,12 +39,9 @@ APPC.GenerateConfig.outCome=success
 APPC.ProcessParameterDefinition.outCome=success
 
 assertEquals.error-code=400
-assertEquals.host-ip-address=135.1.1.1
-assertEquals.device-login=root
-			
-assertEquals.device-password=!bootstrap
+assertEquals.host-ip-address=
+assertEquals.device-login=
+assertEquals.device-password=
 assertEquals.port-number=22
 assertEquals.protocol=CLI
 assertEquals.device-config=DUMMYFILECONTENT
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
index a7c315e5c..0c19c9f6a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=template
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -40,13 +44,11 @@ APPC.GenerateTemplateConfig.outCome=success
 #ProcessParameterDefinition
 APPC.ProcessParameterDefinition.outCome=success
 
-assertEquals.host-ip-address=135.1.1.1
-assertEquals.device-login=root
-			
-assertEquals.device-password=!bootstrap
+assertEquals.host-ip-address=
+assertEquals.device-login=
+
+assertEquals.device-password=
 assertEquals.port-number=22
 assertEquals.protocol=CLI
 assertEquals.device-config=DUMMYFILECONTENT
 assertEquals.tmp.message=Download Failure : 401 : ISBC Config Failed
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
index 942c6e759..401b05eeb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=template
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -39,12 +43,9 @@ APPC.GenerateTemplateConfig.outCome=success
 APPC.ProcessParameterDefinition.outCome=success
 
 assertEquals.error-code=400
-assertEquals.host-ip-address=135.1.1.1
-assertEquals.device-login=root
-			
-assertEquals.device-password=!bootstrap
+assertEquals.host-ip-address=
+assertEquals.device-login
+assertEquals.device-password=
 assertEquals.port-number=22
 assertEquals.protocol=CLI
 assertEquals.device-config=DUMMYFILECONTENT
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties
index de7c0eb5d..ee865fab3 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,21 +17,20 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
 
-
-
-
 APPC.GenerateConfig.outCome=failure
 
 assertNull.host-ip-address
@@ -38,8 +39,3 @@ assertNull.device-password
 assertNull.port-number
 assertNull.protocol
 assertNull.device-config
-
-
-
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
index e1c73635d..e219ba0aa 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,14 +17,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.config-type=template
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -40,8 +44,3 @@ assertNull.device-password
 assertNull.port-number
 assertNull.protocol
 assertNull.device-config
-
-
-
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
index 88243026a..c82a42de1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -26,7 +30,3 @@ org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure
 org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.error-message=Unable to get template
 assertEquals.error-code=401
 assertEquals.error-message=Unable to get template
-
-
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
index 9e85c51a6..a9c786dbe 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.device-config=tcfile:///cli_config_content.txt
-input.host-ip-address=135.1.1.1
-input.device-login=root
-input.device-password = !bootstrap
+input.host-ip-address=
+input.device-login=
+input.device-password = 
 input.port-number = 22
 input.vnf-type = vUSP - Metaswitch vSBC
 
@@ -36,5 +40,3 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-message =
 
 assertEquals.error-code=401
 assertNotNull.error-message
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
index f99882843..f3bd5187e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +17,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 input.device-config=tcfile:///cli_config_content.txt
-input.host-ip-address=135.1.1.1
-input.device-login=root
-input.device-password = !bootstrap
+input.host-ip-address=
+input.device-login=
+input.device-password =
 input.port-number = 22
 input.vnf-type = vUSP - Metaswitch vSBC
 
@@ -34,5 +38,3 @@ download-config-template.outCome=FAILURE
 
 assertEquals.error-code=401
 assertNotNull.error-message
-			
-
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
index fd682a90f..ada0196c9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,14 +17,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 # To initialise DG Context before execution
-#   input.<Context Variable Name>= XXXXX	
-input.host-ip-address=135.1.1.1
-input.device-login=root
-input.device-password = !bootstrap
+#   input.<Context Variable Name>= XXXXX
+input.host-ip-address=
+input.device-login=
+input.device-password = 
 input.port-number = 22
 input.vnf-type = vUSP - Metaswitch vSBC
 # To populate the context variable from file content
@@ -31,18 +35,18 @@ input.device-config=tcfile:///cli_config_content.txt
 # SQL Resource Node
 #----------------------------
 #<get-resource
-#	plugin='org.onap.ccsdk.sli.resource.sql.SqlResource' 
-#	resource='SQL'
-#	key="SELECT TEMPLATE FROM DOWNLOAD_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;"
+#plugin='org.onap.ccsdk.sli.resource.sql.SqlResource' 
+#  resource='SQL'
+#  key="SELECT TEMPLATE FROM DOWNLOAD_CONFIG_TEMPLATE WHERE vnf_type = $vnf-type ;"
 #   force='true'
-#	pfx='download-config-template'>
+#   pfx='download-config-template'>
 
-# 	To define the SQL execution Status <Prefix>.outCome= SUCCESS | FAILURE | NOT_FOUND	
+#   To define the SQL execution Status <Prefix>.outCome= SUCCESS | FAILURE | NOT_FOUND
 download-config-template.outCome=SUCCESS
-# 	To assert SQL execution node context param <Prefix>.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+#   To assert SQL execution node context param <Prefix>.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 download-config-template.assertEquals.vnf-type = vUSP - Metaswitch vSBC
-# 	To Populate the SQL executionoutput  <Prefix>.<Context Variable Name>= XXXXX, In this case 
-# after executing SQL query, I expect the response should be stored in the DG context variable name	download-config-template.TEMPLATE
+#   To Populate the SQL executionoutput  <Prefix>.<Context Variable Name>= XXXXX, In this case 
+# after executing SQL query, I expect the response should be stored in the DG context variable name download-config-template.TEMPLATE
 download-config-template.download-config-template.TEMPLATE=tcfile:///download_cli_config_template.txt
 
 # Configure Node
@@ -56,14 +60,13 @@ download-config-template.download-config-template.TEMPLATE=tcfile:///download_cl
 #<parameter name="Port_number" value="`$port-number`" />
 
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=success
-# 	To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+#   To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.params.assertEquals.Port_number=22
-# 	To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+# To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.assertEquals.vnf-type = vUSP - Metaswitch vSBC
 
-# 	To assert DG Context after execution
-# <assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+# To assert DG Context after execution
+# <assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 assertNull.error-code
 assertNull.error-message
-			
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
index bebcabd76..c15625119 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
index 41c78827d..a4481ca19 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,22 +17,24 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
 
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.deviceconfig-file-content=DUMMYFILECONTENT
 input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp
 
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
 
@@ -38,8 +42,6 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathF
 APPC.CheckConfigStatus.outCome=success
 
 
-
 assertNull.error-code
 assertNull.error-message
-			
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
index b512dd607..074564341 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,21 +17,23 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
-input.vnf-host-ip-address=135.1.1.1
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.vnf-host-ip-address=
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.deviceconfig-file-content=DUMMYFILECONTENT
 input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success
 
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=failure
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root
-org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=
+org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT
 org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties
index 071330213..4aeac16a5 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties
index 42861fe49..cc5ad5cb1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -25,6 +29,3 @@ assertEquals.file-category=device_configuration
 assertEquals.file-category1=configuration_block
 assertEquals.file-category2=config_data
 assertNotNull.tmp.merge.mergedData
-
-	
-			
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties
index bb9961997..43cd9d029 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties
index f1525f932..079db234e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
index 4ad130021..eeb21b820 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
index f2ae11299..859ff4f6d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
index 48d5d0aa1..5958c9476 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
index 24d6e11ac..aa1752fb0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -29,8 +33,8 @@ input.input.payload=tcfile://payload_json_config.json
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
@@ -42,7 +46,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi
 APPC.GetAaiInfo.outCome=success
 
 assertNull.config-type
-assertEquals.device-authentication.USER-NAME=root
+assertEquals.device-authentication.USER-NAME=
 assertEquals.template-name=
 assertNotNull.configuration
 assertNotNull.configuration-params
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
index f10ec5041..cc34b65c0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -32,8 +36,8 @@ APPC.GetAaiInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
@@ -44,9 +48,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi
 
 
 assertNull.config-type
-assertEquals.device-authentication.USER-NAME=root
+assertEquals.device-authentication.USER-NAME=
 assertEquals.template-name=
 assertNotNull.configuration
 assertNotNull.configuration-params
-
-	
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
index db34ea296..4422539a1 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -38,10 +42,3 @@ assertEquals.template-name=
 assertEquals.configuration-params=
 assertEquals.error-code=401
 assertEquals.error-message=getCommonConfigInfoFailure
-
-
-
-
-
-
-			
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
index cf443cd03..7ab5a959e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -31,8 +35,8 @@ APPC.GetAaiInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
@@ -42,5 +46,5 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 assertEquals.config-type=template
-assertEquals.device-authentication.USER-NAME=root
+assertEquals.device-authentication.USER-NAME=
 assertNotNull.configuration-params
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
index b6dea196b..55f10210d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -32,7 +36,3 @@ org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.outCome
 org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.tmp.convertnode.error-message=Conversion to DG Context Failed
 assertEquals.error-code=401
 assertEquals.error-message=Conversion to DG Context Failed
-
-
-
-			
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
index 957369e2b..c26de252b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -26,14 +30,12 @@ input.input.api-ver=2.11
 input.input.action=Configure
 input.input.payload=tcfile://payload_restore_config.json
 
-
-
 APPC.GetAaiInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
@@ -42,12 +44,8 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
-
 assertEquals.config-type=template
-assertEquals.device-authentication.USER-NAME=root
+assertEquals.device-authentication.USER-NAME=
 assertEquals.template-name=
 assertNull.configuration
 assertEquals.configuration-params=
-
-
-			
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
index 16353d0a0..10a6e736d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -31,8 +35,8 @@ APPC.GetAaiInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
@@ -42,5 +46,5 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi
 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig
 
 assertEquals.config-type=template
-assertEquals.device-authentication.USER-NAME=root
+assertEquals.device-authentication.USER-NAME=
 assertEquals.template-name=vISBC-ssc-change_template1
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
index a280c2a11..084f5d41f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -24,8 +28,8 @@ input.config.vnf-type=
 input.config.vnf-name=
 input.config.protocol=CHEF
 input.config.host-ip-address=localhost
-input.config.user-name=brinda
-input.config.password=brinda123
+input.config.user-name=
+input.config.password=
 input.config.port-number=80
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=failure
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
index baa96ecc5..382eae432 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -24,8 +28,8 @@ input.config.vnf-type=
 input.config.vnf-name=
 input.config.protocol=CHEF
 input.config.host-ip-address=localhost
-input.config.user-name=brinda
-input.config.password=brinda123
+input.config.user-name=
+input.config.password=
 input.config.port-number=80
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=Other
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
index e3336e666..0146fc0d7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -24,8 +28,8 @@ input.config.vnf-type=
 input.config.vnf-name=
 input.config.protocol=CHEF
 input.config.host-ip-address=localhost
-input.config.user-name=brinda
-input.config.password=brinda123
+input.config.user-name=
+input.config.password=
 input.config.port-number=80
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
index e3336e666..0146fc0d7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -24,8 +28,8 @@ input.config.vnf-type=
 input.config.vnf-name=
 input.config.protocol=CHEF
 input.config.host-ip-address=localhost
-input.config.user-name=brinda
-input.config.password=brinda123
+input.config.user-name=
+input.config.password=
 input.config.port-number=80
 
 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties
index e8538078d..da13b3460 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties
index 34964c575..2eccdf06a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
index 593a88c68..098fa30ec 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
index 4739c8796..ca50870ab 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
index 7428353ce..3926b35f9 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
index 9eae0a0e8..41b1de872 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -22,7 +26,4 @@ input.configuration-params=tcfile://request-param.json
 org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success
 org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://noinstarparams_pd.yaml
 
-
-
-assertEquals.configuration-params={	"LOCAL_ACCESS_IP_ADDR": "192.168.30.1",	"LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"}
-
+assertEquals.configuration-params={ "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", "LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"}
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
index 0983c5b94..3581c622e 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -29,15 +33,15 @@ org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
 org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
 
 
-#To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+#To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=success
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
-org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
 org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
 org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true
 
-assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
 assertEquals.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"]
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
index fd7140540..cbc9296f8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -29,17 +33,17 @@ org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success
 org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json
 
 
-#To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX	
+#To assert execution/configure node context param <Plugin Name>.<Key / Method Name>.params.<assertEquals | assertNull | assertNull >.<Context Variable Name>= XXXXX
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=failure
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.tmp.mdSalSave.ERROR_MESSAGE=MDSAL ERROR
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234
 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid
-org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
 org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true
 org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true
 
-assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
+assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"}
 
 assertEquals.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"]
 assertEquals.dcae-error-message=MDSAL ERROR
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
index da4160121..93516e580 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
index b094a6791..0168b477f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
index 324b3d234..6979b464d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001
 input.vm-name=ibcx0001vm001
 input.vnf-type=ISBC
 
-input.vnf-host-ip-address=135.1.1.1
+input.vnf-host-ip-address=
 
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -46,10 +50,10 @@ assertEquals.config.vm-name=ibcx0001vm001
 
 assertEquals.config.vnf-type=ISBC
 
-assertEquals.config.host-ip-address=135.1.1.1
+assertEquals.config.host-ip-address=
 
-assertEquals.config.user-name=root
-assertEquals.config.password = !bootstrap
+assertEquals.config.user-name=
+assertEquals.config.password = 
 assertEquals.config.port-number = 22
 assertEquals.config.protocol = CLI
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
index f20421be0..4d6b0aa8f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001
 input.vm-name=ibcx0001vm001
 input.vnf-type=ISBC
 
-input.vnf-host-ip-address=135.1.1.1
+input.vnf-host-ip-address=
 
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -50,10 +54,10 @@ assertEquals.config.vm-name=ibcx0001vm001
 
 assertEquals.config.vnf-type=ISBC
 
-assertEquals.config.host-ip-address=135.1.1.1
+assertEquals.config.host-ip-address=
 
-assertEquals.config.user-name=root
-assertEquals.config.password = !bootstrap
+assertEquals.config.user-name=
+assertEquals.config.password = 
 assertEquals.config.port-number = 22
 assertEquals.config.protocol = CLI
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
index 3488888a2..952b321fb 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001
 input.vm-name=ibcx0001vm001
 input.vnf-type=ISBC
 
-input.vnf-host-ip-address=135.1.1.1
+input.vnf-host-ip-address=
 
-input.device-authentication.USER-NAME=root
-input.device-authentication.PASSWORD = !bootstrap
+input.device-authentication.USER-NAME=
+input.device-authentication.PASSWORD = 
 input.device-authentication.PORT-NUMBER = 22
 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI
 input.deviceconfig-file-content=DUMMYFILECONTENT
@@ -48,10 +52,10 @@ assertEquals.config.vm-name=ibcx0001vm001
 
 assertEquals.config.vnf-type=ISBC
 
-assertEquals.config.host-ip-address=135.1.1.1
+assertEquals.config.host-ip-address=
 
-assertEquals.config.user-name=root
-assertEquals.config.password = !bootstrap
+assertEquals.config.user-name=
+assertEquals.config.password = 
 assertEquals.config.port-number = 22
 assertEquals.config.protocol = CLI
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
index 9e41c78d9..80f6eec5d 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
index dcb6b813b..2ad66d06b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
index 2018e5a37..86543eeb8 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
index 83b82aa05..541244835 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
index 55c6243cd..dc47df5e0 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
index f84571f7d..18cf9dc36 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties
index fba26b34a..037e4ca15 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
index b65597f50..6e6659c29 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
@@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_json_config.json
 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success
 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3
 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root
-com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap
+com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=
+com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD =
 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22
 
 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties
index 225e304b5..1b434fd29 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json
index 6d053cf7d..b5341f20b 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-		"LOCAL_CORE_ALT_IP_ADDR": "DummyInstarIP1",
-		"REMOTE_ACCESS_IP_ADDR": "DummyInstarIP2"
-		
+    "LOCAL_CORE_ALT_IP_ADDR": "DummyInstarIP1",
+    "REMOTE_ACCESS_IP_ADDR": "DummyInstarIP2"
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json
index 217f9d67c..fda4ef690 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json
@@ -1,60 +1,40 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"pair-number": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"pair-number": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		]
-	},
-	"configuration-parameters": {
-		"node0_hostname" : "appc-host",
-     "node0_backup_router_address": "2001:1890:1253::192:168:100:1",
-   "node0_tacplus_server_name1": "servername1",
-    "node0_tacplus_server_name2": "servername2"
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "192.168.16.3",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "SomePlace",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "192.168.1.1",
+                        "pair-number": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "pair-number": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ]
+    },
+    "configuration-parameters": {
+        "node0_hostname": "appc-host",
+        "node0_backup_router_address": "0:0:0::192:168:100:1",
+        "node0_tacplus_server_name1": "servername1",
+        "node0_tacplus_server_name2": "servername2"
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
index 8d872e173..9bd143c48 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json
@@ -1,98 +1,78 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"group-notation": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"group-notation": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		]
-	},
-	"configuration": {
-		"configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n"
-	},
-	"configuration-parameters": {
-		"LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
-		"LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"LOCAL_BILLING_IP_ADDR": "192.168.30.1",
-		"REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
-		"REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"REMOTE_BILLING_IP_ADDR": "192.168.30.1",
-		"CORE_NETWORK_PLEN": "32",
-		"CORE_NETWORK_ALT_PLEN": "126",
-		"CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
-		"CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"ACCESS_NETWORK_PLEN": "32",
-		"ACCESS_NETWORK_ALT_PLEN": "126",
-		"ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"BILLING_NETWORK_PLEN": "32",
-		"BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"VIRT_CORE_IP_ADDR": "135.25.69.147",
-		"VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_ACCESS_IP_ADDR": "135.25.69.147",
-		"VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_BILLING_IP_ADDR": "135.25.69.147",
-		"DNS_SERVERS": "135.25.69.147",
-		"SNMP_CLIENT_1": "135.25.69.147",
-		"SNMP_CLIENT_2": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
-		"BILLING_SERVER_1": "135.25.69.147",
-		"BILLING_SERVER_2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
-		"OAM_VIP_HOSTNAME": "135.25.69.147",
-		"DG_APP_SERVER1": "135.25.69.147",
-		"DG_APP_SERVER2": "135.25.69.147",
-		"CTS_IP_RANGE": "135.25.69.147",
-		"CTS_PREFIX_LENGTH": "26",
-		"LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
-		"LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "135.21.166.39",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "Middletown",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "12.1.1.1",
+                        "group-notation": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "group-notation": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ]
+    },
+    "configuration": {
+        "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n"
+    },
+    "configuration-parameters": {
+        "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
+        "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
+        "REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
+        "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
+        "CORE_NETWORK_PLEN": "32",
+        "CORE_NETWORK_ALT_PLEN": "126",
+        "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
+        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "ACCESS_NETWORK_PLEN": "32",
+        "ACCESS_NETWORK_ALT_PLEN": "126",
+        "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
+        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "BILLING_NETWORK_PLEN": "32",
+        "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
+        "VIRT_CORE_IP_ADDR": "135.25.69.147",
+        "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "VIRT_ACCESS_IP_ADDR": "135.25.69.147",
+        "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "VIRT_BILLING_IP_ADDR": "135.25.69.147",
+        "DNS_SERVERS": "135.25.69.147",
+        "SNMP_CLIENT_1": "135.25.69.147",
+        "SNMP_CLIENT_2": "135.25.69.147",
+        "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
+        "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
+        "BILLING_SERVER_1": "135.25.69.147",
+        "BILLING_SERVER_2": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
+        "OAM_VIP_HOSTNAME": "135.25.69.147",
+        "DG_APP_SERVER1": "135.25.69.147",
+        "DG_APP_SERVER2": "135.25.69.147",
+        "CTS_IP_RANGE": "135.25.69.147",
+        "CTS_PREFIX_LENGTH": "26",
+        "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
+        "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
index e29080aab..d6b2ebbe7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json
@@ -1,104 +1,84 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"group-notation": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"group-notation": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		]
-	},
-	"configuration": {
-		"configuration-json": {
-			"config": {
-				"group": {
-					"interface": "interface1"
-				}
-			}
-		}
-	},
-	"configuration-parameters": {
-		"LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
-		"LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"LOCAL_BILLING_IP_ADDR": "192.168.30.1",
-		"REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
-		"REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"REMOTE_BILLING_IP_ADDR": "192.168.30.1",
-		"CORE_NETWORK_PLEN": "32",
-		"CORE_NETWORK_ALT_PLEN": "126",
-		"CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
-		"CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"ACCESS_NETWORK_PLEN": "32",
-		"ACCESS_NETWORK_ALT_PLEN": "126",
-		"ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"BILLING_NETWORK_PLEN": "32",
-		"BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"VIRT_CORE_IP_ADDR": "135.25.69.147",
-		"VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_ACCESS_IP_ADDR": "135.25.69.147",
-		"VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_BILLING_IP_ADDR": "135.25.69.147",
-		"DNS_SERVERS": "135.25.69.147",
-		"SNMP_CLIENT_1": "135.25.69.147",
-		"SNMP_CLIENT_2": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
-		"BILLING_SERVER_1": "135.25.69.147",
-		"BILLING_SERVER_2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
-		"OAM_VIP_HOSTNAME": "135.25.69.147",
-		"DG_APP_SERVER1": "135.25.69.147",
-		"DG_APP_SERVER2": "135.25.69.147",
-		"CTS_IP_RANGE": "135.25.69.147",
-		"CTS_PREFIX_LENGTH": "26",
-		"LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
-		"LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "135.21.166.39",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "Middletown",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "12.1.1.1",
+                        "group-notation": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "group-notation": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ]
+    },
+    "configuration": {
+        "configuration-json": {
+            "config": {
+                "group": {
+                    "interface": "interface1"
+                }
+            }
+        }
+    },
+    "configuration-parameters": {
+        "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
+        "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
+        "REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
+        "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
+        "CORE_NETWORK_PLEN": "32",
+        "CORE_NETWORK_ALT_PLEN": "126",
+        "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
+        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "ACCESS_NETWORK_PLEN": "32",
+        "ACCESS_NETWORK_ALT_PLEN": "126",
+        "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
+        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
+        "BILLING_NETWORK_PLEN": "32",
+        "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
+        "VIRT_CORE_IP_ADDR": "135.25.69.147",
+        "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "VIRT_ACCESS_IP_ADDR": "135.25.69.147",
+        "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
+        "VIRT_BILLING_IP_ADDR": "135.25.69.147",
+        "DNS_SERVERS": "135.25.69.147",
+        "SNMP_CLIENT_1": "135.25.69.147",
+        "SNMP_CLIENT_2": "135.25.69.147",
+        "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
+        "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
+        "BILLING_SERVER_1": "135.25.69.147",
+        "BILLING_SERVER_2": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
+        "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
+        "OAM_VIP_HOSTNAME": "135.25.69.147",
+        "DG_APP_SERVER1": "135.25.69.147",
+        "DG_APP_SERVER2": "135.25.69.147",
+        "CTS_IP_RANGE": "135.25.69.147",
+        "CTS_PREFIX_LENGTH": "26",
+        "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
+        "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json
index 968db23e3..fc39a4f24 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json
@@ -1,95 +1,75 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"pair-number": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"pair-number": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		]
-	},
-	"configuration-parameters": {
-		"LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
-		"LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"LOCAL_BILLING_IP_ADDR": "192.168.30.1",
-		"REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
-		"REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"REMOTE_BILLING_IP_ADDR": "192.168.30.1",
-		"CORE_NETWORK_PLEN": "32",
-		"CORE_NETWORK_ALT_PLEN": "126",
-		"CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
-		"CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"ACCESS_NETWORK_PLEN": "32",
-		"ACCESS_NETWORK_ALT_PLEN": "126",
-		"ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254",
-		"BILLING_NETWORK_PLEN": "32",
-		"BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147",
-		"VIRT_CORE_IP_ADDR": "135.25.69.147",
-		"VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_ACCESS_IP_ADDR": "135.25.69.147",
-		"VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254",
-		"VIRT_BILLING_IP_ADDR": "135.25.69.147",
-		"DNS_SERVERS": "135.25.69.147",
-		"SNMP_CLIENT_1": "135.25.69.147",
-		"SNMP_CLIENT_2": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147",
-		"SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147",
-		"BILLING_SERVER_1": "135.25.69.147",
-		"BILLING_SERVER_2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR1": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR2": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR3": "135.25.69.147",
-		"IMS_CORE_ALT_IP_ADDR4": "135.25.69.147",
-		"OAM_VIP_HOSTNAME": "135.25.69.147",
-		"DG_APP_SERVER1": "135.25.69.147",
-		"DG_APP_SERVER2": "135.25.69.147",
-		"CTS_IP_RANGE": "135.25.69.147",
-		"CTS_PREFIX_LENGTH": "26",
-		"LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==",
-		"LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "192.168.16.3",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "SomePlace",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "192.168.1.1",
+                        "pair-number": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "pair-number": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ]
+    },
+    "configuration-parameters": {
+        "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
+        "LOCAL_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1",
+        "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
+        "REMOTE_ACCESS_IP_ADDR": "192.168.30.1",
+        "REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1",
+        "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
+        "CORE_NETWORK_PLEN": "32",
+        "CORE_NETWORK_ALT_PLEN": "126",
+        "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1",
+        "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "0:0:0:0:192:168:30:1",
+        "ACCESS_NETWORK_PLEN": "32",
+        "ACCESS_NETWORK_ALT_PLEN": "126",
+        "ACCESS_NETWORK_DEFAULT_GATEWAY": "192.168.6.14",
+        "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "0:0:0:0:192:168:30:1",
+        "BILLING_NETWORK_PLEN": "32",
+        "BILLING_NETWORK_DEFAULT_GATEWAY": "192.168.6.14",
+        "VIRT_CORE_IP_ADDR": "192.168.6.14",
+        "VIRT_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1",
+        "VIRT_ACCESS_IP_ADDR": "192.168.6.14",
+        "VIRT_ACCESS_ALT_IP_ADDR": "0:0:0:0:192:168:30:1",
+        "VIRT_BILLING_IP_ADDR": "192.168.6.14",
+        "DNS_SERVERS": "192.168.6.14",
+        "SNMP_CLIENT_1": "192.168.6.14",
+        "SNMP_CLIENT_2": "192.168.6.14",
+        "SNMP_COMMUNITY_STRING_CLIENT1": "192.168.6.14",
+        "SNMP_COMMUNITY_STRING_CLIENT2": "192.168.6.14",
+        "BILLING_SERVER_1": "192.168.6.14",
+        "BILLING_SERVER_2": "192.168.6.14",
+        "IMS_CORE_ALT_IP_ADDR1": "192.168.6.14",
+        "IMS_CORE_ALT_IP_ADDR2": "192.168.6.14",
+        "IMS_CORE_ALT_IP_ADDR3": "192.168.6.14",
+        "IMS_CORE_ALT_IP_ADDR4": "192.168.6.14",
+        "OAM_VIP_HOSTNAME": "192.168.6.14",
+        "DG_APP_SERVER1": "192.168.6.14",
+        "DG_APP_SERVER2": "192.168.6.14",
+        "CTS_IP_RANGE": "192.168.6.14",
+        "CTS_PREFIX_LENGTH": "26",
+        "LICENSE_KEY": "Abcdefghijklmnop123456789",
+        "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp"
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json
index 4f282963b..1d37cb476 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json
@@ -1,54 +1,34 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"pair-number": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"pair-number": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		]
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "192.168.16.3",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "SomePlace",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "192.168.1.1",
+                        "pair-number": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "pair-number": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ]
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json
index edd5be344..0ffd3000f 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json
@@ -1,56 +1,35 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-	"request-parameters": {
-		"vnf-type": "ISBC",
-		"vnf-host-ip-address": "135.21.166.39",
-		"service-instance-id": "ibcx0001vm001",
-		"site-location": "Middletown",
-		"vnf-name": "ibcx0001v",
-		"vm": [
-			{
-				"vm-name": "ibcx0001vm001",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm001ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"ipaddress-v4-oam-vip": "12.1.1.1",
-						"group-notation": "ibcx0001vm001ssc001pair"
-					}
-				]
-			},
-			{
-				"vm-name": "ibcx0001vm002",
-				"vnfc": [
-					{
-						"vnfc-name": "ibcx0001vm002ssc001",
-						"vnfc-function-code": "ssc",
-						"vnfc-type": "vISBC – ssc",
-						"group-notation": "ibcx0001vm002ssc001pair"
-					}
-				]
-			}
-		],
-		"template-name": "vISBC-ssc-change_template1"
-		
-	}
+    "request-parameters": {
+        "vnf-type": "ISBC",
+        "vnf-host-ip-address": "192.168.16.3",
+        "service-instance-id": "ibcx0001vm001",
+        "site-location": "SomePlace",
+        "vnf-name": "ibcx0001v",
+        "vm": [
+            {
+                "vm-name": "ibcx0001vm001",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm001ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "ipaddress-v4-oam-vip": "192.168.1.1",
+                        "group-notation": "ibcx0001vm001ssc001pair"
+                    }
+                ]
+            },
+            {
+                "vm-name": "ibcx0001vm002",
+                "vnfc": [
+                    {
+                        "vnfc-name": "ibcx0001vm002ssc001",
+                        "vnfc-function-code": "ssc",
+                        "vnfc-type": "vISBC – ssc",
+                        "group-notation": "ibcx0001vm002ssc001pair"
+                    }
+                ]
+            }
+        ],
+        "template-name": "vISBC-ssc-change_template1"
+    }
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json
index 68f9c9fe4..9db06586a 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json
@@ -1,21 +1,7 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-{	"LOCAL_ACCESS_IP_ADDR": "192.168.30.1",	"LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"}
+{
+    "LOCAL_ACCESS_IP_ADDR": "192.168.30.1",
+    "LOCAL_BILLING_IP_ADDR": "192.168.30.1",
+    "REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1",
+    "REMOTE_BILLING_IP_ADDR": "192.168.30.1",
+    "CORE_NETWORK_PLEN": "32"
+}
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json
index c1e17a17a..b12a9c5f7 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json
@@ -1,27 +1,6 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
 {
-   "node0_hostname" : "appc-host",
-     "node0_backup_router_address": "2001:1890:1253::192:168:100:1",
-   "node0_tacplus_server_name1": "servername1",
+    "node0_hostname": "appc-host",
+    "node0_backup_router_address": "0:0:0:0:192:168:100:1",
+    "node0_tacplus_server_name1": "servername1",
     "node0_tacplus_server_name2": "servername2"
-    
 }
diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml
index 8d8c89cb8..9729f7121 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml
+++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml
@@ -1,9 +1,11 @@
 <!--
   ============LICENSE_START=======================================================
-  ONAP : APP-C
+  ONAP : APPC
   ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
+  Copyright (C) 2017 Amdocs
+  =============================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
@@ -15,31 +17,33 @@
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
+  
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   ============LICENSE_END=========================================================
   -->
 
 <configuration xmlns="http://xml.juniper.net/xnm/1.1/xnm"
-	xmlns:a="http://xml.juniper.net/junos/15.1X49/junos">
-	<version>15.1X49-D50.3</version>
-	<groups>
-		<name>node0</name>
-		<system>
-			<host-name>$node0_hostname</host-name>
-			<backup-router>
-				<address>$node0_backup_router_address</address>
-				<destination>0.0.0.0/0</destination>
-			</backup-router>
-			<tacplus-server>
-				<name>$node0_tacplus_server_name1</name>
-				<source-address>$node0_tacplus_server_source_address1
-				</source-address>
-			</tacplus-server>
-			<tacplus-server>
-				<name>$node0_tacplus_server_name2</name>
-				<source-address>$node0_tacplus_server_source_address1
-				</source-address>
-			</tacplus-server>
-		</system>
-	</groups>
-	
+    xmlns:a="http://xml.juniper.net/junos/15.1X49/junos">
+    <version>15.1X49-D50.3</version>
+    <groups>
+        <name>node0</name>
+        <system>
+            <host-name>$node0_hostname</host-name>
+            <backup-router>
+                <address>$node0_backup_router_address</address>
+                <destination>0.0.0.0/0</destination>
+            </backup-router>
+            <tacplus-server>
+                <name>$node0_tacplus_server_name1</name>
+                <source-address>$node0_tacplus_server_source_address1
+                </source-address>
+            </tacplus-server>
+            <tacplus-server>
+                <name>$node0_tacplus_server_name2</name>
+                <source-address>$node0_tacplus_server_source_address1
+                </source-address>
+            </tacplus-server>
+        </system>
+    </groups>
+
 </configuration>
diff --git a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
index 519530eed..633dd94fd 100644
--- a/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
+++ b/appc-directed-graph/dg-loader/features/src/main/resources/features.xml
@@ -22,19 +22,19 @@
 
 
 <features name="sdnc-dg-loader-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
-	<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository>
-	<feature name='sdnc-dg-loader' description="SDNC DG Loader"
-		version='${project.version}'>
-		<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-		<feature>odl-mdsal-broker</feature>
-		<feature>sdnc-sli</feature>
-		<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
-		<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
-		<bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
-		<bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
-		<bundle>mvn:org.onap.appc.plugins/dg-loader-provider/${project.version}</bundle>
-	</feature>
+    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.version}/xml/features</repository>
+    <feature name='sdnc-dg-loader' description="SDNC DG Loader"
+        version='${project.version}'>
+        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
+        <feature>odl-mdsal-broker</feature>
+        <feature>sdnc-sli</feature>
+        <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
+        <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
+        <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle>
+        <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle>
+        <bundle>mvn:org.onap.appc.plugins/dg-loader-provider/${project.version}</bundle>
+    </feature>
 </features>
diff --git a/appc-directed-graph/dg-loader/provider/pom.xml b/appc-directed-graph/dg-loader/provider/pom.xml
index 8e124c70b..cb9e332f5 100644
--- a/appc-directed-graph/dg-loader/provider/pom.xml
+++ b/appc-directed-graph/dg-loader/provider/pom.xml
@@ -73,7 +73,7 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
        <dependency>
-		<groupId>org.powermock</groupId>
+        <groupId>org.powermock</groupId>
                 <artifactId>powermock-api-mockito</artifactId>
                 <version>1.6.4</version>
                 <scope>test</scope>
diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java
index db437a9b2..01f32d244 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java
+++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java
index 0d60a7135..f9722a04d 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java
+++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java
index ced6b007c..4e7e57406 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java
+++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java
@@ -1,8 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java
index 490a1f9bb..d88958239 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java
+++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java
@@ -1,8 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Copyright (C) 2017 Amdocs
  * =============================================================================
diff --git a/appc-directed-graph/dg-loader/provider/src/main/resources/adaptor.properties b/appc-directed-graph/dg-loader/provider/src/main/resources/adaptor.properties
index 367d25db0..205a8f884 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/resources/adaptor.properties
+++ b/appc-directed-graph/dg-loader/provider/src/main/resources/adaptor.properties
@@ -1,9 +1,11 @@
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,6 +17,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/dg-loader/provider/src/main/resources/js/dg_xml2json.js b/appc-directed-graph/dg-loader/provider/src/main/resources/js/dg_xml2json.js
index 052d75d21..00e347339 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/resources/js/dg_xml2json.js
+++ b/appc-directed-graph/dg-loader/provider/src/main/resources/js/dg_xml2json.js
@@ -1,9 +1,11 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
+ * ONAP : APPC
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
@@ -15,6 +17,8 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ * 
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
 
@@ -91,11 +95,11 @@ dgconverter.getNodeToXml = function (inputNodeSet) {
             xmlStr += node.xml;
             startTag = getStartTag(node);
           //special handling for break node
-			if(xmlStr != undefined && xmlStr != null && xmlStr.trim() == "<break>"){
-				fullXmlStr += "<break/>";
-			}else{	
-				fullXmlStr +=xmlStr;
-			}
+            if(xmlStr != undefined && xmlStr != null && xmlStr.trim() == "<break>"){
+                fullXmlStr += "<break/>";
+            }else{    
+                fullXmlStr +=xmlStr;
+            }
             /*
             if(level > 0){
                 var spacing = Array(level).join("  ");
@@ -137,9 +141,9 @@ dgconverter.getNodeToXml = function (inputNodeSet) {
 
         //append end tag
         if (startTag != "") {
-        	if(startTag != "break"){
-				fullXmlStr += "</" + startTag + ">";
-			}
+            if(startTag != "break"){
+                fullXmlStr += "</" + startTag + ">";
+            }
             /*
             if(level >0){
                 var spacing = Array(level).join("  ");
diff --git a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh
index da117361b..d12654282 100644
--- a/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh
+++ b/appc-directed-graph/dg-loader/provider/src/main/resources/scripts/dg_load_activate.sh
@@ -2,10 +2,12 @@
 
 ###
 # ============LICENSE_START=======================================================
-# ONAP : APP-C
+# ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property.  All rights reserved.
+# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
+# Copyright (C) 2017 Amdocs
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -17,6 +19,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
diff --git a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
index f3c10725e..d0964299b 100644
--- a/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
+++ b/appc-directed-graph/dg-loader/provider/src/test/java/org/onap/sdnc/dg/loader/MockSvcLogicDblibStore.java
@@ -59,19 +59,18 @@ public class MockSvcLogicDblibStore implements SvcLogicStore {
 
     }
 
-    @Override
+
     public void registerNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
 
     }
 
-    @Override
     public void unregisterNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
 
     }
 
-    @Override
+
     public boolean isValidNodeType(String nodeType) throws SvcLogicException {
         // TODO Auto-generated method stub
         return true;
@@ -81,12 +80,14 @@ public class MockSvcLogicDblibStore implements SvcLogicStore {
     public void delete(String module, String rpc, String version, String mode)
             throws SvcLogicException {
         // TODO Auto-generated method stub
-
     }
 
     @Override
     public void activate(SvcLogicGraph graph) throws SvcLogicException {
         // TODO Auto-generated method stub
-
+    }
+    public void activate(String module, String rpc, String version, String mode)
+            throws SvcLogicException {
+        // TODO Auto-generated method stub
     }
 }
diff --git a/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json b/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
index b56c8f64c..c6e82fc99 100644
--- a/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
+++ b/appc-directed-graph/dg-loader/provider/src/test/resources/json/Appc_UniTest.json
@@ -1,64 +1,78 @@
-[{
-  "id": "1606180e.6254c",
-  "type": "dgstart",
-  "name": "DGSTART",
-  "outputs": 1,
-  "x": 494.75,
-  "y": 149.75,
-  "z": "7174441c.9fb7f4",
-  "wires": [
-    ["f650067e.2ad7e"]
-  ]
-}, {
-  "id": "f650067e.2ad7e",
-  "type": "service-logic",
-  "name": "Appc 4.0.0",
-  "module": "Appc",
-  "version": "4.0.0",
-  "comments": "",
-  "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='Appc' version='4.0.0'>",
-  "outputs": 1,
-  "x": 642.75,
-  "y": 151.75,
-  "z": "7174441c.9fb7f4",
-  "wires": [
-    ["10b2117c.ee118f"]
-  ]
-}, {
-  "id": "e928ee64.3762c",
-  "type": "block",
-  "name": "block",
-  "xml": "<block>\n",
-  "atomic": "false",
-  "comments": "",
-  "outputs": 1,
-  "x": 952.75,
-  "y": 145.75,
-  "z": "7174441c.9fb7f4",
-  "wires": [
-    ["342ce050.4a2fe8"]
-  ]
-}, {
-  "id": "342ce050.4a2fe8",
-  "type": "returnSuccess",
-  "name": "return success",
-  "xml": "<return status='success'>\n\n",
-  "comments": "",
-  "x": 1115.75,
-  "y": 146.75,
-  "z": "7174441c.9fb7f4",
-  "wires": []
-}, {
-  "id": "10b2117c.ee118f",
-  "type": "method",
-  "name": "unitTest",
-  "xml": "<method rpc='unitTestDG' mode='sync'>\n",
-  "comments": "",
-  "outputs": 1,
-  "x": 815.75,
-  "y": 147.75,
-  "z": "7174441c.9fb7f4",
-  "wires": [
-    ["e928ee64.3762c"]
-  ]
-}]
+[
+    {
+        "id": "1606180e.6254c",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 494.75,
+        "y": 149.75,
+        "z": "7174441c.9fb7f4",
+        "wires": [
+            [
+                "f650067e.2ad7e"
+            ]
+        ]
+    },
+    {
+        "id": "f650067e.2ad7e",
+        "type": "service-logic",
+        "name": "Appc 4.0.0",
+        "module": "Appc",
+        "version": "4.0.0",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='Appc' version='4.0.0'>",
+        "outputs": 1,
+        "x": 642.75,
+        "y": 151.75,
+        "z": "7174441c.9fb7f4",
+        "wires": [
+            [
+                "10b2117c.ee118f"
+            ]
+        ]
+    },
+    {
+        "id": "e928ee64.3762c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 952.75,
+        "y": 145.75,
+        "z": "7174441c.9fb7f4",
+        "wires": [
+            [
+                "342ce050.4a2fe8"
+            ]
+        ]
+    },
+    {
+        "id": "342ce050.4a2fe8",
+        "type": "returnSuccess",
+        "name": "return success",
+        "xml": "<return status='success'>\n\n",
+        "comments": "",
+        "x": 1115.75,
+        "y": 146.75,
+        "z": "7174441c.9fb7f4",
+        "wires": []
+    },
+    {
+        "id": "10b2117c.ee118f",
+        "type": "method",
+        "name": "unitTest",
+        "xml": "<method rpc='unitTestDG' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 815.75,
+        "y": 147.75,
+        "z": "7174441c.9fb7f4",
+        "wires": [
+            [
+                "e928ee64.3762c"
+            ]
+        ]
+    }
+]
author	Skip Wonnell <skip@att.com>	2017-12-23 00:18:18 -0600
committer	Patrick Brady <pb071s@att.com>	2018-01-03 18:57:22 +0000
commit	caa5768a32a385bf7997029929f29fe3b156348e (patch)
tree	15e5671b75577de5cd19473eea278c3f731d9e7a /appc-directed-graph
parent	e7752e8d2dd4e4460bf68a7b36548282cc68d0e9 (diff)