From: Balaji, Ramya (rb111y) <rb111y@att.com>
Date: Sun, 20 Jan 2019 02:28:38 +0000 (-0500)
Subject: Network Inventory Cient Platform Hardening
X-Git-Tag: 1.5.0~348
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0e9e5821fbd918fb9b33ad8ba5d311e7f527bcab;hp=763734c4d961b06b45f0de2d2247bd2c632c3176;p=appc.git

Network Inventory Cient Platform Hardening

Renamed class files to be more meaningful
and synched up directories

Issue-ID: APPC-1338
Change-Id: I5eee7c96013e8733fb14e4b0a1de88d4c9611a0f
Signed-off-by: Balaji, Ramya (rb111y) <rb111y@att.com>
---

diff --git a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
index a4f4ca47c..4d37707a4 100644
--- a/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
+++ b/appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
@@ -1,1053 +1,1053 @@
 [{
-    "id": "ad8bbbec.77e128",
-    "type": "dgstart",
-    "name": "DGSTART",
-    "outputs": 1,
-    "x": 199.5,
-    "y": 56.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["cf7a2c1.c37d09"]]
-},
-{
-    "id": "cf7a2c1.c37d09",
-    "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": 351.5,
-    "y": 59.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["def7f63d.6ecef8"]]
-},
-{
-    "id": "def7f63d.6ecef8",
-    "type": "method",
-    "name": "method ProcessParametersDefinition",
-    "xml": "<method rpc='ProcessParameterDefinition' mode='sync'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 606.5,
-    "y": 58.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["3065cea9.b1e06e"]]
-},
-{
-    "id": "3065cea9.b1e06e",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 227.5,
-    "y": 118.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["569d4b14.244ee4"]]
-},
-{
-    "id": "569d4b14.244ee4",
-    "type": "execute",
-    "name": "execute getTemplate Parameter_definition",
-    "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_definitions\" />\n<parameter name=\"responsePrefix\" value=\"parameter-definitions\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 542.5,
-    "y": 116.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["cf8052d5.64b6a",
-    "d82aa2db.5ee9b",
-    "a037abd8.6d5a98"]]
-},
-{
-    "id": "cf8052d5.64b6a",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 861.5,
-    "y": 109.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["6c30f445.7f747"]]
-},
-{
-    "id": "a037abd8.6d5a98",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 853.5,
-    "y": 148.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["c5d0a97c.6aec38"]]
-},
-{
-    "id": "6c30f445.7f747",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1013.5,
-    "y": 105.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["52e1dddb.65c95"]]
-},
-{
-    "id": "c5d0a97c.6aec38",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1007.5,
-    "y": 155.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["ee3521d3.0ef7a8"]]
-},
-{
-    "id": "6d6c67d6.baa05",
-    "type": "execute",
-    "name": "execute Get External System Params",
-    "xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"processExternalSystemParamKeys\">\n<parameter name=\"systemName\" value=\"INSTAR\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarParams\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 282.5,
-    "y": 302.7999908924103,
-    "z": "8992bf3b.f831",
-    "wires": [["3fec15a.6a386ea",
-    "7dabb63c.56f2dc"]]
-},
-{
-    "id": "3fec15a.6a386ea",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 541.5,
-    "y": 245.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["cb23e834.8e7b58"]]
-},
-{
-    "id": "7dabb63c.56f2dc",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 529.5,
-    "y": 308.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["6e7a4144.06cc8c"]]
-},
-{
-    "id": "cb23e834.8e7b58",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 704.5,
-    "y": 247.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [["dc59e54a.9f4b"]]
-},
-{
-    "id": "6e7a4144.06cc8c",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 677.5,
-    "y": 306.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["b87b1bfd.8e724"]]
-},
-{
-    "id": "dc59e54a.9f4b",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get Instar parameter definitions\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 882.5,
-    "y": 244.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "b87b1bfd.8e724",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarParams.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 850.5,
-    "y": 305.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "74905390.5c13c",
-    "type": "execute",
-    "name": "execute getTemplate Parameter_yang",
-    "xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_yang\" />\n<parameter name=\"responsePrefix\" value=\"parameter-yang\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 152.5,
-    "y": 1086.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["b63fa7fc.ad536",
-    "fc495b17.6b81b8",
-    "54438d15.5438e"]]
-},
-{
-    "id": "b63fa7fc.ad536",
-    "type": "failure",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 693,
-    "y": 1116.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["ef74b16f.c8b8d8"]]
-},
-{
-    "id": "fc495b17.6b81b8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 665,
-    "y": 1187.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["39f7917.7ee5dae"]]
-},
-{
-    "id": "ef74b16f.c8b8d8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 837,
-    "y": 1113.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["a6fd7f2f.c1138",
-    "cebca22e.e424c8"]]
-},
-{
-    "id": "39f7917.7ee5dae",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 834,
-    "y": 1176.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["5ecdd941.9b48fc",
-    "cebca22e.e424c8"]]
-},
-{
-    "id": "808a77af.c364c8",
-    "type": "comment",
-    "name": "INSTAR keys",
-    "info": "Result: [INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.request-logic, test.status, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.response-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic, INSTAR.keys]\nINSTAR.keys : [\"LOCAL_CORE_ALT_IP_ADDR\",\"LOCAL_CORE_ALT_IP_ADDR_MOD\"]\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : null\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic : null",
-    "comments": "",
-    "x": 1455,
-    "y": 406.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "720fe803.94db94",
-    "type": "execute",
-    "name": "execute Get Instar Data",
-    "xml": "<execute plugin=\"org.onap.appc.instar.node.InstarClientNode\" method=\"getInstarInfo\">\n<parameter name=\"instarKeys\" value=\"`$INSTAR.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarValues\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 871,
-    "y": 465.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["e44f599f.b29ff8"]]
-},
-{
-    "id": "e44f599f.b29ff8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1128,
-    "y": 463.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["952a7e07.1e561"]]
-},
-{
-    "id": "952a7e07.1e561",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1288,
-    "y": 465.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["183c1a39.88b25a"]]
-},
-{
-    "id": "183c1a39.88b25a",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 1457,
-    "y": 462.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "a01131b.448c95",
-    "type": "execute",
-    "name": "execute read PD file",
-    "xml": "<execute plugin=\"org.onap.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/onap/appc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 1467,
-    "y": 70.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "6cabefca.739144",
-    "type": "execute",
-    "name": "execute Get Complete Set of Params",
-    "xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.instarValues.INSTAR-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 885,
-    "y": 540.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["983dc609.f7b5d8"]]
-},
-{
-    "id": "983dc609.f7b5d8",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1142.5,
-    "y": 543.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["ef29d20e.bd65f"]]
-},
-{
-    "id": "ef29d20e.bd65f",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1294.5,
-    "y": 540.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["cc68b234.fceba"]]
-},
-{
-    "id": "cc68b234.fceba",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 1445.5,
-    "y": 545.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "919fbbc8.683488",
-    "type": "set",
-    "name": "set",
-    "xml": "<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n",
-    "comments": "",
-    "x": 1447,
-    "y": 143.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "165ae9bc.c7a022",
-    "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=\"`$INSTAR.keys`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 809.5,
-    "y": 417.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "44cbd479.071bc4",
-    "type": "switchNode",
-    "name": "switch Instar Keys exists",
-    "xml": "<switch test='`$INSTAR.keys`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 251.5,
-    "y": 412.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["2265c9c3.d78f46",
-    "1c92fc9a.11bfc7",
-    "fd2ab56c.f3159"]]
-},
-{
-    "id": "2265c9c3.d78f46",
-    "type": "success",
-    "name": "outcome: null",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 470.5,
-    "y": 415.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["aa2ab36a.4b234"]]
-},
-{
-    "id": "aa2ab36a.4b234",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 651.5,
-    "y": 416.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "1c92fc9a.11bfc7",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 455.5,
-    "y": 466.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["b8c53443.301568"]]
-},
-{
-    "id": "b8c53443.301568",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 621.5,
-    "y": 466.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["720fe803.94db94",
-    "6cabefca.739144",
-    "2ed2bad9.80bf12",
-    "165ae9bc.c7a022"]]
-},
-{
-    "id": "2ed2bad9.80bf12",
-    "type": "set",
-    "name": "set configuration-params",
-    "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",
-    "comments": "",
-    "x": 840.5,
-    "y": 604.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "54438d15.5438e",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 162.79998779296875,
-    "y": 1270.8000183105468,
-    "z": "8992bf3b.f831",
-    "wires": [["4a33246e.288584"]]
-},
-{
-    "id": "4a33246e.288584",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 320.3999938964844,
-    "y": 1270.800048828125,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "fd8e9c2e.fc9c4",
-    "type": "execute",
-    "name": "execute Save in MDSal",
-    "xml": "<execute plugin='org.onap.appc.dg.common.VNFConfigurator' method='storeConfig' >\n<parameter name=\"uniqueId\" value=\"`$parameter-yang.config-file-id`\" />\n<parameter name=\"yang\" value=\"`$parameter-yang.file-content`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"configJSON\" value=\"`'{&quot;vnf-config&quot;:' + $configuration-params + '}'`\" />\n<parameter name=\"prefix\" value=\"tmp.mdSalSave\" />\n\n<!--\n<parameter name=\"configJSON\" value=\"`$configuration-params`\" /> -->\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 573,
-    "y": 1256.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["b194c127.a41fb"]]
-},
-{
-    "id": "b194c127.a41fb",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 751,
-    "y": 1253.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["3b63a223.13d4ca"]]
-},
-{
-    "id": "3b63a223.13d4ca",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 911,
-    "y": 1248.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["7cecc27b.d53f8c",
-    "cebca22e.e424c8"]]
-},
-{
-    "id": "a6fd7f2f.c1138",
-    "type": "set",
-    "name": "set:  dcae-error message",
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>",
-    "comments": "",
-    "x": 1070,
-    "y": 1071.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "5ecdd941.9b48fc",
-    "type": "set",
-    "name": "set:  dcae-error message",
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>",
-    "comments": "",
-    "x": 1081,
-    "y": 1124.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "7cecc27b.d53f8c",
-    "type": "set",
-    "name": "set:  dcae-error message",
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>",
-    "comments": "",
-    "x": 1123,
-    "y": 1252.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "cebca22e.e424c8",
-    "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=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1093,
-    "y": 1179.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["f62435eb.55a638"]]
-},
-{
-    "id": "6828598e.6264d",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1404,
-    "y": 1177.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "f62435eb.55a638",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1269,
-    "y": 1176.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["6828598e.6264d"]]
-},
-{
-    "id": "1da36c28.6d6a8",
-    "type": "execute",
-    "name": "execute IntermediateMessageSender",
-    "xml": "<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 720,
-    "y": 1319.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["648214c3.b74d84",
-    "389db5ca.997656"]]
-},
-{
-    "id": "648214c3.b74d84",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 945,
-    "y": 1298.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["f2fd6764.7f0538"]]
-},
-{
-    "id": "389db5ca.997656",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 942,
-    "y": 1352.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["f2fd6764.7f0538"]]
-},
-{
-    "id": "387da37e.1f6494",
-    "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=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1245,
-    "y": 1323.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "d82aa2db.5ee9b",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 140.5,
-    "y": 206.79999089241028,
-    "z": "8992bf3b.f831",
-    "wires": [["caf0abe2.ce0758"]]
-},
-{
-    "id": "caf0abe2.ce0758",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 308.5,
-    "y": 206.79999089241028,
-    "z": "8992bf3b.f831",
-    "wires": [["6d6c67d6.baa05",
-    "44cbd479.071bc4",
-    "74905390.5c13c",
-    "15178787.afaa4c",
-    "5a4d2b8.2394454",
-    "7d7ff9e5.ae8d9c"]]
-},
-{
-    "id": "ee3521d3.0ef7a8",
-    "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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1142.5,
-    "y": 156.79999542236328,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "fd2ab56c.f3159",
-    "type": "success",
-    "name": "outcome: []",
-    "xml": "<outcome value='[]'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 475.5,
-    "y": 370.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["860e3f68.9c968"]]
-},
-{
-    "id": "860e3f68.9c968",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 636.5,
-    "y": 371.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "f2fd6764.7f0538",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1098.5,
-    "y": 1327.7999954223632,
-    "z": "8992bf3b.f831",
-    "wires": [["387da37e.1f6494"]]
-},
-{
-    "id": "52e1dddb.65c95",
-    "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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1144.8333435058593,
-    "y": 102.79999089241028,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "3f4f6c09.9424",
-    "type": "comment",
-    "name": "MD-SAL error message is not propagated to GUI",
-    "info": "DCAE-Error messages are not propagated to GUI",
-    "comments": "",
-    "x": 729.5,
-    "y": 933.7999954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "304e1ee3.6b661e",
-    "type": "execute",
-    "name": "execute Get Aai Data",
-    "xml": "<execute plugin=\"org.onap.appc.instar.node.InstarClientNode\" method=\"getAaiInfo\">\n<parameter name=\"aaiKeys\" value=\"`$AAI.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.aaiValues\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 890.25,
-    "y": 694.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["33d68619.ac3bd6"]]
-},
-{
-    "id": "33d68619.ac3bd6",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1097.25,
-    "y": 694.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["ce0f52c2.2c4f"]]
-},
-{
-    "id": "ce0f52c2.2c4f",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1249.25,
-    "y": 693.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["a170cdee.4e7f5"]]
-},
-{
-    "id": "a170cdee.4e7f5",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 1430.25,
-    "y": 693.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "7c7b8040.c253a",
-    "type": "execute",
-    "name": "execute Get Complete Set of Params",
-    "xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.aaiValues.AAI-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 865.25,
-    "y": 742.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["a1a04983.cfded"]]
-},
-{
-    "id": "a1a04983.cfded",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1107.75,
-    "y": 741.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["47a5d978.255b58"]]
-},
-{
-    "id": "47a5d978.255b58",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1258.75,
-    "y": 740.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["2a2b53d5.a53074"]]
-},
-{
-    "id": "2a2b53d5.a53074",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 1430.75,
-    "y": 743.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "23b3b2f0.c3ceea",
-    "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=\"`$AAI.keys`\" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 784.75,
-    "y": 649.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "15178787.afaa4c",
-    "type": "switchNode",
-    "name": "switch AaiKeys exists",
-    "xml": "<switch test='`$AAI.keys`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 243.25,
-    "y": 613.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["9371cfba.c03b5",
-    "b3d215b3.5a9638",
-    "ec4712bc.ff827"]]
-},
-{
-    "id": "9371cfba.c03b5",
-    "type": "success",
-    "name": "outcome: null",
-    "xml": "<outcome value=''>",
-    "comments": "",
-    "outputs": 1,
-    "x": 477.75,
-    "y": 632.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["c85c21b9.91cd68"]]
-},
-{
-    "id": "c85c21b9.91cd68",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 635.75,
-    "y": 630.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "b3d215b3.5a9638",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 412.75,
-    "y": 743.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["cd040dae.c1cea8"]]
-},
-{
-    "id": "cd040dae.c1cea8",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 576.75,
-    "y": 738.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["304e1ee3.6b661e",
-    "7c7b8040.c253a",
-    "10e7007d.c2276c",
-    "23b3b2f0.c3ceea"]]
-},
-{
-    "id": "10e7007d.c2276c",
-    "type": "set",
-    "name": "set configuration-params",
-    "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",
-    "comments": "",
-    "x": 847.75,
-    "y": 794.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": []
-},
-{
-    "id": "ec4712bc.ff827",
-    "type": "success",
-    "name": "outcome: []",
-    "xml": "<outcome value='[]'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 471.75,
-    "y": 570.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [["cc736488.1aa088"]]
-},
-{
-    "id": "cc736488.1aa088",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 624.75,
-    "y": 567.5499954223633,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "5a4d2b8.2394454",
-    "type": "execute",
-    "name": "execute Validation",
-    "xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"validateParams\">\n<parameter name=\"configuration-parameters\" value=\"`$configuration-params`\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.message\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 226.49996948242187,
-    "y": 844.7998733520508,
-    "z": "8992bf3b.f831",
-    "wires": [["ea839251.8d263",
-    "e2a457d3.b57e48"]]
-},
-{
-    "id": "f07a58cf.e620a8",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 610.9000244140625,
-    "y": 868.3999404907226,
-    "z": "8992bf3b.f831",
-    "wires": [["bd0befbb.92fed"]]
-},
-{
-    "id": "ea839251.8d263",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 450.66668701171875,
-    "y": 838.9428482055664,
-    "z": "8992bf3b.f831",
-    "wires": [["f07a58cf.e620a8"]]
-},
-{
-    "id": "e2a457d3.b57e48",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 440.952392578125,
-    "y": 910.4666519165039,
-    "z": "8992bf3b.f831",
-    "wires": [["f07a58cf.e620a8"]]
-},
-{
-    "id": "7d7ff9e5.ae8d9c",
-    "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=\"`$tmp.messsage.status`\" />\n<parameter name=\"field3\"  value=\"`$tmp.message.error-message`\"/>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 230.6666717529297,
-    "y": 938.7524185180664,
-    "z": "8992bf3b.f831",
-    "wires": [[]]
-},
-{
-    "id": "bd0befbb.92fed",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"`$tmp.message.error-message`\"/>\n\t\n\t\n\t",
-    "comments": "",
-    "x": 837.8095092773437,
-    "y": 851.6095352172851,
-    "z": "8992bf3b.f831",
-    "wires": []
-}]
+	"id": "41856a31.306d44",
+	"type": "dgstart",
+	"name": "DGSTART",
+	"outputs": 1,
+	"x": 217.8000030517578,
+	"y": 72,
+	"z": "761501d1.cda508",
+	"wires": [["633e87f4.5c01c"]]
+},
+{
+	"id": "633e87f4.5c01c",
+	"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": 369.8000030517578,
+	"y": 75,
+	"z": "761501d1.cda508",
+	"wires": [["4ba0f287.ca140c"]]
+},
+{
+	"id": "4ba0f287.ca140c",
+	"type": "method",
+	"name": "method ProcessParametersDefinition",
+	"xml": "<method rpc='ProcessParameterDefinition' mode='sync'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 624.8000030517578,
+	"y": 74,
+	"z": "761501d1.cda508",
+	"wires": [["e55525c5.5cb44"]]
+},
+{
+	"id": "e55525c5.5cb44",
+	"type": "block",
+	"name": "block : atomic",
+	"xml": "<block atomic='true'>",
+	"atomic": "true",
+	"comments": "",
+	"outputs": 1,
+	"x": 245.8000030517578,
+	"y": 134,
+	"z": "761501d1.cda508",
+	"wires": [["db065cba.0d157"]]
+},
+{
+	"id": "db065cba.0d157",
+	"type": "execute",
+	"name": "execute getTemplate Parameter_definition",
+	"xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_definitions\" />\n<parameter name=\"responsePrefix\" value=\"parameter-definitions\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 560.8000030517578,
+	"y": 132,
+	"z": "761501d1.cda508",
+	"wires": [["d725f4cf.8da1c",
+	"d9c32502.22ebe8",
+	"6178f68e.bda218"]]
+},
+{
+	"id": "d725f4cf.8da1c",
+	"type": "failure",
+	"name": "not-found",
+	"xml": "<outcome value='not-found'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 879.8000030517578,
+	"y": 125,
+	"z": "761501d1.cda508",
+	"wires": [["e0e5316f.4f14c"]]
+},
+{
+	"id": "6178f68e.bda218",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 871.8000030517578,
+	"y": 164,
+	"z": "761501d1.cda508",
+	"wires": [["b826d7b6.d14cf8"]]
+},
+{
+	"id": "e0e5316f.4f14c",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1031.8000030517578,
+	"y": 121,
+	"z": "761501d1.cda508",
+	"wires": [["48e06314.429714"]]
+},
+{
+	"id": "b826d7b6.d14cf8",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1025.8000030517578,
+	"y": 171,
+	"z": "761501d1.cda508",
+	"wires": [["464d014.9468b"]]
+},
+{
+	"id": "9144373b.29b98",
+	"type": "execute",
+	"name": "execute Get External System Params",
+	"xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"processExternalSystemParamKeys\">\n<parameter name=\"systemName\" value=\"INSTAR\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarParams\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 300.8000030517578,
+	"y": 317.999995470047,
+	"z": "761501d1.cda508",
+	"wires": [["bd31499f.469848",
+	"8bf72dba.8413c"]]
+},
+{
+	"id": "bd31499f.469848",
+	"type": "not-found",
+	"name": "not-found",
+	"xml": "<outcome value='not-found'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 559.8000030517578,
+	"y": 261,
+	"z": "761501d1.cda508",
+	"wires": [["dedb764e.d3d7a8"]]
+},
+{
+	"id": "8bf72dba.8413c",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 547.8000030517578,
+	"y": 324,
+	"z": "761501d1.cda508",
+	"wires": [["b72daf94.9e73f"]]
+},
+{
+	"id": "dedb764e.d3d7a8",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 722.8000030517578,
+	"y": 263,
+	"z": "761501d1.cda508",
+	"wires": [["bf640b9e.46a508"]]
+},
+{
+	"id": "b72daf94.9e73f",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 695.8000030517578,
+	"y": 322,
+	"z": "761501d1.cda508",
+	"wires": [["bc3a453f.95ed88"]]
+},
+{
+	"id": "bf640b9e.46a508",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"Unable to get Instar parameter definitions\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 900.8000030517578,
+	"y": 260,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "bc3a453f.95ed88",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarParams.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 868.8000030517578,
+	"y": 321,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "ab7d47a7.04d418",
+	"type": "execute",
+	"name": "execute getTemplate Parameter_yang",
+	"xml": "<execute plugin=\"org.onap.appc.data.services.node.ConfigResourceNode\" method=\"getTemplate\">\n<parameter name=\"fileCategory\" value=\"parameter_yang\" />\n<parameter name=\"responsePrefix\" value=\"parameter-yang\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 170.8000030517578,
+	"y": 1102,
+	"z": "761501d1.cda508",
+	"wires": [["502ef168.8e69",
+	"f366f07b.0680a",
+	"46f01183.a53be8"]]
+},
+{
+	"id": "502ef168.8e69",
+	"type": "failure",
+	"name": "not-found",
+	"xml": "<outcome value='not-found'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 711.3000030517578,
+	"y": 1132,
+	"z": "761501d1.cda508",
+	"wires": [["ccbb19be.8db328"]]
+},
+{
+	"id": "f366f07b.0680a",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 683.3000030517578,
+	"y": 1203,
+	"z": "761501d1.cda508",
+	"wires": [["18c476cd.4b57f9"]]
+},
+{
+	"id": "ccbb19be.8db328",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 855.3000030517578,
+	"y": 1129,
+	"z": "761501d1.cda508",
+	"wires": [["27a98df6.c5249a",
+	"85a2f3bd.b8ace"]]
+},
+{
+	"id": "18c476cd.4b57f9",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 852.3000030517578,
+	"y": 1192,
+	"z": "761501d1.cda508",
+	"wires": [["de409635.1fb438",
+	"85a2f3bd.b8ace"]]
+},
+{
+	"id": "afd15fd0.3a2c2",
+	"type": "comment",
+	"name": "INSTAR keys",
+	"info": "Result: [INSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.request-logic, test.status, INSTAR.LOCAL_CORE_ALT_IP_ADDR_MOD.response-logic, INSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic, INSTAR.keys]\nINSTAR.keys : [\"LOCAL_CORE_ALT_IP_ADDR\",\"LOCAL_CORE_ALT_IP_ADDR_MOD\"]\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.request-logic : null\nINSTAR.LOCAL_CORE_ALT_IP_ADDR.response-logic : null",
+	"comments": "",
+	"x": 1473.3000030517578,
+	"y": 422,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "6daad21c.68e2b4",
+	"type": "execute",
+	"name": "execute Get Instar Data",
+	"xml": "<execute plugin=\"org.onap.appc.system.node.SourceSystemNode\" method=\"getInstarInfo\">\n<parameter name=\"instarKeys\" value=\"`$INSTAR.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.instarValues\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 889.3000030517578,
+	"y": 481,
+	"z": "761501d1.cda508",
+	"wires": [["98e72454.79dbe8"]]
+},
+{
+	"id": "98e72454.79dbe8",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1146.3000030517578,
+	"y": 479,
+	"z": "761501d1.cda508",
+	"wires": [["326ad17b.cdddfe"]]
+},
+{
+	"id": "326ad17b.cdddfe",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1306.3000030517578,
+	"y": 481,
+	"z": "761501d1.cda508",
+	"wires": [["f0703579.6411e"]]
+},
+{
+	"id": "f0703579.6411e",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 1475.3000030517578,
+	"y": 478,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "25cea9e.3b5c3d6",
+	"type": "execute",
+	"name": "execute read PD file",
+	"xml": "<execute plugin=\"org.onap.sdnc.config.generator.reader.ReaderNode\" method=\"getFileData\">\n<parameter name=\"fileName\" value=\"/opt/onap/appc/templates/pd.yaml\" />\n<parameter name=\"responsePrefix\" value=\"tmpFileData\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 1485.3000030517578,
+	"y": 86,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "4efadab6.d55e64",
+	"type": "execute",
+	"name": "execute Get Complete Set of Params",
+	"xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.instarValues.INSTAR-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 903.3000030517578,
+	"y": 556,
+	"z": "761501d1.cda508",
+	"wires": [["db5a9cef.3289b8"]]
+},
+{
+	"id": "db5a9cef.3289b8",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1160.8000030517578,
+	"y": 559,
+	"z": "761501d1.cda508",
+	"wires": [["f5acb4db.7fe688"]]
+},
+{
+	"id": "f5acb4db.7fe688",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1312.8000030517578,
+	"y": 556,
+	"z": "761501d1.cda508",
+	"wires": [["90ff3c98.143658"]]
+},
+{
+	"id": "90ff3c98.143658",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 1463.8000030517578,
+	"y": 561,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "799a20a.a8a1be",
+	"type": "set",
+	"name": "set",
+	"xml": "<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n",
+	"comments": "",
+	"x": 1465.3000030517578,
+	"y": 159,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "be6b471b.84e3e",
+	"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=\"`$INSTAR.keys`\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 827.8000030517578,
+	"y": 433,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "bba26b3a.f47e6",
+	"type": "switchNode",
+	"name": "switch Instar Keys exists",
+	"xml": "<switch test='`$INSTAR.keys`'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 269.8000030517578,
+	"y": 428,
+	"z": "761501d1.cda508",
+	"wires": [["dcb1760.89ffa08",
+	"98d76f91.c8c54",
+	"a3f7481a.abb8"]]
+},
+{
+	"id": "dcb1760.89ffa08",
+	"type": "success",
+	"name": "outcome: null",
+	"xml": "<outcome value=''>",
+	"comments": "",
+	"outputs": 1,
+	"x": 488.8000030517578,
+	"y": 431,
+	"z": "761501d1.cda508",
+	"wires": [["b4dbe38b.0e0a"]]
+},
+{
+	"id": "b4dbe38b.0e0a",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 669.8000030517578,
+	"y": 432,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "98d76f91.c8c54",
+	"type": "other",
+	"name": "other",
+	"xml": "<outcome value='Other'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 473.8000030517578,
+	"y": 482,
+	"z": "761501d1.cda508",
+	"wires": [["2de944f3.05e69c"]]
+},
+{
+	"id": "2de944f3.05e69c",
+	"type": "block",
+	"name": "block : atomic",
+	"xml": "<block atomic='true'>",
+	"atomic": "true",
+	"comments": "",
+	"outputs": 1,
+	"x": 639.8000030517578,
+	"y": 482,
+	"z": "761501d1.cda508",
+	"wires": [["6daad21c.68e2b4",
+	"4efadab6.d55e64",
+	"cd3ddb1a.5bb78",
+	"be6b471b.84e3e"]]
+},
+{
+	"id": "cd3ddb1a.5bb78",
+	"type": "set",
+	"name": "set configuration-params",
+	"xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",
+	"comments": "",
+	"x": 858.8000030517578,
+	"y": 620,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "46f01183.a53be8",
+	"type": "success",
+	"name": "success",
+	"xml": "<outcome value='success'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 181.09999084472656,
+	"y": 1286.0000228881836,
+	"z": "761501d1.cda508",
+	"wires": [["ae0b66a.66a0098"]]
+},
+{
+	"id": "ae0b66a.66a0098",
+	"type": "block",
+	"name": "block : atomic",
+	"xml": "<block atomic='true'>",
+	"atomic": "true",
+	"comments": "",
+	"outputs": 1,
+	"x": 338.6999969482422,
+	"y": 1286.0000534057617,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "31093ba.3c3eb44",
+	"type": "execute",
+	"name": "execute Save in MDSal",
+	"xml": "<execute plugin='org.onap.appc.dg.common.VNFConfigurator' method='storeConfig' >\n<parameter name=\"uniqueId\" value=\"`$parameter-yang.config-file-id`\" />\n<parameter name=\"yang\" value=\"`$parameter-yang.file-content`\" />\n<parameter name=\"requestId\" value=\"`$request-id`\" />\n<parameter name=\"configJSON\" value=\"`'{&quot;vnf-config&quot;:' + $configuration-params + '}'`\" />\n<parameter name=\"prefix\" value=\"tmp.mdSalSave\" />\n\n<!--\n<parameter name=\"configJSON\" value=\"`$configuration-params`\" /> -->\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 591.3000030517578,
+	"y": 1272,
+	"z": "761501d1.cda508",
+	"wires": [["cd41d6f9.21cd3"]]
+},
+{
+	"id": "cd41d6f9.21cd3",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 769.3000030517578,
+	"y": 1269,
+	"z": "761501d1.cda508",
+	"wires": [["67327bd6.a20254"]]
+},
+{
+	"id": "67327bd6.a20254",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 929.3000030517578,
+	"y": 1264,
+	"z": "761501d1.cda508",
+	"wires": [["b429d877.309088",
+	"85a2f3bd.b8ace"]]
+},
+{
+	"id": "27a98df6.c5249a",
+	"type": "set",
+	"name": "set:  dcae-error message",
+	"xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>",
+	"comments": "",
+	"x": 1088.3000030517578,
+	"y": 1087,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "de409635.1fb438",
+	"type": "set",
+	"name": "set:  dcae-error message",
+	"xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>",
+	"comments": "",
+	"x": 1099.3000030517578,
+	"y": 1140,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "b429d877.309088",
+	"type": "set",
+	"name": "set:  dcae-error message",
+	"xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>",
+	"comments": "",
+	"x": 1141.3000030517578,
+	"y": 1268,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "85a2f3bd.b8ace",
+	"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=\"`'501:' + $dcae-error-message`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.saveTxLog\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1111.3000030517578,
+	"y": 1195,
+	"z": "761501d1.cda508",
+	"wires": [["f5750c61.e1a1"]]
+},
+{
+	"id": "9d04a4cb.9872a8",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1422.3000030517578,
+	"y": 1193,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "f5750c61.e1a1",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1287.3000030517578,
+	"y": 1192,
+	"z": "761501d1.cda508",
+	"wires": [["9d04a4cb.9872a8"]]
+},
+{
+	"id": "2ea4c87.8bf6ab8",
+	"type": "execute",
+	"name": "execute IntermediateMessageSender",
+	"xml": "<execute plugin='org.onap.appc.dg.common.IntermediateMessageSender' method='sendMessage' >\n<parameter name='code' value=\"501\" />\n<parameter name='message' value=\"`$dcae-error-message`\" />\n<parameter name='prefix' value=\"tmp.intermediateerror\"/>",
+	"comments": "",
+	"outputs": 1,
+	"x": 738.3000030517578,
+	"y": 1335,
+	"z": "761501d1.cda508",
+	"wires": [["db0480a1.51d058",
+	"96feee88.a7a2"]]
+},
+{
+	"id": "db0480a1.51d058",
+	"type": "not-found",
+	"name": "not-found",
+	"xml": "<outcome value='not-found'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 963.3000030517578,
+	"y": 1314,
+	"z": "761501d1.cda508",
+	"wires": [["9f87a89.0278558"]]
+},
+{
+	"id": "96feee88.a7a2",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 960.3000030517578,
+	"y": 1368,
+	"z": "761501d1.cda508",
+	"wires": [["9f87a89.0278558"]]
+},
+{
+	"id": "2ca4ce20.a09c5a",
+	"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=\"MSGSENDERERERROR\" value=\"Unable to call IntermediateErrorMessageSender\"/>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1263.3000030517578,
+	"y": 1339,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "d9c32502.22ebe8",
+	"type": "success",
+	"name": "success",
+	"xml": "<outcome value='success'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 158.8000030517578,
+	"y": 221.999995470047,
+	"z": "761501d1.cda508",
+	"wires": [["5bf40df0.8d4cb4"]]
+},
+{
+	"id": "5bf40df0.8d4cb4",
+	"type": "block",
+	"name": "block : atomic",
+	"xml": "<block atomic='true'>",
+	"atomic": "true",
+	"comments": "",
+	"outputs": 1,
+	"x": 326.8000030517578,
+	"y": 221.999995470047,
+	"z": "761501d1.cda508",
+	"wires": [["9144373b.29b98",
+	"bba26b3a.f47e6",
+	"ab7d47a7.04d418",
+	"a13a97dd.f84738",
+	"5930cb16.527f34",
+	"1bdde293.53627d"]]
+},
+{
+	"id": "464d014.9468b",
+	"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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1160.8000030517578,
+	"y": 172,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "a3f7481a.abb8",
+	"type": "success",
+	"name": "outcome: []",
+	"xml": "<outcome value='[]'>",
+	"comments": "",
+	"outputs": 1,
+	"x": 493.8000030517578,
+	"y": 386,
+	"z": "761501d1.cda508",
+	"wires": [["54b478e3.e94c2"]]
+},
+{
+	"id": "54b478e3.e94c2",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 654.8000030517578,
+	"y": 387,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "9f87a89.0278558",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1116.8000030517578,
+	"y": 1343,
+	"z": "761501d1.cda508",
+	"wires": [["2ca4ce20.a09c5a"]]
+},
+{
+	"id": "48e06314.429714",
+	"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=\"`'PD FILE NOTFOUND ' + $parameter-definitions.error-message`\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1163.1333465576172,
+	"y": 117.999995470047,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "8b93fda3.ab2658",
+	"type": "comment",
+	"name": "MD-SAL error message is not propagated to GUI",
+	"info": "DCAE-Error messages are not propagated to GUI",
+	"comments": "",
+	"x": 747.8000030517578,
+	"y": 949,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "b6d7f647.ecfd6",
+	"type": "execute",
+	"name": "execute Get Aai Data",
+	"xml": "<execute plugin=\"org.onap.appc.system.node.SourceSystemNode\" method=\"getAaiInfo\">\n<parameter name=\"aaiKeys\" value=\"`$AAI.keys`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.aaiValues\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 908.5500030517578,
+	"y": 709.75,
+	"z": "761501d1.cda508",
+	"wires": [["cf0f09f8.580288"]]
+},
+{
+	"id": "cf0f09f8.580288",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1115.5500030517578,
+	"y": 709.75,
+	"z": "761501d1.cda508",
+	"wires": [["d76406db.f0f83"]]
+},
+{
+	"id": "d76406db.f0f83",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1267.5500030517578,
+	"y": 708.75,
+	"z": "761501d1.cda508",
+	"wires": [["ddc7dac.ae16fa8"]]
+},
+{
+	"id": "ddc7dac.ae16fa8",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.instarValues.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 1448.5500030517578,
+	"y": 708.75,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "c37cf681.b91ab",
+	"type": "execute",
+	"name": "execute Get Complete Set of Params",
+	"xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"mergeJsonData\">\n<parameter name=\"jsonData\" value=\"`$configuration-params`\" />\n<parameter name=\"mergeJsonData\" value=\"`$tmp.aaiValues.AAI-KEY-VALUES`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.allParams\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 883.5500030517578,
+	"y": 757.75,
+	"z": "761501d1.cda508",
+	"wires": [["5f5b5e16.ec072"]]
+},
+{
+	"id": "5f5b5e16.ec072",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 1126.0500030517578,
+	"y": 756.75,
+	"z": "761501d1.cda508",
+	"wires": [["5bbef734.e1df8"]]
+},
+{
+	"id": "5bbef734.e1df8",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 1277.0500030517578,
+	"y": 755.75,
+	"z": "761501d1.cda508",
+	"wires": [["f2595cad.6707e8"]]
+},
+{
+	"id": "f2595cad.6707e8",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n\t<parameter name=\"error-message\" value=\"`$tmp.allParams.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 1449.0500030517578,
+	"y": 758.75,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "d523018.54c0f8",
+	"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=\"`$AAI.keys`\" />\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 803.0500030517578,
+	"y": 664.75,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "a13a97dd.f84738",
+	"type": "switchNode",
+	"name": "switch AaiKeys exists",
+	"xml": "<switch test='`$AAI.keys`'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 261.5500030517578,
+	"y": 628.75,
+	"z": "761501d1.cda508",
+	"wires": [["bdcc2dac.30257",
+	"3b48a46b.0dfb94",
+	"1724c03e.6a325"]]
+},
+{
+	"id": "bdcc2dac.30257",
+	"type": "success",
+	"name": "outcome: null",
+	"xml": "<outcome value=''>",
+	"comments": "",
+	"outputs": 1,
+	"x": 496.0500030517578,
+	"y": 647.75,
+	"z": "761501d1.cda508",
+	"wires": [["2ff1349f.8def04"]]
+},
+{
+	"id": "2ff1349f.8def04",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 654.0500030517578,
+	"y": 645.75,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "3b48a46b.0dfb94",
+	"type": "other",
+	"name": "other",
+	"xml": "<outcome value='Other'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 431.0500030517578,
+	"y": 758.75,
+	"z": "761501d1.cda508",
+	"wires": [["b9be9eb0.09f0e"]]
+},
+{
+	"id": "b9be9eb0.09f0e",
+	"type": "block",
+	"name": "block : atomic",
+	"xml": "<block atomic='true'>",
+	"atomic": "true",
+	"comments": "",
+	"outputs": 1,
+	"x": 595.0500030517578,
+	"y": 753.75,
+	"z": "761501d1.cda508",
+	"wires": [["b6d7f647.ecfd6",
+	"c37cf681.b91ab",
+	"b924b82b.3eb898",
+	"d523018.54c0f8"]]
+},
+{
+	"id": "b924b82b.3eb898",
+	"type": "set",
+	"name": "set configuration-params",
+	"xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",
+	"comments": "",
+	"x": 866.0500030517578,
+	"y": 809.75,
+	"z": "761501d1.cda508",
+	"wires": []
+},
+{
+	"id": "1724c03e.6a325",
+	"type": "success",
+	"name": "outcome: []",
+	"xml": "<outcome value='[]'>",
+	"comments": "",
+	"outputs": 1,
+	"x": 490.0500030517578,
+	"y": 585.75,
+	"z": "761501d1.cda508",
+	"wires": [["908bf879.cad018"]]
+},
+{
+	"id": "908bf879.cad018",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 643.0500030517578,
+	"y": 582.75,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "5930cb16.527f34",
+	"type": "execute",
+	"name": "execute Validation",
+	"xml": "<execute plugin=\"org.onap.sdnc.config.params.parser.PropertyDefinitionNode\" method=\"validateParams\">\n<parameter name=\"configuration-parameters\" value=\"`$configuration-params`\" />\n<parameter name=\"pdContent\" value=\"`$parameter-definitions.file-content`\" />\n<parameter name=\"responsePrefix\" value=\"tmp.message\" />",
+	"comments": "",
+	"outputs": 1,
+	"x": 244.7999725341797,
+	"y": 859.9998779296875,
+	"z": "761501d1.cda508",
+	"wires": [["3624d874.623b3",
+	"16604a5d.5d119e"]]
+},
+{
+	"id": "6c3c651.bee9f9c",
+	"type": "block",
+	"name": "block",
+	"xml": "<block>\n",
+	"atomic": "false",
+	"comments": "",
+	"outputs": 1,
+	"x": 629.2000274658203,
+	"y": 883.5999450683594,
+	"z": "761501d1.cda508",
+	"wires": [["185f4a2e.ea1a36"]]
+},
+{
+	"id": "3624d874.623b3",
+	"type": "failure",
+	"name": "failure",
+	"xml": "<outcome value='failure'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 468.96669006347656,
+	"y": 854.1428527832031,
+	"z": "761501d1.cda508",
+	"wires": [["6c3c651.bee9f9c"]]
+},
+{
+	"id": "16604a5d.5d119e",
+	"type": "not-found",
+	"name": "not-found",
+	"xml": "<outcome value='not-found'>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 459.2523956298828,
+	"y": 925.6666564941406,
+	"z": "761501d1.cda508",
+	"wires": [["6c3c651.bee9f9c"]]
+},
+{
+	"id": "1bdde293.53627d",
+	"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=\"`$tmp.messsage.status`\" />\n<parameter name=\"field3\"  value=\"`$tmp.message.error-message`\"/>\n",
+	"comments": "",
+	"outputs": 1,
+	"x": 248.9666748046875,
+	"y": 953.9524230957031,
+	"z": "761501d1.cda508",
+	"wires": [[]]
+},
+{
+	"id": "185f4a2e.ea1a36",
+	"type": "returnFailure",
+	"name": "return failure",
+	"xml": "<return status=\"failure\">\n<parameter name=\"error-code\" value=\"401\"/>\n<parameter name=\"error-message\" value=\"`$tmp.message.error-message`\"/>\n\t\n\t\n\t",
+	"comments": "",
+	"x": 856.1095123291016,
+	"y": 866.8095397949219,
+	"z": "761501d1.cda508",
+	"wires": []
+}]
\ No newline at end of file
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/aai/interfaceImpl/AaiInterfaceRulesHandler.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/aai/interfaceImpl/AaiInterfaceRulesHandler.java
index 37a40f7c4..f82404303 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/aai/interfaceImpl/AaiInterfaceRulesHandler.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/aai/interfaceImpl/AaiInterfaceRulesHandler.java
@@ -33,7 +33,7 @@ import org.onap.appc.aai.data.AaiVmInfo;
 import org.onap.appc.aai.data.AaiVnfInfo;
 import org.onap.appc.aai.data.AaiVnfcInfo;
 import org.onap.appc.aai.utils.AaiClientConstant;
