Network Inventory Cient Platform Hardening 33/76033/4
authorBalaji, Ramya (rb111y) <rb111y@att.com>
Sun, 20 Jan 2019 02:28:38 +0000 (21:28 -0500)
committerTakamune Cho <takamune.cho@att.com>
Mon, 21 Jan 2019 21:21:22 +0000 (21:21 +0000)
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>
appc-directed-graph/appc-dgraph/provider/src/main/resources/json/APPC/APPC_ProcessParameterDefinition.json
appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/aai/interfaceImpl/AaiInterfaceRulesHandler.java
appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/InstarClientActivator.java
appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaceImpl/InterfaceIpAddressImpl.java
appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/interfaces/RuleHandlerInterface.java [moved from appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/interfaces/RuleHandlerInterface.java with 96% similarity]
appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/system/node/SourceSystemNode.java [moved from appc-outbound/appc-network-inventory-client/provider/src/main/java/org/onap/appc/instar/node/InstarClientNode.java with 96% similarity]
appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/instar/node/TestInstarClientNode.java [deleted file]
appc-outbound/appc-network-inventory-client/provider/src/test/java/org/onap/appc/system/node/SourceSystemNodeTest.java [new file with mode: 0644]

index a4f4ca4..4d37707 100644 (file)
 [{\r
-    "id": "ad8bbbec.77e128",\r
-    "type": "dgstart",\r
-    "name": "DGSTART",\r
-    "outputs": 1,\r
-    "x": 199.5,\r
-    "y": 56.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cf7a2c1.c37d09"]]\r
-},\r
-{\r
-    "id": "cf7a2c1.c37d09",\r
-    "type": "service-logic",\r
-    "name": "APPC 4.0.0",\r
-    "module": "APPC",\r
-    "version": "4.0.0",\r
-    "comments": "",\r
-    "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'>",\r
-    "outputs": 1,\r
-    "x": 351.5,\r
-    "y": 59.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["def7f63d.6ecef8"]]\r
-},\r
-{\r
-    "id": "def7f63d.6ecef8",\r
-    "type": "method",\r
-    "name": "method ProcessParametersDefinition",\r
-    "xml": "<method rpc='ProcessParameterDefinition' mode='sync'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 606.5,\r
-    "y": 58.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["3065cea9.b1e06e"]]\r
-},\r
-{\r
-    "id": "3065cea9.b1e06e",\r
-    "type": "block",\r
-    "name": "block : atomic",\r
-    "xml": "<block atomic='true'>",\r
-    "atomic": "true",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 227.5,\r
-    "y": 118.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["569d4b14.244ee4"]]\r
-},\r
-{\r
-    "id": "569d4b14.244ee4",\r
-    "type": "execute",\r
-    "name": "execute getTemplate Parameter_definition",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 542.5,\r
-    "y": 116.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cf8052d5.64b6a",\r
-    "d82aa2db.5ee9b",\r
-    "a037abd8.6d5a98"]]\r
-},\r
-{\r
-    "id": "cf8052d5.64b6a",\r
-    "type": "failure",\r
-    "name": "not-found",\r
-    "xml": "<outcome value='not-found'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 861.5,\r
-    "y": 109.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["6c30f445.7f747"]]\r
-},\r
-{\r
-    "id": "a037abd8.6d5a98",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 853.5,\r
-    "y": 148.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["c5d0a97c.6aec38"]]\r
-},\r
-{\r
-    "id": "6c30f445.7f747",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1013.5,\r
-    "y": 105.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["52e1dddb.65c95"]]\r
-},\r
-{\r
-    "id": "c5d0a97c.6aec38",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1007.5,\r
-    "y": 155.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["ee3521d3.0ef7a8"]]\r
-},\r
-{\r
-    "id": "6d6c67d6.baa05",\r
-    "type": "execute",\r
-    "name": "execute Get External System Params",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 282.5,\r
-    "y": 302.7999908924103,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["3fec15a.6a386ea",\r
-    "7dabb63c.56f2dc"]]\r
-},\r
-{\r
-    "id": "3fec15a.6a386ea",\r
-    "type": "not-found",\r
-    "name": "not-found",\r
-    "xml": "<outcome value='not-found'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 541.5,\r
-    "y": 245.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cb23e834.8e7b58"]]\r
-},\r
-{\r
-    "id": "7dabb63c.56f2dc",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 529.5,\r
-    "y": 308.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["6e7a4144.06cc8c"]]\r
-},\r
-{\r
-    "id": "cb23e834.8e7b58",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 704.5,\r
-    "y": 247.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["dc59e54a.9f4b"]]\r
-},\r
-{\r
-    "id": "6e7a4144.06cc8c",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 677.5,\r
-    "y": 306.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["b87b1bfd.8e724"]]\r
-},\r
-{\r
-    "id": "dc59e54a.9f4b",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 882.5,\r
-    "y": 244.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "b87b1bfd.8e724",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 850.5,\r
-    "y": 305.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "74905390.5c13c",\r
-    "type": "execute",\r
-    "name": "execute getTemplate Parameter_yang",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 152.5,\r
-    "y": 1086.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["b63fa7fc.ad536",\r
-    "fc495b17.6b81b8",\r
-    "54438d15.5438e"]]\r
-},\r
-{\r
-    "id": "b63fa7fc.ad536",\r
-    "type": "failure",\r
-    "name": "not-found",\r
-    "xml": "<outcome value='not-found'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 693,\r
-    "y": 1116.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["ef74b16f.c8b8d8"]]\r
-},\r
-{\r
-    "id": "fc495b17.6b81b8",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 665,\r
-    "y": 1187.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["39f7917.7ee5dae"]]\r
-},\r
-{\r
-    "id": "ef74b16f.c8b8d8",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 837,\r
-    "y": 1113.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["a6fd7f2f.c1138",\r
-    "cebca22e.e424c8"]]\r
-},\r
-{\r
-    "id": "39f7917.7ee5dae",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 834,\r
-    "y": 1176.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["5ecdd941.9b48fc",\r
-    "cebca22e.e424c8"]]\r
-},\r
-{\r
-    "id": "808a77af.c364c8",\r
-    "type": "comment",\r
-    "name": "INSTAR keys",\r
-    "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",\r
-    "comments": "",\r
-    "x": 1455,\r
-    "y": 406.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "720fe803.94db94",\r
-    "type": "execute",\r
-    "name": "execute Get Instar Data",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 871,\r
-    "y": 465.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["e44f599f.b29ff8"]]\r
-},\r
-{\r
-    "id": "e44f599f.b29ff8",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1128,\r
-    "y": 463.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["952a7e07.1e561"]]\r
-},\r
-{\r
-    "id": "952a7e07.1e561",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1288,\r
-    "y": 465.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["183c1a39.88b25a"]]\r
-},\r
-{\r
-    "id": "183c1a39.88b25a",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 1457,\r
-    "y": 462.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "a01131b.448c95",\r
-    "type": "execute",\r
-    "name": "execute read PD file",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1467,\r
-    "y": 70.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "6cabefca.739144",\r
-    "type": "execute",\r
-    "name": "execute Get Complete Set of Params",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 885,\r
-    "y": 540.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["983dc609.f7b5d8"]]\r
-},\r
-{\r
-    "id": "983dc609.f7b5d8",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1142.5,\r
-    "y": 543.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["ef29d20e.bd65f"]]\r
-},\r
-{\r
-    "id": "ef29d20e.bd65f",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1294.5,\r
-    "y": 540.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cc68b234.fceba"]]\r
-},\r
-{\r
-    "id": "cc68b234.fceba",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 1445.5,\r
-    "y": 545.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "919fbbc8.683488",\r
-    "type": "set",\r
-    "name": "set",\r
-    "xml": "<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n",\r
-    "comments": "",\r
-    "x": 1447,\r
-    "y": 143.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "165ae9bc.c7a022",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 809.5,\r
-    "y": 417.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "44cbd479.071bc4",\r
-    "type": "switchNode",\r
-    "name": "switch Instar Keys exists",\r
-    "xml": "<switch test='`$INSTAR.keys`'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 251.5,\r
-    "y": 412.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["2265c9c3.d78f46",\r
-    "1c92fc9a.11bfc7",\r
-    "fd2ab56c.f3159"]]\r
-},\r
-{\r
-    "id": "2265c9c3.d78f46",\r
-    "type": "success",\r
-    "name": "outcome: null",\r
-    "xml": "<outcome value=''>",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 470.5,\r
-    "y": 415.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["aa2ab36a.4b234"]]\r
-},\r
-{\r
-    "id": "aa2ab36a.4b234",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 651.5,\r
-    "y": 416.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "1c92fc9a.11bfc7",\r
-    "type": "other",\r
-    "name": "other",\r
-    "xml": "<outcome value='Other'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 455.5,\r
-    "y": 466.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["b8c53443.301568"]]\r
-},\r
-{\r
-    "id": "b8c53443.301568",\r
-    "type": "block",\r
-    "name": "block : atomic",\r
-    "xml": "<block atomic='true'>",\r
-    "atomic": "true",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 621.5,\r
-    "y": 466.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["720fe803.94db94",\r
-    "6cabefca.739144",\r
-    "2ed2bad9.80bf12",\r
-    "165ae9bc.c7a022"]]\r
-},\r
-{\r
-    "id": "2ed2bad9.80bf12",\r
-    "type": "set",\r
-    "name": "set configuration-params",\r
-    "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",\r
-    "comments": "",\r
-    "x": 840.5,\r
-    "y": 604.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "54438d15.5438e",\r
-    "type": "success",\r
-    "name": "success",\r
-    "xml": "<outcome value='success'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 162.79998779296875,\r
-    "y": 1270.8000183105468,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["4a33246e.288584"]]\r
-},\r
-{\r
-    "id": "4a33246e.288584",\r
-    "type": "block",\r
-    "name": "block : atomic",\r
-    "xml": "<block atomic='true'>",\r
-    "atomic": "true",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 320.3999938964844,\r
-    "y": 1270.800048828125,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "fd8e9c2e.fc9c4",\r
-    "type": "execute",\r
-    "name": "execute Save in MDSal",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 573,\r
-    "y": 1256.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["b194c127.a41fb"]]\r
-},\r
-{\r
-    "id": "b194c127.a41fb",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 751,\r
-    "y": 1253.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["3b63a223.13d4ca"]]\r
-},\r
-{\r
-    "id": "3b63a223.13d4ca",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 911,\r
-    "y": 1248.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["7cecc27b.d53f8c",\r
-    "cebca22e.e424c8"]]\r
-},\r
-{\r
-    "id": "a6fd7f2f.c1138",\r
-    "type": "set",\r
-    "name": "set:  dcae-error message",\r
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>",\r
-    "comments": "",\r
-    "x": 1070,\r
-    "y": 1071.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "5ecdd941.9b48fc",\r
-    "type": "set",\r
-    "name": "set:  dcae-error message",\r
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>",\r
-    "comments": "",\r
-    "x": 1081,\r
-    "y": 1124.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "7cecc27b.d53f8c",\r
-    "type": "set",\r
-    "name": "set:  dcae-error message",\r
-    "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>",\r
-    "comments": "",\r
-    "x": 1123,\r
-    "y": 1252.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "cebca22e.e424c8",\r
-    "type": "execute",\r
-    "name": "execute saveTxLog",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1093,\r
-    "y": 1179.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["f62435eb.55a638"]]\r
-},\r
-{\r
-    "id": "6828598e.6264d",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1404,\r
-    "y": 1177.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "f62435eb.55a638",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1269,\r
-    "y": 1176.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["6828598e.6264d"]]\r
-},\r
-{\r
-    "id": "1da36c28.6d6a8",\r
-    "type": "execute",\r
-    "name": "execute IntermediateMessageSender",\r
-    "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\"/>",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 720,\r
-    "y": 1319.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["648214c3.b74d84",\r
-    "389db5ca.997656"]]\r
-},\r
-{\r
-    "id": "648214c3.b74d84",\r
-    "type": "not-found",\r
-    "name": "not-found",\r
-    "xml": "<outcome value='not-found'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 945,\r
-    "y": 1298.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["f2fd6764.7f0538"]]\r
-},\r
-{\r
-    "id": "389db5ca.997656",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 942,\r
-    "y": 1352.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["f2fd6764.7f0538"]]\r
-},\r
-{\r
-    "id": "387da37e.1f6494",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1245,\r
-    "y": 1323.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "d82aa2db.5ee9b",\r
-    "type": "success",\r
-    "name": "success",\r
-    "xml": "<outcome value='success'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 140.5,\r
-    "y": 206.79999089241028,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["caf0abe2.ce0758"]]\r
-},\r
-{\r
-    "id": "caf0abe2.ce0758",\r
-    "type": "block",\r
-    "name": "block : atomic",\r
-    "xml": "<block atomic='true'>",\r
-    "atomic": "true",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 308.5,\r
-    "y": 206.79999089241028,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["6d6c67d6.baa05",\r
-    "44cbd479.071bc4",\r
-    "74905390.5c13c",\r
-    "15178787.afaa4c",\r
-    "5a4d2b8.2394454",\r
-    "7d7ff9e5.ae8d9c"]]\r
-},\r
-{\r
-    "id": "ee3521d3.0ef7a8",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1142.5,\r
-    "y": 156.79999542236328,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "fd2ab56c.f3159",\r
-    "type": "success",\r
-    "name": "outcome: []",\r
-    "xml": "<outcome value='[]'>",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 475.5,\r
-    "y": 370.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["860e3f68.9c968"]]\r
-},\r
-{\r
-    "id": "860e3f68.9c968",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 636.5,\r
-    "y": 371.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "f2fd6764.7f0538",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1098.5,\r
-    "y": 1327.7999954223632,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["387da37e.1f6494"]]\r
-},\r
-{\r
-    "id": "52e1dddb.65c95",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1144.8333435058593,\r
-    "y": 102.79999089241028,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "3f4f6c09.9424",\r
-    "type": "comment",\r
-    "name": "MD-SAL error message is not propagated to GUI",\r
-    "info": "DCAE-Error messages are not propagated to GUI",\r
-    "comments": "",\r
-    "x": 729.5,\r
-    "y": 933.7999954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "304e1ee3.6b661e",\r
-    "type": "execute",\r
-    "name": "execute Get Aai Data",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 890.25,\r
-    "y": 694.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["33d68619.ac3bd6"]]\r
-},\r
-{\r
-    "id": "33d68619.ac3bd6",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1097.25,\r
-    "y": 694.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["ce0f52c2.2c4f"]]\r
-},\r
-{\r
-    "id": "ce0f52c2.2c4f",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1249.25,\r
-    "y": 693.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["a170cdee.4e7f5"]]\r
-},\r
-{\r
-    "id": "a170cdee.4e7f5",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 1430.25,\r
-    "y": 693.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "7c7b8040.c253a",\r
-    "type": "execute",\r
-    "name": "execute Get Complete Set of Params",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 865.25,\r
-    "y": 742.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["a1a04983.cfded"]]\r
-},\r
-{\r
-    "id": "a1a04983.cfded",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1107.75,\r
-    "y": 741.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["47a5d978.255b58"]]\r
-},\r
-{\r
-    "id": "47a5d978.255b58",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 1258.75,\r
-    "y": 740.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["2a2b53d5.a53074"]]\r
-},\r
-{\r
-    "id": "2a2b53d5.a53074",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 1430.75,\r
-    "y": 743.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "23b3b2f0.c3ceea",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 784.75,\r
-    "y": 649.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "15178787.afaa4c",\r
-    "type": "switchNode",\r
-    "name": "switch AaiKeys exists",\r
-    "xml": "<switch test='`$AAI.keys`'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 243.25,\r
-    "y": 613.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["9371cfba.c03b5",\r
-    "b3d215b3.5a9638",\r
-    "ec4712bc.ff827"]]\r
-},\r
-{\r
-    "id": "9371cfba.c03b5",\r
-    "type": "success",\r
-    "name": "outcome: null",\r
-    "xml": "<outcome value=''>",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 477.75,\r
-    "y": 632.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["c85c21b9.91cd68"]]\r
-},\r
-{\r
-    "id": "c85c21b9.91cd68",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 635.75,\r
-    "y": 630.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "b3d215b3.5a9638",\r
-    "type": "other",\r
-    "name": "other",\r
-    "xml": "<outcome value='Other'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 412.75,\r
-    "y": 743.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cd040dae.c1cea8"]]\r
-},\r
-{\r
-    "id": "cd040dae.c1cea8",\r
-    "type": "block",\r
-    "name": "block : atomic",\r
-    "xml": "<block atomic='true'>",\r
-    "atomic": "true",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 576.75,\r
-    "y": 738.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["304e1ee3.6b661e",\r
-    "7c7b8040.c253a",\r
-    "10e7007d.c2276c",\r
-    "23b3b2f0.c3ceea"]]\r
-},\r
-{\r
-    "id": "10e7007d.c2276c",\r
-    "type": "set",\r
-    "name": "set configuration-params",\r
-    "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",\r
-    "comments": "",\r
-    "x": 847.75,\r
-    "y": 794.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-},\r
-{\r
-    "id": "ec4712bc.ff827",\r
-    "type": "success",\r
-    "name": "outcome: []",\r
-    "xml": "<outcome value='[]'>",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 471.75,\r
-    "y": 570.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["cc736488.1aa088"]]\r
-},\r
-{\r
-    "id": "cc736488.1aa088",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 624.75,\r
-    "y": 567.5499954223633,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "5a4d2b8.2394454",\r
-    "type": "execute",\r
-    "name": "execute Validation",\r
-    "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\" />",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 226.49996948242187,\r
-    "y": 844.7998733520508,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["ea839251.8d263",\r
-    "e2a457d3.b57e48"]]\r
-},\r
-{\r
-    "id": "f07a58cf.e620a8",\r
-    "type": "block",\r
-    "name": "block",\r
-    "xml": "<block>\n",\r
-    "atomic": "false",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 610.9000244140625,\r
-    "y": 868.3999404907226,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["bd0befbb.92fed"]]\r
-},\r
-{\r
-    "id": "ea839251.8d263",\r
-    "type": "failure",\r
-    "name": "failure",\r
-    "xml": "<outcome value='failure'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 450.66668701171875,\r
-    "y": 838.9428482055664,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["f07a58cf.e620a8"]]\r
-},\r
-{\r
-    "id": "e2a457d3.b57e48",\r
-    "type": "not-found",\r
-    "name": "not-found",\r
-    "xml": "<outcome value='not-found'>\n",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 440.952392578125,\r
-    "y": 910.4666519165039,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [["f07a58cf.e620a8"]]\r
-},\r
-{\r
-    "id": "7d7ff9e5.ae8d9c",\r
-    "type": "record",\r
-    "name": "record",\r
-    "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",\r
-    "comments": "",\r
-    "outputs": 1,\r
-    "x": 230.6666717529297,\r
-    "y": 938.7524185180664,\r
-    "z": "8992bf3b.f831",\r
-    "wires": [[]]\r
-},\r
-{\r
-    "id": "bd0befbb.92fed",\r
-    "type": "returnFailure",\r
-    "name": "return failure",\r
-    "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",\r
-    "comments": "",\r
-    "x": 837.8095092773437,\r
-    "y": 851.6095352172851,\r
-    "z": "8992bf3b.f831",\r
-    "wires": []\r
-}]\r
+       "id": "41856a31.306d44",\r
+       "type": "dgstart",\r
+       "name": "DGSTART",\r
+       "outputs": 1,\r
+       "x": 217.8000030517578,\r
+       "y": 72,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["633e87f4.5c01c"]]\r
+},\r
+{\r
+       "id": "633e87f4.5c01c",\r
+       "type": "service-logic",\r
+       "name": "APPC 4.0.0",\r
+       "module": "APPC",\r
+       "version": "4.0.0",\r
+       "comments": "",\r
+       "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'>",\r
+       "outputs": 1,\r
+       "x": 369.8000030517578,\r
+       "y": 75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["4ba0f287.ca140c"]]\r
+},\r
+{\r
+       "id": "4ba0f287.ca140c",\r
+       "type": "method",\r
+       "name": "method ProcessParametersDefinition",\r
+       "xml": "<method rpc='ProcessParameterDefinition' mode='sync'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 624.8000030517578,\r
+       "y": 74,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["e55525c5.5cb44"]]\r
+},\r
+{\r
+       "id": "e55525c5.5cb44",\r
+       "type": "block",\r
+       "name": "block : atomic",\r
+       "xml": "<block atomic='true'>",\r
+       "atomic": "true",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 245.8000030517578,\r
+       "y": 134,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["db065cba.0d157"]]\r
+},\r
+{\r
+       "id": "db065cba.0d157",\r
+       "type": "execute",\r
+       "name": "execute getTemplate Parameter_definition",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 560.8000030517578,\r
+       "y": 132,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["d725f4cf.8da1c",\r
+       "d9c32502.22ebe8",\r
+       "6178f68e.bda218"]]\r
+},\r
+{\r
+       "id": "d725f4cf.8da1c",\r
+       "type": "failure",\r
+       "name": "not-found",\r
+       "xml": "<outcome value='not-found'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 879.8000030517578,\r
+       "y": 125,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["e0e5316f.4f14c"]]\r
+},\r
+{\r
+       "id": "6178f68e.bda218",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 871.8000030517578,\r
+       "y": 164,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b826d7b6.d14cf8"]]\r
+},\r
+{\r
+       "id": "e0e5316f.4f14c",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1031.8000030517578,\r
+       "y": 121,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["48e06314.429714"]]\r
+},\r
+{\r
+       "id": "b826d7b6.d14cf8",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1025.8000030517578,\r
+       "y": 171,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["464d014.9468b"]]\r
+},\r
+{\r
+       "id": "9144373b.29b98",\r
+       "type": "execute",\r
+       "name": "execute Get External System Params",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 300.8000030517578,\r
+       "y": 317.999995470047,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["bd31499f.469848",\r
+       "8bf72dba.8413c"]]\r
+},\r
+{\r
+       "id": "bd31499f.469848",\r
+       "type": "not-found",\r
+       "name": "not-found",\r
+       "xml": "<outcome value='not-found'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 559.8000030517578,\r
+       "y": 261,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["dedb764e.d3d7a8"]]\r
+},\r
+{\r
+       "id": "8bf72dba.8413c",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 547.8000030517578,\r
+       "y": 324,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b72daf94.9e73f"]]\r
+},\r
+{\r
+       "id": "dedb764e.d3d7a8",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 722.8000030517578,\r
+       "y": 263,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["bf640b9e.46a508"]]\r
+},\r
+{\r
+       "id": "b72daf94.9e73f",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 695.8000030517578,\r
+       "y": 322,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["bc3a453f.95ed88"]]\r
+},\r
+{\r
+       "id": "bf640b9e.46a508",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 900.8000030517578,\r
+       "y": 260,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "bc3a453f.95ed88",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 868.8000030517578,\r
+       "y": 321,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "ab7d47a7.04d418",\r
+       "type": "execute",\r
+       "name": "execute getTemplate Parameter_yang",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 170.8000030517578,\r
+       "y": 1102,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["502ef168.8e69",\r
+       "f366f07b.0680a",\r
+       "46f01183.a53be8"]]\r
+},\r
+{\r
+       "id": "502ef168.8e69",\r
+       "type": "failure",\r
+       "name": "not-found",\r
+       "xml": "<outcome value='not-found'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 711.3000030517578,\r
+       "y": 1132,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["ccbb19be.8db328"]]\r
+},\r
+{\r
+       "id": "f366f07b.0680a",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 683.3000030517578,\r
+       "y": 1203,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["18c476cd.4b57f9"]]\r
+},\r
+{\r
+       "id": "ccbb19be.8db328",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 855.3000030517578,\r
+       "y": 1129,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["27a98df6.c5249a",\r
+       "85a2f3bd.b8ace"]]\r
+},\r
+{\r
+       "id": "18c476cd.4b57f9",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 852.3000030517578,\r
+       "y": 1192,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["de409635.1fb438",\r
+       "85a2f3bd.b8ace"]]\r
+},\r
+{\r
+       "id": "afd15fd0.3a2c2",\r
+       "type": "comment",\r
+       "name": "INSTAR keys",\r
+       "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",\r
+       "comments": "",\r
+       "x": 1473.3000030517578,\r
+       "y": 422,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "6daad21c.68e2b4",\r
+       "type": "execute",\r
+       "name": "execute Get Instar Data",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 889.3000030517578,\r
+       "y": 481,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["98e72454.79dbe8"]]\r
+},\r
+{\r
+       "id": "98e72454.79dbe8",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1146.3000030517578,\r
+       "y": 479,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["326ad17b.cdddfe"]]\r
+},\r
+{\r
+       "id": "326ad17b.cdddfe",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1306.3000030517578,\r
+       "y": 481,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["f0703579.6411e"]]\r
+},\r
+{\r
+       "id": "f0703579.6411e",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 1475.3000030517578,\r
+       "y": 478,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "25cea9e.3b5c3d6",\r
+       "type": "execute",\r
+       "name": "execute read PD file",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1485.3000030517578,\r
+       "y": 86,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "4efadab6.d55e64",\r
+       "type": "execute",\r
+       "name": "execute Get Complete Set of Params",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 903.3000030517578,\r
+       "y": 556,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["db5a9cef.3289b8"]]\r
+},\r
+{\r
+       "id": "db5a9cef.3289b8",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1160.8000030517578,\r
+       "y": 559,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["f5acb4db.7fe688"]]\r
+},\r
+{\r
+       "id": "f5acb4db.7fe688",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1312.8000030517578,\r
+       "y": 556,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["90ff3c98.143658"]]\r
+},\r
+{\r
+       "id": "90ff3c98.143658",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 1463.8000030517578,\r
+       "y": 561,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "799a20a.a8a1be",\r
+       "type": "set",\r
+       "name": "set",\r
+       "xml": "<set>\n<parameter name='parameter-definitions.file-content' value='`$tmpFileData.fileData`' />\n",\r
+       "comments": "",\r
+       "x": 1465.3000030517578,\r
+       "y": 159,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "be6b471b.84e3e",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 827.8000030517578,\r
+       "y": 433,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "bba26b3a.f47e6",\r
+       "type": "switchNode",\r
+       "name": "switch Instar Keys exists",\r
+       "xml": "<switch test='`$INSTAR.keys`'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 269.8000030517578,\r
+       "y": 428,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["dcb1760.89ffa08",\r
+       "98d76f91.c8c54",\r
+       "a3f7481a.abb8"]]\r
+},\r
+{\r
+       "id": "dcb1760.89ffa08",\r
+       "type": "success",\r
+       "name": "outcome: null",\r
+       "xml": "<outcome value=''>",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 488.8000030517578,\r
+       "y": 431,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b4dbe38b.0e0a"]]\r
+},\r
+{\r
+       "id": "b4dbe38b.0e0a",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 669.8000030517578,\r
+       "y": 432,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "98d76f91.c8c54",\r
+       "type": "other",\r
+       "name": "other",\r
+       "xml": "<outcome value='Other'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 473.8000030517578,\r
+       "y": 482,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["2de944f3.05e69c"]]\r
+},\r
+{\r
+       "id": "2de944f3.05e69c",\r
+       "type": "block",\r
+       "name": "block : atomic",\r
+       "xml": "<block atomic='true'>",\r
+       "atomic": "true",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 639.8000030517578,\r
+       "y": 482,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["6daad21c.68e2b4",\r
+       "4efadab6.d55e64",\r
+       "cd3ddb1a.5bb78",\r
+       "be6b471b.84e3e"]]\r
+},\r
+{\r
+       "id": "cd3ddb1a.5bb78",\r
+       "type": "set",\r
+       "name": "set configuration-params",\r
+       "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",\r
+       "comments": "",\r
+       "x": 858.8000030517578,\r
+       "y": 620,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "46f01183.a53be8",\r
+       "type": "success",\r
+       "name": "success",\r
+       "xml": "<outcome value='success'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 181.09999084472656,\r
+       "y": 1286.0000228881836,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["ae0b66a.66a0098"]]\r
+},\r
+{\r
+       "id": "ae0b66a.66a0098",\r
+       "type": "block",\r
+       "name": "block : atomic",\r
+       "xml": "<block atomic='true'>",\r
+       "atomic": "true",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 338.6999969482422,\r
+       "y": 1286.0000534057617,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "31093ba.3c3eb44",\r
+       "type": "execute",\r
+       "name": "execute Save in MDSal",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 591.3000030517578,\r
+       "y": 1272,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["cd41d6f9.21cd3"]]\r
+},\r
+{\r
+       "id": "cd41d6f9.21cd3",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 769.3000030517578,\r
+       "y": 1269,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["67327bd6.a20254"]]\r
+},\r
+{\r
+       "id": "67327bd6.a20254",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 929.3000030517578,\r
+       "y": 1264,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b429d877.309088",\r
+       "85a2f3bd.b8ace"]]\r
+},\r
+{\r
+       "id": "27a98df6.c5249a",\r
+       "type": "set",\r
+       "name": "set:  dcae-error message",\r
+       "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"Unable to get Yang Model\"/>",\r
+       "comments": "",\r
+       "x": 1088.3000030517578,\r
+       "y": 1087,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "de409635.1fb438",\r
+       "type": "set",\r
+       "name": "set:  dcae-error message",\r
+       "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$parameter-yang.error-message`\"/>",\r
+       "comments": "",\r
+       "x": 1099.3000030517578,\r
+       "y": 1140,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "b429d877.309088",\r
+       "type": "set",\r
+       "name": "set:  dcae-error message",\r
+       "xml": "<set>\n <parameter name=\"dcae-error-message\" value=\"`$tmp.mdSalSave.ERROR_MESSAGE`\"/>",\r
+       "comments": "",\r
+       "x": 1141.3000030517578,\r
+       "y": 1268,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "85a2f3bd.b8ace",\r
+       "type": "execute",\r
+       "name": "execute saveTxLog",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1111.3000030517578,\r
+       "y": 1195,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["f5750c61.e1a1"]]\r
+},\r
+{\r
+       "id": "9d04a4cb.9872a8",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1422.3000030517578,\r
+       "y": 1193,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "f5750c61.e1a1",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1287.3000030517578,\r
+       "y": 1192,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["9d04a4cb.9872a8"]]\r
+},\r
+{\r
+       "id": "2ea4c87.8bf6ab8",\r
+       "type": "execute",\r
+       "name": "execute IntermediateMessageSender",\r
+       "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\"/>",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 738.3000030517578,\r
+       "y": 1335,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["db0480a1.51d058",\r
+       "96feee88.a7a2"]]\r
+},\r
+{\r
+       "id": "db0480a1.51d058",\r
+       "type": "not-found",\r
+       "name": "not-found",\r
+       "xml": "<outcome value='not-found'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 963.3000030517578,\r
+       "y": 1314,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["9f87a89.0278558"]]\r
+},\r
+{\r
+       "id": "96feee88.a7a2",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 960.3000030517578,\r
+       "y": 1368,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["9f87a89.0278558"]]\r
+},\r
+{\r
+       "id": "2ca4ce20.a09c5a",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1263.3000030517578,\r
+       "y": 1339,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "d9c32502.22ebe8",\r
+       "type": "success",\r
+       "name": "success",\r
+       "xml": "<outcome value='success'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 158.8000030517578,\r
+       "y": 221.999995470047,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["5bf40df0.8d4cb4"]]\r
+},\r
+{\r
+       "id": "5bf40df0.8d4cb4",\r
+       "type": "block",\r
+       "name": "block : atomic",\r
+       "xml": "<block atomic='true'>",\r
+       "atomic": "true",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 326.8000030517578,\r
+       "y": 221.999995470047,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["9144373b.29b98",\r
+       "bba26b3a.f47e6",\r
+       "ab7d47a7.04d418",\r
+       "a13a97dd.f84738",\r
+       "5930cb16.527f34",\r
+       "1bdde293.53627d"]]\r
+},\r
+{\r
+       "id": "464d014.9468b",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1160.8000030517578,\r
+       "y": 172,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "a3f7481a.abb8",\r
+       "type": "success",\r
+       "name": "outcome: []",\r
+       "xml": "<outcome value='[]'>",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 493.8000030517578,\r
+       "y": 386,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["54b478e3.e94c2"]]\r
+},\r
+{\r
+       "id": "54b478e3.e94c2",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 654.8000030517578,\r
+       "y": 387,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "9f87a89.0278558",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1116.8000030517578,\r
+       "y": 1343,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["2ca4ce20.a09c5a"]]\r
+},\r
+{\r
+       "id": "48e06314.429714",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1163.1333465576172,\r
+       "y": 117.999995470047,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "8b93fda3.ab2658",\r
+       "type": "comment",\r
+       "name": "MD-SAL error message is not propagated to GUI",\r
+       "info": "DCAE-Error messages are not propagated to GUI",\r
+       "comments": "",\r
+       "x": 747.8000030517578,\r
+       "y": 949,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "b6d7f647.ecfd6",\r
+       "type": "execute",\r
+       "name": "execute Get Aai Data",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 908.5500030517578,\r
+       "y": 709.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["cf0f09f8.580288"]]\r
+},\r
+{\r
+       "id": "cf0f09f8.580288",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1115.5500030517578,\r
+       "y": 709.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["d76406db.f0f83"]]\r
+},\r
+{\r
+       "id": "d76406db.f0f83",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1267.5500030517578,\r
+       "y": 708.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["ddc7dac.ae16fa8"]]\r
+},\r
+{\r
+       "id": "ddc7dac.ae16fa8",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 1448.5500030517578,\r
+       "y": 708.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "c37cf681.b91ab",\r
+       "type": "execute",\r
+       "name": "execute Get Complete Set of Params",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 883.5500030517578,\r
+       "y": 757.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["5f5b5e16.ec072"]]\r
+},\r
+{\r
+       "id": "5f5b5e16.ec072",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1126.0500030517578,\r
+       "y": 756.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["5bbef734.e1df8"]]\r
+},\r
+{\r
+       "id": "5bbef734.e1df8",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 1277.0500030517578,\r
+       "y": 755.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["f2595cad.6707e8"]]\r
+},\r
+{\r
+       "id": "f2595cad.6707e8",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 1449.0500030517578,\r
+       "y": 758.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "d523018.54c0f8",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 803.0500030517578,\r
+       "y": 664.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "a13a97dd.f84738",\r
+       "type": "switchNode",\r
+       "name": "switch AaiKeys exists",\r
+       "xml": "<switch test='`$AAI.keys`'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 261.5500030517578,\r
+       "y": 628.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["bdcc2dac.30257",\r
+       "3b48a46b.0dfb94",\r
+       "1724c03e.6a325"]]\r
+},\r
+{\r
+       "id": "bdcc2dac.30257",\r
+       "type": "success",\r
+       "name": "outcome: null",\r
+       "xml": "<outcome value=''>",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 496.0500030517578,\r
+       "y": 647.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["2ff1349f.8def04"]]\r
+},\r
+{\r
+       "id": "2ff1349f.8def04",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 654.0500030517578,\r
+       "y": 645.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "3b48a46b.0dfb94",\r
+       "type": "other",\r
+       "name": "other",\r
+       "xml": "<outcome value='Other'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 431.0500030517578,\r
+       "y": 758.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b9be9eb0.09f0e"]]\r
+},\r
+{\r
+       "id": "b9be9eb0.09f0e",\r
+       "type": "block",\r
+       "name": "block : atomic",\r
+       "xml": "<block atomic='true'>",\r
+       "atomic": "true",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 595.0500030517578,\r
+       "y": 753.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["b6d7f647.ecfd6",\r
+       "c37cf681.b91ab",\r
+       "b924b82b.3eb898",\r
+       "d523018.54c0f8"]]\r
+},\r
+{\r
+       "id": "b924b82b.3eb898",\r
+       "type": "set",\r
+       "name": "set configuration-params",\r
+       "xml": "<set>\n<parameter name='configuration-params' value='`$tmp.allParams.configuration-parameters`' />\n\n",\r
+       "comments": "",\r
+       "x": 866.0500030517578,\r
+       "y": 809.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+},\r
+{\r
+       "id": "1724c03e.6a325",\r
+       "type": "success",\r
+       "name": "outcome: []",\r
+       "xml": "<outcome value='[]'>",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 490.0500030517578,\r
+       "y": 585.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["908bf879.cad018"]]\r
+},\r
+{\r
+       "id": "908bf879.cad018",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 643.0500030517578,\r
+       "y": 582.75,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "5930cb16.527f34",\r
+       "type": "execute",\r
+       "name": "execute Validation",\r
+       "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\" />",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 244.7999725341797,\r
+       "y": 859.9998779296875,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["3624d874.623b3",\r
+       "16604a5d.5d119e"]]\r
+},\r
+{\r
+       "id": "6c3c651.bee9f9c",\r
+       "type": "block",\r
+       "name": "block",\r
+       "xml": "<block>\n",\r
+       "atomic": "false",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 629.2000274658203,\r
+       "y": 883.5999450683594,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["185f4a2e.ea1a36"]]\r
+},\r
+{\r
+       "id": "3624d874.623b3",\r
+       "type": "failure",\r
+       "name": "failure",\r
+       "xml": "<outcome value='failure'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 468.96669006347656,\r
+       "y": 854.1428527832031,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["6c3c651.bee9f9c"]]\r
+},\r
+{\r
+       "id": "16604a5d.5d119e",\r
+       "type": "not-found",\r
+       "name": "not-found",\r
+       "xml": "<outcome value='not-found'>\n",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 459.2523956298828,\r
+       "y": 925.6666564941406,\r
+       "z": "761501d1.cda508",\r
+       "wires": [["6c3c651.bee9f9c"]]\r
+},\r
+{\r
+       "id": "1bdde293.53627d",\r
+       "type": "record",\r
+       "name": "record",\r
+       "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",\r
+       "comments": "",\r
+       "outputs": 1,\r
+       "x": 248.9666748046875,\r
+       "y": 953.9524230957031,\r
+       "z": "761501d1.cda508",\r
+       "wires": [[]]\r
+},\r
+{\r
+       "id": "185f4a2e.ea1a36",\r
+       "type": "returnFailure",\r
+       "name": "return failure",\r
+       "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",\r
+       "comments": "",\r
+       "x": 856.1095123291016,\r
+       "y": 866.8095397949219,\r
+       "z": "761501d1.cda508",\r
+       "wires": []\r
+}]
\ No newline at end of file
index 37a40f7..f824043 100644 (file)
@@ -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;
index a703f81..137ef9e 100644 (file)
@@ -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
index f5f4924..88ab4c1 100644 (file)
@@ -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;
@@ -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
@@ -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 (file)
index ce3dd76..0000000
+++ /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 (file)
index 0000000..37be9fe
--- /dev/null
@@ -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);
+        }
+
+}
+