Fix underlay DG testing issue

After executing ActivateDCINetworkInstance, CreateNetworkInstance node is
executed as atomic block is not present, added new block
https://jira.onap.org/browse/SDNC-158

Issue-Id: SDNC-158
Change-Id: Ie6c13834237bc2f5aca3009d50ab9cd1236271a1
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: d9bacf82d866501025bdac2957dc43ab51c65777

2 files changed, 1238 insertions, 1281 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
index 73695c51..bab171ae 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input.json
@@ -1,1755 +1,1710 @@
 [
   {
-    "id":"3562cf58.a10c3",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":124.66666412353516,
-    "y":56,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "1b413dc8.b9ae22",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 173.03125,
+    "y": 147.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "e0c4e082.c3295"
+        "b9c51506.cb42b8"
       ]
     ]
   },
   {
-    "id":"e0c4e082.c3295",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "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":196.9523696899414,
-    "y":108.23811340332031,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "b9c51506.cb42b8",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API 1.2.0-SNAPSHOT",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "1.2.0-SNAPSHOT",
+    "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='1.2.0-SNAPSHOT'>",
+    "outputs": 1,
+    "x": 245.31695556640625,
+    "y": 200.23811149597168,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "74573d69.9fc2d4"
+        "26567304.810b8c"
       ]
     ]
   },
   {
-    "id":"74573d69.9fc2d4",
-    "type":"method",
-    "name":"validate-network-input",
-    "xml":"<method rpc='validate-network-input' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":197.0952911376953,
-    "y":170,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "26567304.810b8c",
+    "type": "method",
+    "name": "validate-network-input",
+    "xml": "<method rpc='validate-network-input' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 245.45987701416016,
+    "y": 261.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "38143f74.bd9fb"
+        "c056e8e0.d5aa98"
       ]
     ]
   },
   {
-    "id":"38143f74.bd9fb",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":210.41670989990234,
-    "y":452.44349479675293,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "c056e8e0.d5aa98",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 258.7812957763672,
+    "y": 544.4434928894043,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "6a4466c6.034508",
-        "a2d77c10.0ac29",
-        "a84fadec.2e44e",
-        "ffea4923.ca61d8",
-        "d893960c.dd4f28",
-        "5bf0bd5.e1cf344"
+        "f7738247.2ad73",
+        "4183fe1d.93134",
+        "6e7ed959.ee8ae8",
+        "294ce137.4036fe",
+        "32c347e7.e10498",
+        "40653e81.a79c4"
       ]
     ]
   },
   {
-    "id":"6a4466c6.034508",
-    "type":"switchNode",
-    "name":"switch svc-request-id",
-    "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":526.8095245361328,
-    "y":178.42859077453613,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "f7738247.2ad73",
+    "type": "switchNode",
+    "name": "switch svc-request-id",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 575.1741104125977,
+    "y": 270.4285888671875,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "2121585b.cc4c88"
+        "62ae03a5.3e50bc"
       ]
     ]
   },
   {
-    "id":"2121585b.cc4c88",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":752.523828778948,
-    "y":178.42859322684126,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "62ae03a5.3e50bc",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 800.8884146554128,
+    "y": 270.4285913194926,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b7fb6dfb.8d24d"
+        "35b6a58f.f29d5a"
       ]
     ]
   },
   {
-    "id":"b7fb6dfb.8d24d",
-    "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":903.9523947579519,
-    "y":178.42859131949263,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "35b6a58f.f29d5a",
+    "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": 952.3169806344167,
+    "y": 270.428589412144,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"a2d77c10.0ac29",
-    "type":"switchNode",
-    "name":"switch svc-action",
-    "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":515.3808975219727,
-    "y":137.00002098083496,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "4183fe1d.93134",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 563.7454833984375,
+    "y": 229.00001907348633,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b4f2a460.952418"
+        "5e116676.70e288"
       ]
     ]
   },
   {
-    "id":"b4f2a460.952418",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":751.0952491760254,
-    "y":135.57141876220703,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "5e116676.70e288",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 799.4598350524902,
+    "y": 227.5714168548584,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "61cade62.7bdae"
+        "21d9a530.c1c2ca"
       ]
     ]
   },
   {
-    "id":"61cade62.7bdae",
-    "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-action is a required input\" />\n",
-    "comments":"",
-    "x":901.0952224731445,
-    "y":135.5714282989502,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "21d9a530.c1c2ca",
+    "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-action is a required input\" />\n",
+    "comments": "",
+    "x": 949.4598083496094,
+    "y": 227.57142639160156,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"a84fadec.2e44e",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":525.3809356689453,
-    "y":221.285737991333,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6e7ed959.ee8ae8",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 573.7455215454102,
+    "y": 313.2857360839844,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "f530f35d.dff69"
+        "fd83a78d.66a948"
       ]
     ]
   },
   {
-    "id":"f530f35d.dff69",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":752.5238244192942,
-    "y":221.28574698311968,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "fd83a78d.66a948",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 800.8884102957591,
+    "y": 313.28574507577105,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "81af5b92.07ad88"
+        "886e4c02.7a3e6"
       ]
     ]
   },
   {
-    "id":"81af5b92.07ad88",
-    "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 a required input\" />\n",
-    "comments":"",
-    "x":903.9523903982981,
-    "y":221.28574507577105,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "886e4c02.7a3e6",
+    "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 a required input\" />\n",
+    "comments": "",
+    "x": 952.316976274763,
+    "y": 313.2857431684224,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"ffea4923.ca61d8",
-    "type":"switchNode",
-    "name":"switch service-instance-id",
-    "xml":"<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":534.5238418579102,
-    "y":264,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "294ce137.4036fe",
+    "type": "switchNode",
+    "name": "switch service-instance-id",
+    "xml": "<switch test='`$network-topology-operation-input.service-information.service-instance-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 582.888427734375,
+    "y": 355.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "f94eed30.1cf1f"
+        "2378998c.934706"
       ]
     ]
   },
   {
-    "id":"f94eed30.1cf1f",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":750.9524307250977,
-    "y":265,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "2378998c.934706",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 799.3170166015625,
+    "y": 356.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8de683d9.482d8"
+        "4f908320.d4841c"
       ]
     ]
   },
   {
-    "id":"8de683d9.482d8",
-    "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=\"service-information.service-instance-id is a required input\" />\n",
-    "comments":"",
-    "x":909.3809585571289,
-    "y":264,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "4f908320.d4841c",
+    "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=\"service-information.service-instance-id is a required input\" />\n",
+    "comments": "",
+    "x": 957.7455444335938,
+    "y": 355.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"5c67dc8d.8d5404",
-    "type":"comment",
-    "name":"validate-network-input - CHANGELOG",
-    "info":"12/8: Initial release 1.0.0",
-    "comments":"",
-    "x":409.66666412353516,
-    "y":20,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "7fe681cf.07fdd",
+    "type": "comment",
+    "name": "validate-network-input - CHANGELOG",
+    "info": "12/8: Initial release 1.0.0",
+    "comments": "",
+    "x": 458.03125,
+    "y": 111.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"d893960c.dd4f28",
-    "type":"switchNode",
-    "name":"switch svc-action",
-    "xml":"<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":511.66666412353516,
-    "y":351,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "32c347e7.e10498",
+    "type": "switchNode",
+    "name": "switch svc-action",
+    "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 560.03125,
+    "y": 442.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "bbb03e72.c193c",
-        "d561d416.9bde38",
-        "6249118d.6483f",
-        "3af74b5a.5deb94"
+        "fc7d6a84.f93168",
+        "7959dc9f.1bdd34",
+        "94f36a2f.0904d8",
+        "d8141396.7d6f"
       ]
     ]
   },
   {
-    "id":"bbb03e72.c193c",
-    "type":"other",
-    "name":"assign",
-    "xml":"<outcome value='assign'>",
-    "comments":"",
-    "outputs":1,
-    "x":744.3810195922852,
-    "y":356.5714111328125,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "fc7d6a84.f93168",
+    "type": "other",
+    "name": "assign",
+    "xml": "<outcome value='assign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 792.74560546875,
+    "y": 448.57140922546387,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "891109fe.945338"
+        "5fad1b65.6cf5f4"
       ]
     ]
   },
   {
-    "id":"d561d416.9bde38",
-    "type":"other",
-    "name":"activate",
-    "xml":"<outcome value='activate'>",
-    "comments":"",
-    "outputs":1,
-    "x":739.6667709350586,
-    "y":486.99999046325684,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "7959dc9f.1bdd34",
+    "type": "other",
+    "name": "activate",
+    "xml": "<outcome value='activate'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 788.0313568115234,
+    "y": 578.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "715e1bb3.dc8644"
+        "ad4e82b5.19db9"
       ]
     ]
   },
   {
-    "id":"6249118d.6483f",
-    "type":"other",
-    "name":"deactivate",
-    "xml":"<outcome value='deactivate'>",
-    "comments":"",
-    "outputs":1,
-    "x":742.6667327880859,
-    "y":653.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "94f36a2f.0904d8",
+    "type": "other",
+    "name": "deactivate",
+    "xml": "<outcome value='deactivate'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 791.0313186645508,
+    "y": 745.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "34bfca22.5765e6"
+        "c0070c2.94b94f"
       ]
     ]
   },
   {
-    "id":"891109fe.945338",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":906.6666641235352,
-    "y":356,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "5fad1b65.6cf5f4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 955.03125,
+    "y": 447.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "fa6a9864.20de58"
+        "df6549d7.184d68"
       ]
     ]
   },
   {
-    "id":"fa6a9864.20de58",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1126.6666641235352,
-    "y":356,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "df6549d7.184d68",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.03125,
+    "y": 447.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "6cbfdbf5.656f04",
-        "e45f32a3.8baec"
+        "ecdd6aae.5dce98",
+        "d4e2188a.cfa358"
       ]
     ]
   },
   {
-    "id":"6cbfdbf5.656f04",
-    "type":"other",
-    "name":"CreateNetworkInstance",
-    "xml":"<outcome value='CreateNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1406.6666641235352,
-    "y":321,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "ecdd6aae.5dce98",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1455.03125,
+    "y": 412.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "a3e07e88.c882c"
+        "da59191b.907b08"
       ]
     ]
   },
   {
-    "id":"e45f32a3.8baec",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1355.6666641235352,
-    "y":365,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "d4e2188a.cfa358",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1404.03125,
+    "y": 456.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "1947914a.274a4f"
+        "5cd6e955.998228"
       ]
     ]
   },
   {
-    "id":"1947914a.274a4f",
-    "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=assign\" />\n",
-    "comments":"",
-    "x":1524.6666641235352,
-    "y":365,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "5cd6e955.998228",
+    "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=assign\" />\n",
+    "comments": "",
+    "x": 1573.03125,
+    "y": 456.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"715e1bb3.dc8644",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":913.6667709350586,
-    "y":486.99999046325684,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "ad4e82b5.19db9",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 962.0313568115234,
+    "y": 578.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "61933e36.32ebf"
+        "fdddb74f.c28e98"
       ]
     ]
   },
   {
-    "id":"61933e36.32ebf",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1130.6667709350586,
-    "y":486.99999046325684,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "fdddb74f.c28e98",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.0313568115234,
+    "y": 578.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "d2032cc2.899d9",
-        "99d34aaa.d04488",
-        "44919742.aa0cd8"
+        "67405a30.66b624",
+        "f789090b.e09ab8",
+        "a629f7e0.27dc18"
       ]
     ]
   },
   {
-    "id":"d2032cc2.899d9",
-    "type":"other",
-    "name":"CreateNetworkInstance",
-    "xml":"<outcome value='CreateNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1411.6667709350586,
-    "y":487.99999046325684,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "67405a30.66b624",
+    "type": "other",
+    "name": "CreateNetworkInstance",
+    "xml": "<outcome value='CreateNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1460.0313568115234,
+    "y": 579.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "71f64cf9.079ef4"
+        "c1306bc.3cbcc98"
       ]
     ]
   },
   {
-    "id":"99d34aaa.d04488",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1354.6667709350586,
-    "y":527.9999904632568,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "f789090b.e09ab8",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1403.0313568115234,
+    "y": 619.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b7f6be61.4073c"
+        "5d963b8c.378d74"
       ]
     ]
   },
   {
-    "id":"b7f6be61.4073c",
-    "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=activate\" />\n",
-    "comments":"",
-    "x":1526.5240669250488,
-    "y":529.428596496582,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "5d963b8c.378d74",
+    "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=activate\" />\n",
+    "comments": "",
+    "x": 1574.8886528015137,
+    "y": 621.4285945892334,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"34bfca22.5765e6",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":924.6667327880859,
-    "y":652.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "c0070c2.94b94f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 973.0313186645508,
+    "y": 744.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "d7eb74bd.890dc8"
+        "22f63122.42e05e"
       ]
     ]
   },
   {
-    "id":"d7eb74bd.890dc8",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1141.666732788086,
-    "y":652.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "22f63122.42e05e",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1190.0313186645508,
+    "y": 744.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "16268a9c.1f62a5",
-        "baf47ce9.50dcc",
-        "1bec30c1.fe7d2f"
+        "6d2db562.ba9bfc",
+        "3b6ddfe1.7bf99",
+        "b80bf0eb.dad37"
       ]
     ]
   },
   {
-    "id":"16268a9c.1f62a5",
-    "type":"other",
-    "name":"DeleteNetworkInstance",
-    "xml":"<outcome value='DeleteNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1422.666732788086,
-    "y":653.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6d2db562.ba9bfc",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1471.0313186645508,
+    "y": 745.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "66edda2e.adbdb4"
+        "998324c.2692bd8"
       ]
     ]
   },
   {
-    "id":"baf47ce9.50dcc",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1365.666732788086,
-    "y":693.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "3b6ddfe1.7bf99",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1414.0313186645508,
+    "y": 785.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "a51db5f8.e4cd38"
+        "c74085f9.cc0278"
       ]
     ]
   },
   {
-    "id":"a51db5f8.e4cd38",
-    "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=deactivate\" />\n",
-    "comments":"",
-    "x":1534.6667976379395,
-    "y":695.857174873352,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "c74085f9.cc0278",
+    "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=deactivate\" />\n",
+    "comments": "",
+    "x": 1583.0313835144043,
+    "y": 787.8571729660034,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"3af74b5a.5deb94",
-    "type":"other",
-    "name":"unassign",
-    "xml":"<outcome value='unassign'>",
-    "comments":"",
-    "outputs":1,
-    "x":738.6667022705078,
-    "y":746.9999904632568,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "d8141396.7d6f",
+    "type": "other",
+    "name": "unassign",
+    "xml": "<outcome value='unassign'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 787.0312881469727,
+    "y": 838.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "fc12acc9.e5517"
+        "e1d20fe4.24b0a"
       ]
     ]
   },
   {
-    "id":"fc12acc9.e5517",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":920.6667327880859,
-    "y":743.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "e1d20fe4.24b0a",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 969.0313186645508,
+    "y": 835.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "521c12e4.61495c"
+        "6bf4f4c3.27a5ec"
       ]
     ]
   },
   {
-    "id":"521c12e4.61495c",
-    "type":"switchNode",
-    "name":"switch request-action",
-    "xml":"<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1137.666732788086,
-    "y":743.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6bf4f4c3.27a5ec",
+    "type": "switchNode",
+    "name": "switch request-action",
+    "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1186.0313186645508,
+    "y": 835.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "74f5e24d.62b7fc",
-        "5f7ef187.e1747"
+        "344ada0a.a73ad6",
+        "e3edfc03.190b4"
       ]
     ]
   },
   {
-    "id":"74f5e24d.62b7fc",
-    "type":"other",
-    "name":"DeleteNetworkInstance",
-    "xml":"<outcome value='DeleteNetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1418.666732788086,
-    "y":744.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "344ada0a.a73ad6",
+    "type": "other",
+    "name": "DeleteNetworkInstance",
+    "xml": "<outcome value='DeleteNetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1467.0313186645508,
+    "y": 836.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "7f6850df.2b87e"
+        "af6f68e4.16d7c8"
       ]
     ]
   },
   {
-    "id":"5f7ef187.e1747",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":1361.666732788086,
-    "y":784.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "e3edfc03.190b4",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1410.0313186645508,
+    "y": 876.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "c7092fc3.cd677"
+        "2f09eef8.729d22"
       ]
     ]
   },
   {
-    "id":"c7092fc3.cd677",
-    "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=unassign\" />\n",
-    "comments":"",
-    "x":1530.666732788086,
-    "y":784.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "2f09eef8.729d22",
+    "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=unassign\" />\n",
+    "comments": "",
+    "x": 1579.0313186645508,
+    "y": 876.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"a3e07e88.c882c",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1642.6666641235352,
-    "y":320,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "da59191b.907b08",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1691.03125,
+    "y": 411.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "43839f1a.168f2",
-        "50cf5531.098c6c",
-        "7341b7e.9ac2b48",
-        "a0f0d3d5.a87ab",
-        "88002920.134a48",
-        "6d91f416.826f2c",
-        "9a5aad4a.6e681"
+        "6e0de85f.52ae38",
+        "f1bdb760.a39f58",
+        "93644671.27ab38",
+        "f574bbf5.e2c0a8",
+        "522e4061.48e94",
+        "3e035fc2.b3924",
+        "3aacf235.e8f50e"
       ]
     ]
   },
   {
-    "id":"71f64cf9.079ef4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1636.6667709350586,
-    "y":487.99999046325684,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "c1306bc.3cbcc98",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1685.0313568115234,
+    "y": 579.9999885559082,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "43839f1a.168f2",
-        "50cf5531.098c6c",
-        "7341b7e.9ac2b48",
-        "a0f0d3d5.a87ab",
-        "88002920.134a48",
-        "6d91f416.826f2c",
-        "b67ae856.729b08"
+        "6e0de85f.52ae38",
+        "f1bdb760.a39f58",
+        "93644671.27ab38",
+        "f574bbf5.e2c0a8",
+        "522e4061.48e94",
+        "3e035fc2.b3924",
+        "ad0c00ef.1fb7b"
       ]
     ]
   },
   {
-    "id":"66edda2e.adbdb4",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1678.666732788086,
-    "y":654.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-      [
-        "b67ae856.729b08"
+    "id": "998324c.2692bd8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1727.0313186645508,
+    "y": 746.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
+      [
+        "ad0c00ef.1fb7b"
       ]
     ]
   },
   {
-    "id":"7f6850df.2b87e",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1677.666732788086,
-    "y":745.0000133514404,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "af6f68e4.16d7c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1726.0313186645508,
+    "y": 837.0000114440918,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b67ae856.729b08"
+        "ad0c00ef.1fb7b"
       ]
     ]
   },
   {
-    "id":"88002920.134a48",
-    "type":"switchNode",
-    "name":"switch onap-model-information.model-uuid",
-    "xml":"<switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2279.3333282470703,
-    "y":1043.9999513626099,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "522e4061.48e94",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2327.697914123535,
+    "y": 1135.9999494552612,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "1d5cf7df.d6b918",
-        "9241a417.ce32a8"
+        "acd91e81.cd0da",
+        "a6bf8d05.347a4"
       ]
     ]
   },
   {
-    "id":"424069b0.42ea38",
-    "type":"comment",
-    "name":"validations - required for all",
-    "info":"",
-    "comments":"",
-    "x":542.6666641235352,
-    "y":94,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "99c35b5e.7ad5b8",
+    "type": "comment",
+    "name": "validations - required for all",
+    "info": "",
+    "comments": "",
+    "x": 591.03125,
+    "y": 185.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"67177f2d.d0dfb",
-    "type":"comment",
-    "name":"validations specific per svc-action",
-    "info":"",
-    "comments":"",
-    "x":554.6666641235352,
-    "y":309,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "bb3aaf61.12982",
+    "type": "comment",
+    "name": "validations specific per svc-action",
+    "info": "",
+    "comments": "",
+    "x": 603.03125,
+    "y": 400.99999809265137,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"b6492325.12cf4",
-    "type":"comment",
-    "name":"network-request-information block validations",
-    "info":"",
-    "comments":"",
-    "x":2282.666664123535,
-    "y":896,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "f39e6aa2.09d888",
+    "type": "comment",
+    "name": "network-request-information block validations",
+    "info": "",
+    "comments": "",
+    "x": 2331.03125,
+    "y": 987.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"43839f1a.168f2",
-    "type":"switchNode",
-    "name":"switch network-request-information.tenant",
-    "xml":"<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2279.666664123535,
-    "y":946,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6e0de85f.52ae38",
+    "type": "switchNode",
+    "name": "switch network-request-information.tenant",
+    "xml": "<switch test='`$network-topology-operation-input.network-request-input.tenant`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2328.03125,
+    "y": 1037.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "f579222c.d4325"
+        "4ae37797.bed6c8"
       ]
     ]
   },
   {
-    "id":"f579222c.d4325",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2521.381019592285,
-    "y":948,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "4ae37797.bed6c8",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2569.74560546875,
+    "y": 1039.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "ad98280c.f99968"
+        "47dce650.0f6df8"
       ]
     ]
   },
   {
-    "id":"ad98280c.f99968",
-    "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.tenant is a required input\" />\n",
-    "comments":"",
-    "x":2672.8096084594727,
-    "y":946,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "47dce650.0f6df8",
+    "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.tenant is a required input\" />\n",
+    "comments": "",
+    "x": 2721.1741943359375,
+    "y": 1037.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"50cf5531.098c6c",
-    "type":"switchNode",
-    "name":"switch network-request-information.aic-cloud-region",
-    "xml":"<switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2308.666664123535,
-    "y":989,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "f1bdb760.a39f58",
+    "type": "switchNode",
+    "name": "switch network-request-information.aic-cloud-region",
+    "xml": "<switch test='`$network-topology-operation-input.network-request-input.aic-cloud-region`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2357.03125,
+    "y": 1080.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "d057fdf3.d010e"
+        "500a2d6f.01c354"
       ]
     ]
   },
   {
-    "id":"d057fdf3.d010e",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2570.381019592285,
-    "y":989,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "500a2d6f.01c354",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2618.74560546875,
+    "y": 1080.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "3c313792.39c5f8"
+        "9ab40c85.dc8f9"
       ]
     ]
   },
   {
-    "id":"3c313792.39c5f8",
-    "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=\"service-information.network-request-information.aic-cloud-region is a required input\" />\n",
-    "comments":"",
-    "x":2734.80948638916,
-    "y":988,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "9ab40c85.dc8f9",
+    "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=\"service-information.network-request-information.aic-cloud-region is a required input\" />\n",
+    "comments": "",
+    "x": 2783.174072265625,
+    "y": 1079.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"7341b7e.9ac2b48",
-    "type":"switchNode",
-    "name":"switch onap-model-information.model-uuid",
-    "xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2271.8096084594727,
-    "y":815.8571166992188,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "93644671.27ab38",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2320.1741943359375,
+    "y": 907.8571147918701,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "76f250fe.8ad13"
+        "5adb46d1.78a9b8"
       ]
     ]
   },
   {
-    "id":"76f250fe.8ad13",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2511.8096084594727,
-    "y":816.8571166992188,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "5adb46d1.78a9b8",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2560.1741943359375,
+    "y": 908.8571147918701,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "5f0fb81f.eafbb8"
+        "b5f06625.cfdca8"
       ]
     ]
   },
   {
-    "id":"5f0fb81f.eafbb8",
-    "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-information.onap-model-information.model-uuid is a required input\" />\n",
-    "comments":"",
-    "x":2677.2380752563477,
-    "y":814.8570861816406,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "b5f06625.cfdca8",
+    "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-information.onap-model-information.model-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2725.6026611328125,
+    "y": 906.857084274292,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"a0f0d3d5.a87ab",
-    "type":"switchNode",
-    "name":"switch onap-model-information.model-customization-uuid",
-    "xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2316.666664123535,
-    "y":775,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "f574bbf5.e2c0a8",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-customization-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2365.03125,
+    "y": 866.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b58e5e29.9b188"
+        "126e3258.9c32ee"
       ]
     ]
   },
   {
-    "id":"b58e5e29.9b188",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2612.666664123535,
-    "y":776,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "126e3258.9c32ee",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2661.03125,
+    "y": 867.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "d1292b85.45d678"
+        "109a29dd.e914a6"
       ]
     ]
   },
   {
-    "id":"d1292b85.45d678",
-    "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-information.onap-model-information.model-customization-uuid is a required input\" />\n",
-    "comments":"",
-    "x":2760.09513092041,
-    "y":776,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "109a29dd.e914a6",
+    "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-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2808.459716796875,
+    "y": 867.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"5bf0bd5.e1cf344",
-    "type":"returnSuccess",
-    "name":"return success",
-    "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-    "comments":"",
-    "x":517.023738861084,
-    "y":672.6428346633911,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "40653e81.a79c4",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+    "comments": "",
+    "x": 565.3883247375488,
+    "y": 764.6428327560425,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"a1c80246.e678",
-    "type":"get-resource",
-    "name":"get-resource NETWORK_MODEL",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2994.8497314453125,
-    "y":1259.1784763336182,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "84b45f59.b66f9",
+    "type": "get-resource",
+    "name": "get-resource NETWORK_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3043.2143173217773,
+    "y": 1351.1784744262695,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "89788b78.0fbba8",
-        "fe14df05.e082"
+        "a0253c48.a500d",
+        "8b8eb621.59ec18"
       ]
     ]
   },
   {
-    "id":"925507bc.719978",
-    "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=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
-    "comments":"",
-    "x":3454.313934326172,
-    "y":1250.2258920669556,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "c49e6503.c07498",
+    "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=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3502.6785202026367,
+    "y": 1342.225890159607,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"89788b78.0fbba8",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3255.5639457702637,
-    "y":1243.58309841156,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "a0253c48.a500d",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3303.9285316467285,
+    "y": 1335.5830965042114,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "925507bc.719978"
+        "c49e6503.c07498"
       ]
     ]
   },
   {
-    "id":"fe14df05.e082",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3249.3139457702637,
-    "y":1276.08309841156,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "8b8eb621.59ec18",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3297.6785316467285,
+    "y": 1368.0830965042114,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "925507bc.719978"
+        "c49e6503.c07498"
       ]
     ]
   },
   {
-    "id":"1d5cf7df.d6b918",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2544.4814071655273,
-    "y":1043.5925903320312,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "acd91e81.cd0da",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2592.845993041992,
+    "y": 1135.5925884246826,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b9cf48d2.24de78"
+        "b13bfecc.d0f64"
       ]
     ]
   },
   {
-    "id":"9241a417.ce32a8",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":2550.731342315674,
-    "y":1182.7591953277588,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "a6bf8d05.347a4",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2599.0959281921387,
+    "y": 1274.7591934204102,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "c5c99455.9c06d8"
+        "468997da.29ae18"
       ]
     ]
   },
   {
-    "id":"dd80fff3.bf7d7",
-    "type":"get-resource",
-    "name":"get-resource SERVICE_MODEL",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2997.3497161865234,
-    "y":1182.2432489395142,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "9d1f773f.56bf68",
+    "type": "get-resource",
+    "name": "get-resource SERVICE_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3045.7143020629883,
+    "y": 1274.2432470321655,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "6a57274e.5355b8",
-        "7bb62a10.e078e4"
+        "84dd27a2.97bda8",
+        "3c927e02.744bb2"
       ]
     ]
   },
   {
-    "id":"fb19a79a.af3d48",
-    "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=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
-    "comments":"",
-    "x":3444.4330825805664,
-    "y":1182.2432794570923,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "40f84f26.9dfa6",
+    "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=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3492.7976684570312,
+    "y": 1274.2432775497437,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"6a57274e.5355b8",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3245.683162689209,
-    "y":1177.60049533844,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "84dd27a2.97bda8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3294.047748565674,
+    "y": 1269.6004934310913,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "fb19a79a.af3d48"
+        "40f84f26.9dfa6"
       ]
     ]
   },
   {
-    "id":"7bb62a10.e078e4",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3239.433162689209,
-    "y":1210.10049533844,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "3c927e02.744bb2",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3287.797748565674,
+    "y": 1302.1004934310913,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "fb19a79a.af3d48"
+        "40f84f26.9dfa6"
       ]
     ]
   },
   {
-    "id":"56d4c353.92e90c",
-    "type":"get-resource",
-    "name":"get-resource NETWORK_MODEL",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2991.035919189453,
-    "y":1118.4007987976074,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "911ff56e.c82ef8",
+    "type": "get-resource",
+    "name": "get-resource NETWORK_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid\n  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='network-model'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3039.400505065918,
+    "y": 1210.4007968902588,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "415be4e2.5955dc",
-        "5521a407.7c24fc"
+        "9b7c8a4e.698078",
+        "375e7edf.448442"
       ]
     ]
   },
   {
-    "id":"e4108457.428de8",
-    "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=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
-    "comments":"",
-    "x":3450.5001220703125,
-    "y":1109.4482145309448,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "cc1f0aec.867828",
+    "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=\"`'No network model found for customization UUID ' \n    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +\n    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3498.8647079467773,
+    "y": 1201.4482126235962,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"415be4e2.5955dc",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3251.7501335144043,
-    "y":1102.8054208755493,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "9b7c8a4e.698078",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3300.114719390869,
+    "y": 1194.8054189682007,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "e4108457.428de8"
+        "cc1f0aec.867828"
       ]
     ]
   },
   {
-    "id":"5521a407.7c24fc",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3246.7501106262207,
-    "y":1134.055419921875,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "375e7edf.448442",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3295.1146965026855,
+    "y": 1226.0554180145264,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "e4108457.428de8"
+        "cc1f0aec.867828"
       ]
     ]
   },
   {
-    "id":"b5ccaabe.a03018",
-    "type":"get-resource",
-    "name":"get-resource SERVICE_MODEL",
-    "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>",
-    "comments":"",
-    "outputs":1,
-    "x":2989.785842895508,
-    "y":1043.96546459198,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6cb11322.a53b0c",
+    "type": "get-resource",
+    "name": "get-resource SERVICE_MODEL",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'\n  pfx='service-model'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 3038.1504287719727,
+    "y": 1135.9654626846313,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "7521044.4b449fc",
-        "4aa1c6c1.dc1288"
+        "4e95e1fd.41641",
+        "9df2f9b2.794ca8"
       ]
     ]
   },
   {
-    "id":"5c9d87d7.566af8",
-    "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=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
-    "comments":"",
-    "x":3440.619270324707,
-    "y":1041.4656019210815,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "b9ac34e6.4bbe58",
+    "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=\"`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`\" />\n",
+    "comments": "",
+    "x": 3488.983856201172,
+    "y": 1133.465600013733,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"7521044.4b449fc",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3241.8693504333496,
-    "y":1036.8228178024292,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "4e95e1fd.41641",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3290.2339363098145,
+    "y": 1128.8228158950806,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "5c9d87d7.566af8"
+        "b9ac34e6.4bbe58"
       ]
     ]
   },
   {
-    "id":"4aa1c6c1.dc1288",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3235.6193504333496,
-    "y":1069.3228178024292,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "9df2f9b2.794ca8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3283.9839363098145,
+    "y": 1161.3228158950806,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "5c9d87d7.566af8"
+        "b9ac34e6.4bbe58"
       ]
     ]
   },
   {
-    "id":"b9cf48d2.24de78",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":2719.8056564331055,
-    "y":1042.8054184913635,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "b13bfecc.d0f64",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2768.1702423095703,
+    "y": 1134.805416584015,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "b5ccaabe.a03018",
-        "56d4c353.92e90c"
+        "6cb11322.a53b0c",
+        "911ff56e.c82ef8"
       ]
     ]
   },
   {
-    "id":"c5c99455.9c06d8",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":2712.3056564331055,
-    "y":1181.5554218292236,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "468997da.29ae18",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2760.6702423095703,
+    "y": 1273.555419921875,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "dd80fff3.bf7d7",
-        "a1c80246.e678"
+        "9d1f773f.56bf68",
+        "84b45f59.b66f9"
       ]
     ]
   },
   {
-    "id":"44919742.aa0cd8",
-    "type":"outcome",
-    "name":"ActivateDCINetworkInstance",
-    "xml":"<outcome value='ActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1426.333251953125,
-    "y":441,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "a629f7e0.27dc18",
+    "type": "outcome",
+    "name": "ActivateDCINetworkInstance",
+    "xml": "<outcome value='ActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1474.6978378295898,
+    "y": 532.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-
+        "ffd7a509.990f28"
       ]
     ]
   },
   {
-    "id":"1bec30c1.fe7d2f",
-    "type":"outcome",
-    "name":"DeActivateDCINetworkInstance",
-    "xml":"<outcome value='DeActivateDCINetworkInstance'>",
-    "comments":"",
-    "outputs":1,
-    "x":1447.6666259765625,
-    "y":604,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-      [
-
-      ]
+    "id": "b80bf0eb.dad37",
+    "type": "outcome",
+    "name": "DeActivateDCINetworkInstance",
+    "xml": "<outcome value='DeActivateDCINetworkInstance'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1496.0312118530273,
+    "y": 695.9999980926514,
+    "z": "ea83c234.74a66",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"6d91f416.826f2c",
-    "type":"switchNode",
-    "name":"switch onap-model-information.model-invariant-uuid",
-    "xml":"<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2298.6667251586914,
-    "y":740.000036239624,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "3e035fc2.b3924",
+    "type": "switchNode",
+    "name": "switch onap-model-information.model-invariant-uuid",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2347.0313110351562,
+    "y": 832.0000343322754,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "429b261e.09c5a8"
+        "83d207ff.7bd648"
       ]
     ]
   },
   {
-    "id":"429b261e.09c5a8",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2583.6667861938477,
-    "y":739.0000305175781,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "83d207ff.7bd648",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2632.0313720703125,
+    "y": 831.0000286102295,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "defe665.bee1098"
+        "f82300ac.a06c3"
       ]
     ]
   },
   {
-    "id":"defe665.bee1098",
-    "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-information.onap-model-information.model-invariant-uuid is a required input\" />\n",
-    "comments":"",
-    "x":2735.0952529907227,
-    "y":738.0000305175781,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "f82300ac.a06c3",
+    "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-information.onap-model-information.model-invariant-uuid is a required input\" />\n",
+    "comments": "",
+    "x": 2783.4598388671875,
+    "y": 830.0000286102295,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"f11122f.6d0b4e",
-    "type":"comment",
-    "name":"network-information.onap-model-information block validations",
-    "info":"",
-    "comments":"",
-    "x":2317.8096084594727,
-    "y":700.8571166992188,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "97f835cb.91c378",
+    "type": "comment",
+    "name": "network-information.onap-model-information block validations",
+    "info": "",
+    "comments": "",
+    "x": 2366.1741943359375,
+    "y": 792.8571147918701,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"9a5aad4a.6e681",
-    "type":"switchNode",
-    "name":"switch network-information.network-id",
-    "xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":2253.66658782959,
-    "y":609.3333568572998,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "3aacf235.e8f50e",
+    "type": "switchNode",
+    "name": "switch network-information.network-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2302.0311737060547,
+    "y": 701.3333549499512,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "35c914cb.fa2c7c",
-        "f70379ac.e82478"
+        "9159921b.1a874",
+        "e6a3fc73.bccb"
       ]
     ]
   },
   {
-    "id":"35c914cb.fa2c7c",
-    "type":"other",
-    "name":"Other",
-    "xml":"<outcome value='Other'>",
-    "comments":"",
-    "outputs":1,
-    "x":2549.6665382385254,
-    "y":642.0000686645508,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "9159921b.1a874",
+    "type": "other",
+    "name": "Other",
+    "xml": "<outcome value='Other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2598.0311241149902,
+    "y": 734.0000667572021,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "f6b8e9bf.429b88"
+        "6dac7c4c.02e324"
       ]
     ]
   },
   {
-    "id":"f6b8e9bf.429b88",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2683.7777938842773,
-    "y":642.4444732666016,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6dac7c4c.02e324",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2732.142379760742,
+    "y": 734.4444713592529,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "124f1a13.d4f066"
+        "ad3bc41e.68ce58"
       ]
     ]
   },
   {
-    "id":"124f1a13.d4f066",
-    "type":"switchNode",
-    "name":"switch service-data.networks.network_length",
-    "xml":"<switch test='`$service-data.networks.network_length`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2957.4919052124023,
-    "y":644.0158233642578,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "ad3bc41e.68ce58",
+    "type": "switchNode",
+    "name": "switch service-data.networks.network_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3005.856491088867,
+    "y": 736.0158214569092,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "92655d33.ed6d7",
-        "9ed4f2.56f8bb1"
+        "581b248a.42826c",
+        "cc92e437.07d7d8"
       ]
     ]
   },
   {
-    "id":"92655d33.ed6d7",
-    "type":"other",
-    "name":"outcome Null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3246.4919052124023,
-    "y":646.0158843994141,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "581b248a.42826c",
+    "type": "other",
+    "name": "outcome Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3294.856491088867,
+    "y": 738.0158824920654,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "1dc93ca8.c6ca53"
+        "488942f3.44f17c"
       ]
     ]
   },
   {
-    "id":"9ed4f2.56f8bb1",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3226.4919052124023,
-    "y":681.0158843994141,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "cc92e437.07d7d8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3274.856491088867,
+    "y": 773.0158824920654,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8f8d810b.3f421"
+        "b5588c72.ba5fc"
       ]
     ]
   },
   {
-    "id":"8f8d810b.3f421",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":3427.7619247436523,
-    "y":682.5704498291016,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "b5588c72.ba5fc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3476.126510620117,
+    "y": 774.5704479217529,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "1f53b4b0.227ebb",
-        "ff0f33a8.2a294"
+        "54588ea6.fb302",
+        "8ffdffe5.986cf"
       ]
     ]
   },
   {
-    "id":"1f53b4b0.227ebb",
-    "type":"for",
-    "name":"for nidx..service-data.networks.network[]",
-    "xml":"<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":3697.777961730957,
-    "y":681.444465637207,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "54588ea6.fb302",
+    "type": "for",
+    "name": "for nidx..service-data.networks.network[]",
+    "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3746.142547607422,
+    "y": 773.4444637298584,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8351ac5.ac1f25"
+        "1beda453.597b5c"
       ]
     ]
   },
   {
-    "id":"8351ac5.ac1f25",
-    "type":"switchNode",
-    "name":"switch networkid found",
-    "xml":"<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3988.206512451172,
-    "y":680.6945495605469,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "1beda453.597b5c",
+    "type": "switchNode",
+    "name": "switch networkid found",
+    "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4036.5710983276367,
+    "y": 772.6945476531982,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "9138e8c9.7ab098"
+        "6de598a.75bad68"
       ]
     ]
   },
   {
-    "id":"9138e8c9.7ab098",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":4177.158866882324,
-    "y":681.587287902832,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6de598a.75bad68",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4225.523452758789,
+    "y": 773.5872859954834,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8476406f.ea8ad"
+        "d5f294f4.1bcec8"
       ]
     ]
   },
   {
-    "id":"a2e4da11.fec288",
-    "type":"set",
-    "name":"set tmp.nidx and ctx.network-data",
-    "xml":"<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
-    "comments":"",
-    "x":4620.690635681152,
-    "y":690.3373107910156,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "82ed9efc.d01f3",
+    "type": "set",
+    "name": "set tmp.nidx and ctx.network-data",
+    "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
+    "comments": "",
+    "x": 4669.055221557617,
+    "y": 782.337308883667,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"ff0f33a8.2a294",
-    "type":"switchNode",
-    "name":"switch tmp.nidx ",
-    "xml":"<switch test=\"`$tmp.nidx`\">\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3616.079391479492,
-    "y":723.4276723861694,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "8ffdffe5.986cf",
+    "type": "switchNode",
+    "name": "switch tmp.nidx ",
+    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3664.443977355957,
+    "y": 815.4276704788208,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8aba4dc7.d9aff"
+        "a08270b4.5a0dc"
       ]
     ]
   },
   {
-    "id":"74581001.a829d",
-    "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.network-request-input.network-id not found in service-data\" />\n",
-    "comments":"",
-    "x":3968.9363746643066,
-    "y":719.1419143676758,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "7a3310df.c618f",
+    "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.network-request-input.network-id not found in service-data\" />\n",
+    "comments": "",
+    "x": 4017.3009605407715,
+    "y": 811.1419124603271,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"8aba4dc7.d9aff",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3787.507926940918,
-    "y":721.9990577697754,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "a08270b4.5a0dc",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3835.872512817383,
+    "y": 813.9990558624268,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "74581001.a829d"
+        "7a3310df.c618f"
       ]
     ]
   },
   {
-    "id":"2ea1516d.a319ae",
-    "type":"switchNode",
-    "name":"switch order-status",
-    "xml":"<switch test='`$ctx.network-data.network-data.network-level-oper-status.order-status`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":4579.111045837402,
-    "y":727.4444885253906,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "6dea9d77.04a2a4",
+    "type": "switchNode",
+    "name": "switch order-status",
+    "xml": "<switch test='`$ctx.network-data.network-data.network-level-oper-status.order-status`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4627.475631713867,
+    "y": 819.444486618042,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "8688e510.ad7d88"
+        "47aee516.d8463c"
       ]
     ]
   },
   {
-    "id":"8688e510.ad7d88",
-    "type":"other",
-    "name":"outcome Created",
-    "xml":"<outcome value='Created'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":4793.111045837402,
-    "y":727.4444885253906,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "47aee516.d8463c",
+    "type": "other",
+    "name": "outcome Created",
+    "xml": "<outcome value='Created'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4841.475631713867,
+    "y": 819.444486618042,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "55924408.41735c"
+        "b5ba6fb5.02e0e"
       ]
     ]
   },
   {
-    "id":"55924408.41735c",
-    "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 aready exists in Created state matching network-id ' + $network-topology-operation-input.network-information.network-id`\" />\n",
-    "comments":"",
-    "x":4997.111045837402,
-    "y":723.4444732666016,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
-    ]
+    "id": "b5ba6fb5.02e0e",
+    "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 aready exists in Created state matching network-id ' + $network-topology-operation-input.network-information.network-id`\" />\n",
+    "comments": "",
+    "x": 5045.475631713867,
+    "y": 815.4444713592529,
+    "z": "ea83c234.74a66",
+    "wires": []
   },
   {
-    "id":"8476406f.ea8ad",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":4325.777305603027,
-    "y":681.4444732666016,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "d5f294f4.1bcec8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4374.141891479492,
+    "y": 773.4444713592529,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "a2e4da11.fec288"
+        "82ed9efc.d01f3"
       ]
     ]
   },
   {
-    "id":"1dc93ca8.c6ca53",
-    "type":"record",
-    "name":"record",
-    "xml":"<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network id proveded but no network exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-id`\"/>\n\n\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3407.7777938842773,
-    "y":645.4444732666016,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-      [
-
-      ]
+    "id": "488942f3.44f17c",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"com.att.sdnctl.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"GENERIC-RESOURCE-API.validate-network-input\"/>\n<parameter name=\"field3\" value=\"`$network-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field4\" value=\"Network id proveded but no network exists that matches\"/>\n<parameter name=\"field5\" value=\"`$network-topology-operation-input.network-information.network-id`\"/>\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3456.142379760742,
+    "y": 737.4444713592529,
+    "z": "ea83c234.74a66",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"b67ae856.729b08",
-    "type":"switchNode",
-    "name":"switch network-information.network-id",
-    "xml":"<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2251.6665115356445,
-    "y":562.6666736602783,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "ad0c00ef.1fb7b",
+    "type": "switchNode",
+    "name": "switch network-information.network-id",
+    "xml": "<switch test='`$network-topology-operation-input.network-information.network-id`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2300.0310974121094,
+    "y": 654.6666717529297,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "9dba4815.084fc8"
+        "d99ce0de.0aa67"
       ]
     ]
   },
   {
-    "id":"9dba4815.084fc8",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2480.3808364868164,
-    "y":564.6666736602783,
-    "z":"9587f32a.6a9aa",
-    "wires":[
+    "id": "d99ce0de.0aa67",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2528.7454223632812,
+    "y": 656.6666717529297,
+    "z": "ea83c234.74a66",
+    "wires": [
       [
-        "cae9bfb4.2d442"
+        "68028a81.7e4cf4"
       ]
     ]
   },
   {
-    "id":"cae9bfb4.2d442",
-    "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=\"service-information.network-information.network-id is a required input\" />\n",
-    "comments":"",
-    "x":2644.809455871582,
-    "y":562.6666736602783,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-
+    "id": "68028a81.7e4cf4",
+    "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=\"service-information.network-information.network-id is a required input\" />\n",
+    "comments": "",
+    "x": 2693.174041748047,
+    "y": 654.6666717529297,
+    "z": "ea83c234.74a66",
+    "wires": []
+  },
+  {
+    "id": "e6a3fc73.bccb",
+    "type": "other",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2595.6980209350586,
+    "y": 700.9999408721924,
+    "z": "ea83c234.74a66",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"f70379ac.e82478",
-    "type":"other",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2547.3334350585938,
-    "y":608.999942779541,
-    "z":"9587f32a.6a9aa",
-    "wires":[
-      [
-
-      ]
+    "id": "ffd7a509.990f28",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1701.00390625,
+    "y": 507.00390625,
+    "z": "ea83c234.74a66",
+    "wires": [
+      []
     ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
index 043c4940..1f70a4b7 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -222,7 +222,9 @@
                 <outcome value="activate">

                     <block atomic="true">

                         <switch test="`$network-topology-operation-input.request-information.request-action`">

-                            <outcome value="ActivateDCINetworkInstance" />

+                            <outcome value="ActivateDCINetworkInstance">

+                                <block atomic="true" />

+                            </outcome>

                             <outcome value="CreateNetworkInstance">

                                 <block atomic="true">

                                     <switch test="`$network-topology-operation-input.network-information.network-id`">