-import org.onap.appc.instar.interfaces.RuleHandlerInterface;
+import org.onap.appc.system.interfaces.RuleHandlerInterface;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.sdnc.config.params.data.Parameter;
 import org.onap.sdnc.config.params.data.ResponseKey;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/InstarClientActivator.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/InstarClientActivator.java
index a703f816b..137ef9ee5 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/InstarClientActivator.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/InstarClientActivator.java
@@ -9,15 +9,15 @@
  * 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=========================================================
  */
 
@@ -27,7 +27,8 @@ import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
 import java.util.LinkedList;
 import java.util.List;
-import org.onap.appc.instar.node.InstarClientNode;
+
+import org.onap.appc.system.node.SourceSystemNode;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
@@ -40,10 +41,10 @@ public class InstarClientActivator implements BundleActivator {
     @Override
     public void start(BundleContext ctx) throws Exception {
 
-        InstarClientNode instarClientNode = new InstarClientNode();
-        log.info("Registering service " + instarClientNode.getClass().getName());
-        registrations.add(ctx.registerService(instarClientNode.getClass().getName(), instarClientNode, null));
-        log.info("Registering service sccessful for  " + instarClientNode.getClass().getName());
+        SourceSystemNode sourceSystemNode = new SourceSystemNode();
+        log.info("Registering service " + sourceSystemNode.getClass().getName());
+        registrations.add(ctx.registerService(sourceSystemNode.getClass().getName(), sourceSystemNode, null));
+        log.info("Registering service sccessful for  " + sourceSystemNode.getClass().getName());
     }
 
     @Override
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
index f5f4924d6..88ab4c137 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
@@ -9,15 +9,15 @@
  * 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=========================================================
  */
 
@@ -31,7 +31,7 @@ import java.util.List;
 import java.util.Map;
 import org.onap.appc.instar.interfaces.ResponseHandlerInterface;
 import org.onap.appc.instar.interfaces.RestClientInterface;
-import org.onap.appc.instar.interfaces.RuleHandlerInterface;
+import org.onap.appc.system.interfaces.RuleHandlerInterface;
 import org.onap.appc.instar.utils.InstarClientConstant;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.sdnc.config.params.data.Parameter;
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaces/RuleHandlerInterface.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/interfaces/RuleHandlerInterface.java
similarity index 96%
rename from appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaces/RuleHandlerInterface.java
rename to appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/interfaces/RuleHandlerInterface.java
index f86d25272..2f4580701 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaces/RuleHandlerInterface.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/interfaces/RuleHandlerInterface.java
@@ -9,21 +9,22 @@
  * 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=========================================================
  */
 
-package org.onap.appc.instar.interfaces;
+package org.onap.appc.system.interfaces;
 
 import java.io.IOException;
+
 import org.onap.appc.instar.interfaceImpl.InstarResponseException;
 
 @FunctionalInterface
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/node/InstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/node/SourceSystemNode.java
similarity index 96%
rename from appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/node/InstarClientNode.java
rename to appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/node/SourceSystemNode.java
index 4087e2ad2..32a65df59 100644
--- a/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/node/InstarClientNode.java
+++ b/appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/node/SourceSystemNode.java
@@ -4,26 +4,28 @@
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
- * Copyright (C) 2017 Amdocs
+ * Copyright (C) 2017 Amdocs 
  * ================================================================================
  * Modifications Copyright (C) 2018 Ericsson
- * =============================================================================
+ * ================================================================================
+ * 
  * 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=========================================================
  */
 
-package org.onap.appc.instar.node;
+
+package org.onap.appc.system.node;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFManager;
@@ -37,16 +39,16 @@ import org.onap.appc.aai.utils.AaiClientConstant;
 import org.onap.appc.instar.interfaceImpl.InstarRestClientImpl;
 import org.onap.appc.instar.interfaceImpl.InterfaceIpAddressImpl;
 import org.onap.appc.instar.interfaces.RestClientInterface;
-import org.onap.appc.instar.interfaces.RuleHandlerInterface;
+import org.onap.appc.system.interfaces.RuleHandlerInterface;
 import org.onap.appc.instar.utils.InstarClientConstant;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
 import org.onap.sdnc.config.params.data.Parameter;
 
-public class InstarClientNode implements SvcLogicJavaPlugin {
+public class SourceSystemNode implements SvcLogicJavaPlugin {
 
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(InstarClientNode.class);
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(SourceSystemNode.class);
 
 
     public void getInstarInfo(Map<String, String> inParams, SvcLogicContext ctx)
@@ -67,7 +69,7 @@ public class InstarClientNode implements SvcLogicJavaPlugin {
                 RuleHandlerInterface handler;
                 log.info("Processing rule Type : " + params.getRuleType());
                 if (params.getRuleType().equals(InstarClientConstant.INTERFACE_IP_ADDRESS)) {
-                    handler = createHandler(params, ctx);
+                     handler = createHandler(params, ctx);
                 } else {
                     throw new SvcLogicException("No Rule Defined to process :" + params.getRuleType());
                 }
@@ -92,10 +94,12 @@ public class InstarClientNode implements SvcLogicJavaPlugin {
 
     private static String[] getKeys(String keyString) {
         log.error("Received Key String as :" + keyString);
+
         String key = keyString
             .replace("[", "")
             .replace("]", "")
             .replace("\"", "");
+
         if (key.contains(",")) {
             return key.split(",");
         } else {
@@ -112,10 +116,12 @@ public class InstarClientNode implements SvcLogicJavaPlugin {
             input.putAll(inParams);
             RestClientInterface rcINterface = createRestClientInterface(input);
             String response = rcINterface.sendRequest(inParams.get("operationName"));
+
             responsePrefix = StringUtils.isNotBlank(responsePrefix) ? responsePrefix + "." : "";
             ctx.setAttribute(responsePrefix + InstarClientConstant.OUTPUT_PARAM_STATUS,
                 InstarClientConstant.OUTPUT_STATUS_SUCCESS);
             ctx.setAttribute(responsePrefix + InstarClientConstant.INSTAR_KEY_VALUES, response);
+
         } catch (Exception e) {
             ctx.setAttribute(responsePrefix + InstarClientConstant.OUTPUT_PARAM_STATUS,
                 InstarClientConstant.OUTPUT_STATUS_FAILURE);
@@ -157,6 +163,7 @@ public class InstarClientNode implements SvcLogicJavaPlugin {
         }
     }
 
+
     protected RuleHandlerInterface createHandler(Parameter params, SvcLogicContext ctx) {
         return new InterfaceIpAddressImpl(params, ctx);
     }
@@ -164,4 +171,5 @@ public class InstarClientNode implements SvcLogicJavaPlugin {
     protected RestClientInterface createRestClientInterface(Map<String, String> input) {
         return new InstarRestClientImpl(input);
     }
+
 }
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/instar/node/TestInstarClientNode.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/instar/node/TestInstarClientNode.java
deleted file mode 100644
index ce3dd76dc..000000000
--- a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/instar/node/TestInstarClientNode.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * ================================================================================
- * Modifications Copyrigh (C) 2018 Ericsson
- * =============================================================================
- * 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=========================================================
- */
-
-package org.onap.appc.instar.node;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.jline.utils.Log;
-import org.junit.Assert;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.powermock.api.mockito.PowerMockito;
-import org.mockito.Mockito;
-import org.onap.appc.aai.utils.AaiClientConstant;
-import org.onap.appc.instar.interfaceImpl.InstarRestClientImpl;
-import org.onap.appc.instar.interfaceImpl.InterfaceIpAddressImpl;
-import org.onap.appc.instar.interfaces.RuleHandlerInterface;
-import org.onap.appc.instar.utils.InstarClientConstant;
-import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
-import org.onap.ccsdk.sli.core.sli.SvcLogicException;
-
-
-public class TestInstarClientNode {
-
-    //ONAP Migration
-
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
-    @Test
-    public void testInstarClientNode() throws Exception {
-        SvcLogicContext ctx = new SvcLogicContext();
-        String key_content = "{\"name\":\"LOCAL_ACCESS_IP_ADDR\",\"description\":\"this is the node0 tacplus server IP address\",\"type\":"
-                + "\"ipv4_address\",\"required\":true,\"source\":\"INSTAR\",\"rule-type\":\"interface-ip-address\",\"default\":null,\"request-keys\":"
-                + "null,\"response-keys\":[{\"unique-key-name\":\"addressfqdn\",\"unique-key-value\":\"00000000000000\",\"field-key-name\":\"ipaddress-v4\"}]}";
-        Map<String, String> inParams = new HashMap<String, String>();
-        inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
-        inParams.put(InstarClientConstant.INSTAR_KEYS, "LOCAL_ACCESS_IP_ADDR");
-        inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
-        ctx.setAttribute("INSTAR.LOCAL_ACCESS_IP_ADDR", key_content);
-        ctx.setAttribute(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
-        ctx.setAttribute(InstarClientConstant.VNF_NAME, "basx0003v");
-        InstarClientNode icn  = PowerMockito.spy(new InstarClientNode());
-        RuleHandlerInterface mockRuleHandler = Mockito.mock(InterfaceIpAddressImpl.class);
-        Mockito.doReturn(mockRuleHandler).when(icn).createHandler(Mockito.any(), Mockito.any());
-        Mockito.doNothing().when(mockRuleHandler).processRule();
-        icn.getInstarInfo(inParams, ctx);
-        Log.info(ctx.getStatus());
-        Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("" + InstarClientConstant.OUTPUT_PARAM_STATUS));
-    }
-
-    @Test
-    public void testInstarClientNodeFailure() throws Exception {
-        SvcLogicContext ctx = new SvcLogicContext();
-        String key_content = "{\"name\":\"LOCAL_ACCESS_IP_ADDR\",\"description\":\"this is the node0 tacplus server IP address\",\"type\":"
-                + "\"ipv4_address\",\"required\":true,\"source\":\"INSTAR\",\"rule-type\":\"NON_INTERFACE_IP_ADDRESS\",\"default\":null,\"request-keys\":"
-                + "null,\"response-keys\":[{\"unique-key-name\":\"addressfqdn\",\"unique-key-value\":\"00000000000000\",\"field-key-name\":\"ipaddress-v4\"}]}";
-        Log.info(key_content);
-        Map<String, String> inParams = new HashMap<String, String>();
-        inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "TEST");
-        inParams.put(InstarClientConstant.INSTAR_KEYS, "LOCAL_ACCESS_IP_ADDR");
-        inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
-        ctx.setAttribute("INSTAR.LOCAL_ACCESS_IP_ADDR", key_content);
-        ctx.setAttribute(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "TEST");
-        ctx.setAttribute(InstarClientConstant.VNF_NAME, "basx0003v");
-        InstarClientNode icn  = new InstarClientNode();
-        expectedEx.expect(SvcLogicException.class);
-        expectedEx.expectMessage("No Rule Defined to process :");
-        icn.getInstarInfo(inParams, ctx);
-    }
-
-    @Test
-    public void testInstarData() throws Exception {
-         InstarClientNode icn  = Mockito.spy(new InstarClientNode());
-         SvcLogicContext ctx  = new SvcLogicContext ();
-         Map<String, String> inParams = new HashMap<String, String>();
-         InstarRestClientImpl mockRestClient = Mockito.mock(InstarRestClientImpl.class);
-         Mockito.doReturn(mockRestClient).when(icn).createRestClientInterface(Mockito.any());
-         Mockito.doReturn("Test-data").when(mockRestClient).sendRequest(Mockito.anyString());
-         inParams.put(InstarClientConstant.VNF_NAME, "basx0003v");
-         inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
-         icn.getInstarData(inParams, ctx);
-         Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("" + InstarClientConstant.OUTPUT_PARAM_STATUS));
-         Assert.assertEquals("Test-data", ctx.getAttribute(InstarClientConstant.INSTAR_KEY_VALUES));
-    }
-
-    @Test
-    public void testInstarDataFailure() throws Exception {
-         InstarClientNode icn  = new InstarClientNode();
-         SvcLogicContext ctx  = new SvcLogicContext ();
-         Map<String, String> inParams = new HashMap<String, String>();
-         inParams.put(InstarClientConstant.VNF_NAME, "basx0003v");
-         inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
-         expectedEx.expect(SvcLogicException.class);
-         expectedEx.expectMessage("Cannot find Property file -SDNC_CONFIG_DIR");
-         icn.getInstarData(inParams, ctx);
-    }
-
-    @Test
-    public void  TestGetAaiInfo() throws Exception {
-        InstarClientNode aaiNode=new InstarClientNode();
-        Map<String, String> inParams=new HashMap<String, String> ();
-        SvcLogicContext ctx=new SvcLogicContext();
-        String keyVals = new String("[\"vnf_name\"]");
-        inParams.put("aaiKeys",keyVals);
-        inParams.put("responsePrefix","test");
-        String parameterString="{\"name\":\"vnf_name\",\"description\":null,\"type\":null,\"required\":false,\"source\":\"A&AI\","
-                + "\"rule-type\":\"vnf-name\",\"default\":null,\"request-keys\":null,\"response-keys\":[{\"unique-key-name\":\"parent-name\","
-                + "\"unique-key-value\":\"vnf\",\"field-key-name\":\"vnf-name\",\"filter-by-field\":null,\"filter-by-value\":null}]}";
-        ctx.setAttribute(AaiClientConstant.SOURCE_SYSTEM_AAI + "." +  "vnf_name",parameterString);
-        aaiNode.getAaiInfo(inParams, ctx);
-        Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("test." + InstarClientConstant.OUTPUT_PARAM_STATUS));
-    }
-
-    @Test
-    public void  TestGetAaiInfoFailure() throws Exception {
-        InstarClientNode aaiNode=new InstarClientNode();
-        Map<String, String> inParams= Mockito.spy(new HashMap<String, String> ());
-        inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
-        Mockito.doThrow(new RuntimeException("Test-exception")).when(inParams).get(AaiClientConstant.AAI_KEYS);
-        SvcLogicContext ctx=new SvcLogicContext();
-        expectedEx.expect(SvcLogicException.class);
-        expectedEx.expectMessage("Test-exception");
-        aaiNode.getAaiInfo(inParams, ctx);
-    }
-}
diff --git a/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/system/node/SourceSystemNodeTest.java b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/system/node/SourceSystemNodeTest.java
new file mode 100644
index 000000000..37be9fe99
--- /dev/null
+++ b/appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/system/node/SourceSystemNodeTest.java
@@ -0,0 +1,153 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * ================================================================================
+ * Modifications Copyright (C) 2018 Ericsson
+ * =============================================================================
+ * 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=========================================================
+ */
+
+package org.onap.appc.system.node;
+
+
+import java.util.HashMap;
+import java.util.Map;
+import org.jline.utils.Log;
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.powermock.api.mockito.PowerMockito;
+import org.mockito.Mockito;
+import org.onap.appc.aai.utils.AaiClientConstant;
+import org.onap.appc.instar.interfaceImpl.InstarRestClientImpl;
+import org.onap.appc.instar.interfaceImpl.InterfaceIpAddressImpl;
+import org.onap.appc.system.interfaces.RuleHandlerInterface;
+import org.onap.appc.instar.utils.InstarClientConstant;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+
+
+public class SourceSystemNodeTest {
+
+
+        //ONAP Migration
+
+        @Rule
+        public ExpectedException expectedEx = ExpectedException.none();
+
+        @Test
+        public void testSourceSystemNode() throws Exception {
+            SvcLogicContext ctx = new SvcLogicContext();
+            String key_content = "{\"name\":\"LOCAL_ACCESS_IP_ADDR\",\"description\":\"this is the node0 tacplus server IP address\",\"type\":"
+                    + "\"ipv4_address\",\"required\":true,\"source\":\"INSTAR\",\"rule-type\":\"interface-ip-address\",\"default\":null,\"request-keys\":"
+                    + "null,\"response-keys\":[{\"unique-key-name\":\"addressfqdn\",\"unique-key-value\":\"00000000000000\",\"field-key-name\":\"ipaddress-v4\"}]}";
+            Map<String, String> inParams = new HashMap<String, String>();
+            inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
+            inParams.put(InstarClientConstant.INSTAR_KEYS, "LOCAL_ACCESS_IP_ADDR");
+            inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
+            ctx.setAttribute("INSTAR.LOCAL_ACCESS_IP_ADDR", key_content);
+            ctx.setAttribute(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
+            ctx.setAttribute(InstarClientConstant.VNF_NAME, "basx0003v");
+            SourceSystemNode icn  = PowerMockito.spy(new SourceSystemNode());
+            RuleHandlerInterface mockRuleHandler = Mockito.mock(InterfaceIpAddressImpl.class);
+            Mockito.doReturn(mockRuleHandler).when(icn).createHandler(Mockito.any(), Mockito.any());
+            Mockito.doNothing().when(mockRuleHandler).processRule();
+            icn.getInstarInfo(inParams, ctx);
+            Log.info(ctx.getStatus());
+            Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("" + InstarClientConstant.OUTPUT_PARAM_STATUS));
+        }
+
+        @Test
+        public void testSourceSystemNodeFailure() throws Exception {
+            SvcLogicContext ctx = new SvcLogicContext();
+            String key_content = "{\"name\":\"LOCAL_ACCESS_IP_ADDR\",\"description\":\"this is the node0 tacplus server IP address\",\"type\":"
+                    + "\"ipv4_address\",\"required\":true,\"source\":\"INSTAR\",\"rule-type\":\"NON_INTERFACE_IP_ADDRESS\",\"default\":null,\"request-keys\":"
+                    + "null,\"response-keys\":[{\"unique-key-name\":\"addressfqdn\",\"unique-key-value\":\"00000000000000\",\"field-key-name\":\"ipaddress-v4\"}]}";
+            Log.info(key_content);
+            Map<String, String> inParams = new HashMap<String, String>();
+            inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "TEST");
+            inParams.put(InstarClientConstant.INSTAR_KEYS, "LOCAL_ACCESS_IP_ADDR");
+            inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
+            ctx.setAttribute("INSTAR.LOCAL_ACCESS_IP_ADDR", key_content);
+            ctx.setAttribute(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "TEST");
+            ctx.setAttribute(InstarClientConstant.VNF_NAME, "basx0003v");
+            SourceSystemNode icn  = new SourceSystemNode();
+            expectedEx.expect(SvcLogicException.class);
+            expectedEx.expectMessage("No Rule Defined to process :");
+            icn.getInstarInfo(inParams, ctx);
+        }
+
+        @Test
+        public void testInstarData() throws Exception {
+             SourceSystemNode icn  = Mockito.spy(new SourceSystemNode());
+             SvcLogicContext ctx  = new SvcLogicContext ();
+             Map<String, String> inParams = new HashMap<String, String>();
+             InstarRestClientImpl mockRestClient = Mockito.mock(InstarRestClientImpl.class);
+             Mockito.doReturn(mockRestClient).when(icn).createRestClientInterface(Mockito.any());
+             Mockito.doReturn("Test-data").when(mockRestClient).sendRequest(Mockito.anyString());
+             inParams.put(InstarClientConstant.VNF_NAME, "basx0003v");
+             inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
+             icn.getInstarData(inParams, ctx);
+             Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("" + InstarClientConstant.OUTPUT_PARAM_STATUS));
+             Assert.assertEquals("Test-data", ctx.getAttribute(InstarClientConstant.INSTAR_KEY_VALUES));
+        }
+
+        @Test
+        public void testInstarDataFailure() throws Exception {
+             SourceSystemNode icn  = new SourceSystemNode();
+             SvcLogicContext ctx  = new SvcLogicContext ();
+             Map<String, String> inParams = new HashMap<String, String>();
+             inParams.put(InstarClientConstant.VNF_NAME, "basx0003v");
+             inParams.put("operationName", InstarClientConstant.OPERATION_GET_IPADDRESS_BY_VNF_NAME);
+             expectedEx.expect(SvcLogicException.class);
+             //expectedEx.expectMessage("Cannot find Property file -SDNC_CONFIG_DIR");
+             icn.getInstarData(inParams, ctx);
+        }
+
+        @Test
+        public void  TestGetAaiInfo() throws Exception {
+            SourceSystemNode aaiNode=new SourceSystemNode();
+            Map<String, String> inParams=new HashMap<String, String> ();
+            SvcLogicContext ctx=new SvcLogicContext();
+            String keyVals = new String("[\"vnf_name\"]");
+            inParams.put("aaiKeys",keyVals);
+            inParams.put("responsePrefix","test");
+            String parameterString="{\"name\":\"vnf_name\",\"description\":null,\"type\":null,\"required\":false,\"source\":\"A&AI\","
+                    + "\"rule-type\":\"vnf-name\",\"default\":null,\"request-keys\":null,\"response-keys\":[{\"unique-key-name\":\"parent-name\","
+                    + "\"unique-key-value\":\"vnf\",\"field-key-name\":\"vnf-name\",\"filter-by-field\":null,\"filter-by-value\":null}]}";
+            ctx.setAttribute(AaiClientConstant.SOURCE_SYSTEM_AAI + "." +  "vnf_name",parameterString);
+            aaiNode.getAaiInfo(inParams, ctx);
+            Assert.assertEquals(InstarClientConstant.OUTPUT_STATUS_SUCCESS, ctx.getAttribute("test." + InstarClientConstant.OUTPUT_PARAM_STATUS));
+        }
+
+        @Test
+        public void  TestGetAaiInfoFailure() throws Exception {
+            SourceSystemNode aaiNode=new SourceSystemNode();
+            Map<String, String> inParams= Mockito.spy(new HashMap<String, String> ());
+            inParams.put(InstarClientConstant.INPUT_PARAM_RESPONSE_PRIFIX, "");
+            Mockito.doThrow(new RuntimeException("Test-exception")).when(inParams).get(AaiClientConstant.AAI_KEYS);
+            SvcLogicContext ctx=new SvcLogicContext();
+            expectedEx.expect(SvcLogicException.class);
+            expectedEx.expectMessage("Test-exception");
+            aaiNode.getAaiInfo(inParams, ctx);
+        }
+
+}
+