X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_validate-network-input-parameters.json;h=e649dd76efe14e87101b0be153d4a06f014c3559;hb=6b6ccfc2d1702eaae39a7e4877e51d274e17b07f;hp=f4f960554be87cf06d50a21b2925adf882482276;hpb=a8e7d59abcc55950e76f36cf4c2d280f55a38381;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
index f4f96055..e649dd76 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "a6c81f95.1fa118",
+    "id": "ddf8122b.bf6e5",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 100.99998092651367,
-    "y": 142.0476369857788,
-    "z": "65c9aaba.d47f7c",
+    "x": 87,
+    "y": 115.04766654968262,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a7b8fbd6.6571b8"
+        "2fff1e3d.63ab82"
       ]
     ]
   },
   {
-    "id": "a7b8fbd6.6571b8",
+    "id": "2fff1e3d.63ab82",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1003 +22,1079 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 346.28569412231445,
-    "y": 141.28571605682373,
-    "z": "65c9aaba.d47f7c",
+    "x": 332.2857131958008,
+    "y": 114.28574562072754,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "45cf957f.7d2f24"
+        "5d7ec735.0c4ba8"
       ]
     ]
   },
   {
-    "id": "45cf957f.7d2f24",
+    "id": "5d7ec735.0c4ba8",
     "type": "method",
     "name": "method validate-network-input-parameters",
     "xml": "<method rpc='validate-network-input-parameters' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 303.9166679382324,
-    "y": 216.30065441131592,
-    "z": "65c9aaba.d47f7c",
+    "x": 289.91668701171875,
+    "y": 189.30068397521973,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "c3df6ec7.366e"
+        "c72cc377.3d6a98"
       ]
     ]
   },
   {
-    "id": "c3df6ec7.366e",
+    "id": "c72cc377.3d6a98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 587.916675567627,
-    "y": 204.30067920684814,
-    "z": "65c9aaba.d47f7c",
+    "x": 573.9166946411133,
+    "y": 177.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "3e0f268c.78cbaa",
-        "5d08a6e7.19c55"
+        "846bb887.500c9",
+        "26516dd.068d212"
       ]
     ]
   },
   {
-    "id": "3e0f268c.78cbaa",
+    "id": "846bb887.500c9",
     "type": "switchNode",
     "name": "switch  svc-action",
     "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 868.916675567627,
-    "y": 199.3006649017334,
-    "z": "65c9aaba.d47f7c",
+    "x": 854.9166946411133,
+    "y": 172.3006944656372,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "8c7d88cf.19c588"
+        "770a13b8.39f74c"
       ]
     ]
   },
   {
-    "id": "8c7d88cf.19c588",
+    "id": "770a13b8.39f74c",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1059.6309776306152,
-    "y": 200.30066585540771,
-    "z": "65c9aaba.d47f7c",
+    "x": 1045.6309967041016,
+    "y": 173.30069541931152,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a12c30e5.545f9"
+        "b2cafa38.2cf18"
       ]
     ]
   },
   {
-    "id": "a12c30e5.545f9",
+    "id": "b2cafa38.2cf18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
     "comments": "",
-    "x": 1234.05952835083,
-    "y": 199.30065822601318,
-    "z": "65c9aaba.d47f7c",
+    "x": 1220.0595474243164,
+    "y": 172.300687789917,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "5d08a6e7.19c55",
+    "id": "26516dd.068d212",
     "type": "switchNode",
     "name": "switch svc-action",
-    "xml": "<switch test='`$service-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 169.91662216186523,
-    "y": 475.30067920684814,
-    "z": "65c9aaba.d47f7c",
+    "x": 155.91664123535156,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "7698d5c.1143dac",
-        "c834ebc1.b37db",
-        "280a1dfa.b0ef12",
-        "40cce0a9.5132b8",
-        "5ba97181.5ecc78"
+        "3553ffe6.e3983",
+        "9543c13f.54a338",
+        "67e65045.59b8a8",
+        "72ab0083.c0d808",
+        "1c3c77bb.a2bfc"
       ]
     ]
   },
   {
-    "id": "7698d5c.1143dac",
+    "id": "3553ffe6.e3983",
     "type": "outcome",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 371.4167060852051,
-    "y": 475.30067920684814,
-    "z": "65c9aaba.d47f7c",
+    "x": 357.4167251586914,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1379c979.4ffbd7"
+        "dfd730e2.3d41a"
       ]
     ]
   },
   {
-    "id": "1379c979.4ffbd7",
+    "id": "dfd730e2.3d41a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 537.4167137145996,
-    "y": 475.30067920684814,
-    "z": "65c9aaba.d47f7c",
+    "x": 523.4167327880859,
+    "y": 448.30070877075195,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "97127fcd.491ca8"
+        "b792e4c7.13b96"
       ]
     ]
   },
   {
-    "id": "9bc1551b.7cbc08",
+    "id": "786f42e8.a3ebcc",
     "type": "for",
     "name": "for loop i - Network input parameters",
-    "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-information.network-request-input.network-input-parameters.param_length`\">\n",
+    "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1736.6308555603027,
-    "y": 139.01494884490967,
-    "z": "65c9aaba.d47f7c",
+    "x": 1720.630859375,
+    "y": 109.01498413085938,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "5138f56a.465374"
+        "39c05252.332006"
       ]
     ]
   },
   {
-    "id": "4640e206.76b664",
+    "id": "4662d843.0df85",
     "type": "switchNode",
     "name": "switch value",
     "xml": "<switch test=\"`$tmp.value`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2590.202205657959,
-    "y": 393.01492404937744,
-    "z": "65c9aaba.d47f7c",
+    "x": 2576.2022247314453,
+    "y": 366.01495361328125,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "134be211.73f7be"
+        "632316ae.127dd"
       ]
     ]
   },
   {
-    "id": "134be211.73f7be",
+    "id": "632316ae.127dd",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2807.202178955078,
-    "y": 392.01492977142334,
-    "z": "65c9aaba.d47f7c",
+    "x": 2793.2021980285645,
+    "y": 365.01495933532715,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "d41b48b9.7616f8"
+        "3f61b79e.239a58"
       ]
     ]
   },
   {
-    "id": "d41b48b9.7616f8",
+    "id": "3f61b79e.239a58",
     "type": "returnFailure",
     "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'\" />\n",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'network-request-input.network-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
     "comments": "",
-    "x": 2985.6308937072754,
-    "y": 393.01492977142334,
-    "z": "65c9aaba.d47f7c",
+    "x": 2971.6309127807617,
+    "y": 366.01495933532715,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "c834ebc1.b37db",
+    "id": "9543c13f.54a338",
     "type": "outcome",
     "name": "deactivate",
     "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 373.71426010131836,
-    "y": 633.47620677948,
-    "z": "65c9aaba.d47f7c",
+    "x": 359.7142791748047,
+    "y": 606.4762363433838,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "2303dff.d38ae2"
+        "ff7f1b4f.30d5a8"
       ]
     ]
   },
   {
-    "id": "280a1dfa.b0ef12",
+    "id": "67e65045.59b8a8",
     "type": "outcome",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 377.4286422729492,
-    "y": 804.1907644271851,
-    "z": "65c9aaba.d47f7c",
+    "x": 363.42866134643555,
+    "y": 777.1907939910889,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "389ea1d5.79e916"
+        "c1e4044f.d7929"
       ]
     ]
   },
   {
-    "id": "40cce0a9.5132b8",
+    "id": "72ab0083.c0d808",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 375.1905212402344,
-    "y": 758.6190328598022,
-    "z": "65c9aaba.d47f7c",
+    "x": 363.1905517578125,
+    "y": 950.6190795898438,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1a84f642.1ab022"
+        "f0129720.1ef558"
       ]
     ]
   },
   {
-    "id": "1a84f642.1ab022",
+    "id": "f0129720.1ef558",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
     "comments": "",
-    "x": 528.7620964050293,
-    "y": 761.2381768226624,
-    "z": "65c9aaba.d47f7c",
+    "x": 546.7620849609375,
+    "y": 951.2382202148438,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "5138f56a.465374",
+    "id": "39c05252.332006",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1614.7142295837402,
-    "y": 285.76189708709717,
-    "z": "65c9aaba.d47f7c",
+    "x": 1600.7142486572266,
+    "y": 258.761926651001,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "29c502b.740c77e",
-        "6b4d7b55.4c2ff4",
-        "9b824272.4adc6"
+        "bd82571.4ad4228",
+        "ce182094.ef8a3",
+        "6a5abb1b.52e074"
       ]
     ]
   },
   {
-    "id": "97127fcd.491ca8",
+    "id": "b792e4c7.13b96",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 862.9999961853027,
-    "y": 364.71430683135986,
-    "z": "65c9aaba.d47f7c",
+    "x": 849.0000152587891,
+    "y": 337.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b86df3ce.626b8",
-        "ff7737a8.55111"
+        "c5d42ffb.c9f0d8",
+        "69f739d0.28fca"
       ]
     ]
   },
   {
-    "id": "b86df3ce.626b8",
+    "id": "c5d42ffb.c9f0d8",
     "type": "other",
     "name": "CreateNetworkInstance",
     "xml": "<outcome value='CreateNetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1128.9999961853027,
-    "y": 323.71430683135986,
-    "z": "65c9aaba.d47f7c",
+    "x": 1115.000015258789,
+    "y": 296.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b782b5c0.64daa8"
+        "2a69c84.9676bb8"
       ]
     ]
   },
   {
-    "id": "ff7737a8.55111",
+    "id": "69f739d0.28fca",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1082.9999961853027,
-    "y": 373.71430683135986,
-    "z": "65c9aaba.d47f7c",
+    "x": 1069.000015258789,
+    "y": 346.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "64b48b9c.6474c4"
+        "a4f6f6a1.e1ab58"
       ]
     ]
   },
   {
-    "id": "64b48b9c.6474c4",
+    "id": "a4f6f6a1.e1ab58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be CreateNetworkInstance for svc-action=create\" />\n",
     "comments": "",
-    "x": 1251.9999961853027,
-    "y": 373.71430683135986,
-    "z": "65c9aaba.d47f7c",
+    "x": 1238.000015258789,
+    "y": 346.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "b782b5c0.64daa8",
+    "id": "2a69c84.9676bb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1353.9999961853027,
-    "y": 312.71430683135986,
-    "z": "65c9aaba.d47f7c",
+    "x": 1340.000015258789,
+    "y": 285.7143363952637,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "9bc1551b.7cbc08"
+        "786f42e8.a3ebcc"
       ]
     ]
   },
   {
-    "id": "29c502b.740c77e",
+    "id": "bd82571.4ad4228",
     "type": "set",
     "name": "clear tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
     "comments": "",
-    "x": 1806.7142906188965,
-    "y": 239.99999523162842,
-    "z": "65c9aaba.d47f7c",
+    "x": 1792.7143096923828,
+    "y": 213.00002479553223,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "6b4d7b55.4c2ff4",
+    "id": "ce182094.ef8a3",
     "type": "set",
     "name": "set tmp-data",
-    "xml": "<set>\n<parameter name='tmp.name' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].name'\"/>\n<parameter name='tmp.value' value=\"'$network-topology-operation-input.network-request-input.network-input-parameters.param[i].value'\"/>\n",
+    "xml": "<set>\n<parameter name='tmp.name' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$i].value`\"/>\n",
     "comments": "",
-    "x": 1795.7142906188965,
-    "y": 329.9999952316284,
-    "z": "65c9aaba.d47f7c",
+    "x": 1781.7143096923828,
+    "y": 303.0000247955322,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "9b824272.4adc6",
+    "id": "6a5abb1b.52e074",
     "type": "switchNode",
     "name": "switch name",
-    "xml": "<switch test=\"'$tmp.name'\">\n",
+    "xml": "<switch test=\"`$tmp.name`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1774.7142906188965,
-    "y": 423.9999952316284,
-    "z": "65c9aaba.d47f7c",
+    "x": 1760.7143096923828,
+    "y": 397.0000247955322,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "9dc924e4.d5eee8",
-        "d40dab22.2110d",
-        "d21b9753.5ddc7",
-        "eb828f46.725928",
-        "26f6f12.444ae0e",
-        "79521d4d.d066fc",
-        "ea7a9601.54836",
-        "fcdaea7c.60c75",
-        "dd18a79d.ddd94",
-        "a1177f41.e35148",
-        "73ed196f.9f7c8",
-        "3464140a.8cc06c",
-        "87259f41.87e1c8",
-        "41479001.27e018",
-        "19083ff5.a4af58",
-        "d82aab4b.d86238",
-        "b73417db.a46ef8"
+        "52effe4f.ac2ae8",
+        "869a7fd8.50b75",
+        "407c2eba.5d49f8",
+        "174077c9.6c10c8",
+        "4f610fc8.b35008",
+        "10ff2035.1d4618",
+        "4c528719.50cae",
+        "a67c5c2f.007308",
+        "8b639e89.f3549",
+        "d88cca1b.f3ea88",
+        "986570e4.376248",
+        "cd383e71.d36be8",
+        "a1ba7fd7.d88d3",
+        "a53ac3b.66852c",
+        "3d95e365.11bc6c",
+        "18048265.211a56",
+        "e570f120.c01b38"
       ]
     ]
   },
   {
-    "id": "9dc924e4.d5eee8",
+    "id": "52effe4f.ac2ae8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2314.2855796813965,
-    "y": 926.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2300.285598754883,
+    "y": 900,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "fd7cd54b.6b7b6"
+        "540cec23.3e0ea4"
       ]
     ]
   },
   {
-    "id": "fd7cd54b.6b7b6",
+    "id": "540cec23.3e0ea4",
     "type": "returnFailure",
     "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'network-topology-operation-input.network-request-input.network-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
     "comments": "",
-    "x": 2489.2855796813965,
-    "y": 925.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2475.285598754883,
+    "y": 899,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "d40dab22.2110d",
+    "id": "869a7fd8.50b75",
     "type": "other",
     "name": "name",
     "xml": "<outcome value='name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2291.2855796813965,
-    "y": 48.99997043609619,
-    "z": "65c9aaba.d47f7c",
+    "x": 2277.285598754883,
+    "y": 22,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "d21b9753.5ddc7",
+    "id": "407c2eba.5d49f8",
     "type": "other",
     "name": "service-type",
     "xml": "<outcome value='service-type'>",
     "comments": "",
     "outputs": 1,
-    "x": 2294.2855796813965,
-    "y": 115.99997043609619,
-    "z": "65c9aaba.d47f7c",
+    "x": 2280.285598754883,
+    "y": 89,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "ea7a9601.54836",
+    "id": "4c528719.50cae",
     "type": "other",
     "name": "sna2_name",
     "xml": "<outcome value='sna2_name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2298.2855796813965,
-    "y": 344.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2284.285598754883,
+    "y": 318,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "eb828f46.725928",
+    "id": "174077c9.6c10c8",
     "type": "other",
     "name": "site1-name",
     "xml": "<outcome value='site1-name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2295.2855796813965,
-    "y": 176.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2281.285598754883,
+    "y": 150,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "26f6f12.444ae0e",
+    "id": "4f610fc8.b35008",
     "type": "other",
     "name": "site2-name",
     "xml": "<outcome value='site2-name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2291.2855796813965,
-    "y": 233.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2277.285598754883,
+    "y": 207,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "79521d4d.d066fc",
+    "id": "10ff2035.1d4618",
     "type": "other",
     "name": "sna1_name",
     "xml": "<outcome value='sna1_name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2294.2855796813965,
-    "y": 290.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2280.285598754883,
+    "y": 264,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "fcdaea7c.60c75",
+    "id": "a67c5c2f.007308",
     "type": "other",
     "name": "pe1_id",
     "xml": "<outcome value='pe1_id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2298.2855796813965,
-    "y": 395.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2284.285598754883,
+    "y": 369,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "dd18a79d.ddd94",
+    "id": "8b639e89.f3549",
     "type": "other",
     "name": "pe2_id",
     "xml": "<outcome value='pe2_id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2301.2855796813965,
-    "y": 443.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2287.285598754883,
+    "y": 417,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "a1177f41.e35148",
+    "id": "d88cca1b.f3ea88",
     "type": "other",
     "name": "ac1-id",
     "xml": "<outcome value='ac1-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2306.2855796813965,
-    "y": 492.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2292.285598754883,
+    "y": 466,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "73ed196f.9f7c8",
+    "id": "986570e4.376248",
     "type": "other",
     "name": "ac2-id",
     "xml": "<outcome value='ac2-id'>",
     "comments": "",
     "outputs": 1,
-    "x": 2308.2855796813965,
-    "y": 547.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2294.285598754883,
+    "y": 521,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "3464140a.8cc06c",
+    "id": "cd383e71.d36be8",
     "type": "other",
     "name": "ac1-ip",
     "xml": "<outcome value='ac1-ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2308.2855796813965,
-    "y": 599.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2294.285598754883,
+    "y": 573,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "87259f41.87e1c8",
+    "id": "a1ba7fd7.d88d3",
     "type": "other",
     "name": "ac2-ip",
     "xml": "<outcome value='ac2-ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2310.2855796813965,
-    "y": 660.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2296.285598754883,
+    "y": 634,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "41479001.27e018",
+    "id": "a53ac3b.66852c",
     "type": "other",
     "name": "ac1_peer_ip",
     "xml": "<outcome value='ac1_peer_ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2312.2855796813965,
-    "y": 710.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2298.285598754883,
+    "y": 684,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "19083ff5.a4af58",
+    "id": "3d95e365.11bc6c",
     "type": "other",
     "name": "ac2_peer_ip",
     "xml": "<outcome value='ac2_peer_ip'>",
     "comments": "",
     "outputs": 1,
-    "x": 2308.2855796813965,
-    "y": 758.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2294.285598754883,
+    "y": 732,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "d82aab4b.d86238",
+    "id": "18048265.211a56",
     "type": "other",
     "name": "ac1_svlan",
     "xml": "<outcome value='ac1_svlan'>",
     "comments": "",
     "outputs": 1,
-    "x": 2310.2855796813965,
-    "y": 811.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2296.285598754883,
+    "y": 785,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "b73417db.a46ef8",
+    "id": "e570f120.c01b38",
     "type": "other",
     "name": "ac2_svlan",
     "xml": "<outcome value='ac2_svlan'>",
     "comments": "",
     "outputs": 1,
-    "x": 2312.2855796813965,
-    "y": 872.9999704360962,
-    "z": "65c9aaba.d47f7c",
+    "x": 2298.285598754883,
+    "y": 846,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "4640e206.76b664"
+        "4662d843.0df85"
       ]
     ]
   },
   {
-    "id": "389ea1d5.79e916",
+    "id": "c1e4044f.d7929",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 308.57141494750977,
-    "y": 885.857213973999,
-    "z": "65c9aaba.d47f7c",
+    "x": 532.5714111328125,
+    "y": 775.8572387695312,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "54c12db0.6590dc"
+        "4d5581d7.e27f88"
       ]
     ]
   },
   {
-    "id": "1f448cd7.9ac43b",
+    "id": "4f4bf5a8.a829ac",
     "type": "other",
     "name": "DeleteNetworkInstance",
     "xml": "<outcome value='DeleteNetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 775.2857055664062,
-    "y": 798.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 965.2857055664062,
+    "y": 778.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "a7e9fd9d.eefae8"
+        "562b1ef.a708d6"
       ]
     ]
   },
   {
-    "id": "bd139dc0.9ef408",
+    "id": "548cf43d.62af0c",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 835.2857055664062,
-    "y": 928.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 1025.2857055664062,
+    "y": 908.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "c3650164.8f94"
+        "5adf131e.a61cf4"
       ]
     ]
   },
   {
-    "id": "c3650164.8f94",
+    "id": "5adf131e.a61cf4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeleteNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 1022.2857055664062,
-    "y": 929.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 1212.2857055664062,
+    "y": 909.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "a7e9fd9d.eefae8",
+    "id": "562b1ef.a708d6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 730.2857055664062,
-    "y": 998.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 920.2857055664062,
+    "y": 978.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "374f47e5.09a2f",
-        "8ad81c32.d34b9"
+        "253ad8eb.98869",
+        "aeedc57a.12dee8"
       ]
     ]
   },
   {
-    "id": "374f47e5.09a2f",
+    "id": "253ad8eb.98869",
     "type": "switchNode",
     "name": "switch network-id",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 884.28564453125,
-    "y": 1098.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 1074.28564453125,
+    "y": 1078.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "3a8b9cb2.91ca2c"
+        "34e7b676.a0927a"
       ]
     ]
   },
   {
-    "id": "3a8b9cb2.91ca2c",
+    "id": "34e7b676.a0927a",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1068.28564453125,
-    "y": 1101.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 1258.28564453125,
+    "y": 1081.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "ed90dada.d01dc8"
+        "8389ad47.02308"
       ]
     ]
   },
   {
-    "id": "ed90dada.d01dc8",
+    "id": "8389ad47.02308",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 1224.71435546875,
-    "y": 1100.857177734375,
-    "z": "65c9aaba.d47f7c",
+    "x": 1414.71435546875,
+    "y": 1080.857177734375,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "5ba97181.5ecc78",
+    "id": "1c3c77bb.a2bfc",
     "type": "outcome",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 372.42855072021484,
-    "y": 567.7619495391846,
-    "z": "65c9aaba.d47f7c",
+    "x": 358.4285697937012,
+    "y": 540.7619791030884,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "3c576c37.cacc9c"
+        "3c6d4ec3.c79d7a"
       ]
     ]
   },
   {
-    "id": "3c576c37.cacc9c",
+    "id": "3c6d4ec3.c79d7a",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 555.285717010498,
-    "y": 564.9047994613647,
-    "z": "65c9aaba.d47f7c",
+    "x": 541.2857360839844,
+    "y": 537.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "9ef27dfb.32967",
-        "47a1d56.952aa2c"
+        "bc964363.f267b",
+        "a1a12099.fb3058"
       ]
     ]
   },
   {
-    "id": "9ef27dfb.32967",
+    "id": "bc964363.f267b",
     "type": "other",
     "name": "ActivateDCINetworkInstance",
     "xml": "<outcome value='ActivateDCINetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 821.285717010498,
-    "y": 523.9047994613647,
-    "z": "65c9aaba.d47f7c",
+    "x": 807.2857360839844,
+    "y": 496.90482902526855,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b568716c.746398"
+        "a3300122.bf0e6"
       ]
     ]
   },
   {
-    "id": "47a1d56.952aa2c",
+    "id": "a1a12099.fb3058",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 775.285717010498,
-    "y": 573.9047994613647,
-    "z": "65c9aaba.d47f7c",
+    "x": 761.2857360839844,
+    "y": 546.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "66c486ba.242f98"
+        "7572ee8e.b0b5b8"
       ]
     ]
   },
   {
-    "id": "66c486ba.242f98",
+    "id": "7572ee8e.b0b5b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be ActivateNetworkInstance for svc-action=activate\" />\n",
     "comments": "",
-    "x": 944.285717010498,
-    "y": 573.9047994613647,
-    "z": "65c9aaba.d47f7c",
+    "x": 930.2857360839844,
+    "y": 546.9048290252686,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "b568716c.746398",
+    "id": "a3300122.bf0e6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1046.285717010498,
-    "y": 512.9047994613647,
-    "z": "65c9aaba.d47f7c",
+    "x": 1032.2857360839844,
+    "y": 485.90482902526855,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "f1391d7b.3f3618"
+        "7cd4d474.99df44"
       ]
     ]
   },
   {
-    "id": "ab14b358.9b8f7",
+    "id": "e4ddb749.a4dd58",
     "type": "other",
     "name": "DeActivateDCINetworkInstance",
     "xml": "<outcome value='DeActivateDCINetworkInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 817.1428871154785,
-    "y": 635.1906003952026,
-    "z": "65c9aaba.d47f7c",
+    "x": 803.1429061889648,
+    "y": 608.1906299591064,
+    "z": "8e4867bc.5edaa8",
     "wires": [
-      []
+      [
+        "393b880c.5a2ab8"
+      ]
     ]
   },
   {
-    "id": "afd0efcd.371a1",
+    "id": "b415c4d7.ec51d8",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 732.142879486084,
-    "y": 704.1906080245972,
-    "z": "65c9aaba.d47f7c",
+    "x": 718.1428985595703,
+    "y": 677.190637588501,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "b6887a7a.63ca6"
+        "b678cd71.9eea48"
       ]
     ]
   },
   {
-    "id": "b6887a7a.63ca6",
+    "id": "b678cd71.9eea48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be DeactivateNetworkInstance for svc-action=deactivate\" />\n",
     "comments": "",
-    "x": 913.142894744873,
-    "y": 705.1906080245972,
-    "z": "65c9aaba.d47f7c",
+    "x": 899.1429138183594,
+    "y": 678.190637588501,
+    "z": "8e4867bc.5edaa8",
     "wires": []
   },
   {
-    "id": "f1391d7b.3f3618",
+    "id": "7cd4d474.99df44",
     "type": "call",
     "name": "call validate-overlay-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-overlay-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1354.151050567627,
-    "y": 514.3333225250244,
-    "z": "65c9aaba.d47f7c",
+    "x": 1340.1510696411133,
+    "y": 487.3333520889282,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2303dff.d38ae2",
+    "id": "ff7f1b4f.30d5a8",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 553.999942779541,
-    "y": 635.6664342880249,
-    "z": "65c9aaba.d47f7c",
+    "x": 539.9999618530273,
+    "y": 608.6664638519287,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "ab14b358.9b8f7",
-        "afd0efcd.371a1"
+        "e4ddb749.a4dd58",
+        "b415c4d7.ec51d8"
       ]
     ]
   },
   {
-    "id": "54c12db0.6590dc",
+    "id": "4d5581d7.e27f88",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 544,
-    "y": 886,
-    "z": "65c9aaba.d47f7c",
+    "x": 706,
+    "y": 867,
+    "z": "8e4867bc.5edaa8",
+    "wires": [
+      [
+        "4f4bf5a8.a829ac",
+        "548cf43d.62af0c"
+      ]
+    ]
+  },
+  {
+    "id": "aeedc57a.12dee8",
+    "type": "execute",
+    "name": "execute requiredParameter",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"network-topology-operation-input.network-information.network-id\" value=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1207,
+    "y": 975,
+    "z": "8e4867bc.5edaa8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "393b880c.5a2ab8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1091.9999618530273,
+    "y": 611,
+    "z": "8e4867bc.5edaa8",
+    "wires": [
+      [
+        "46bbeff4.c42c88",
+        "1fbe8bfb.465ce4"
+      ]
+    ]
+  },
+  {
+    "id": "46bbeff4.c42c88",
+    "type": "switchNode",
+    "name": "switch network-id",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1245.999900817871,
+    "y": 711,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       [
-        "1f448cd7.9ac43b",
-        "bd139dc0.9ef408"
+        "147516eb.099cf9"
       ]
     ]
   },
   {
-    "id": "8ad81c32.d34b9",
+    "id": "147516eb.099cf9",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1429.999900817871,
+    "y": 714,
+    "z": "8e4867bc.5edaa8",
+    "wires": [
+      [
+        "c957deec.097848"
+      ]
+    ]
+  },
+  {
+    "id": "c957deec.097848",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
+    "comments": "",
+    "x": 1586.428611755371,
+    "y": 713,
+    "z": "8e4867bc.5edaa8",
+    "wires": []
+  },
+  {
+    "id": "1fbe8bfb.465ce4",
     "type": "execute",
     "name": "execute requiredParameters",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"$network-topology-operation-input.network-information.network-id\" value=\"\"/>\n\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"network-topology-operation-input.network-information.network-id\" value=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1017,
-    "y": 995,
-    "z": "65c9aaba.d47f7c",
+    "x": 1378.714256286621,
+    "y": 607.142822265625,
+    "z": "8e4867bc.5edaa8",
     "wires": [
       []
     ]