Merge "SOTN issue fixes"

Former-commit-id: 7b72cc062552903fa642002f8642ef5bd8e434a0
author: Dan Timoney <dt5972@att.com> 2018-08-09 20:37:04 +0000
committer: Gerrit Code Review <gerrit@onap.org> 2018-08-09 20:37:04 +0000
commit: c27e144516affd3b064fc9c51d50a637d75bb35a (patch)
tree: fbbb918527ed8969e3dcf64d97c908f8ebc92bdc /platform-logic
parent: d2c717698e503e0ad29f92b740f82632675a3997 (diff)
parent: 0e1791d92c7ae3c8c0703431a752feb424732970 (diff)
8 files changed, 1244 insertions, 1448 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
index 125dbc93..0dac5d39 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "92bde18b.90f51",
+    "id": "bb559316.43abe",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 106.00390625,
-    "y": 51.00390625,
-    "z": "54170a80.42c614",
+    "x": 169,
+    "y": 76,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "9686f296.2c8dd"
+        "842a594e.4731d8"
       ]
     ]
   },
   {
-    "id": "9686f296.2c8dd",
+    "id": "842a594e.4731d8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,182 +22,164 @@
     "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": 292.00391006469727,
-    "y": 123.0039234161377,
-    "z": "54170a80.42c614",
+    "x": 355.00000381469727,
+    "y": 148.0000171661377,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "5c1e48b9.633c88"
+        "f5dc7555.cee5a8"
       ]
     ]
   },
   {
-    "id": "5c1e48b9.633c88",
+    "id": "f5dc7555.cee5a8",
     "type": "method",
     "name": "method sotn-network-topology-operation-activate",
     "xml": "<method rpc='sotn-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 280.0040283203125,
-    "y": 211.00390625,
-    "z": "54170a80.42c614",
+    "x": 343.0001220703125,
+    "y": 236,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "ccaf1419.198158"
+        "48dc382f.96bcc8"
       ]
     ]
   },
   {
-    "id": "ccaf1419.198158",
+    "id": "48dc382f.96bcc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 454.00392150878906,
-    "y": 319.0039653778076,
-    "z": "54170a80.42c614",
+    "x": 517.0000152587891,
+    "y": 344.0000591278076,
+    "z": "fd297d2b.31cb1",
     "wires": [
       [
-        "70aaa20a.67efcc",
-        "b5a2c023.8548a",
-        "d1073f16.8ed91",
-        "78851dc5.db0384",
-        "4ca1d850.ac9f28",
-        "d2a509fb.abaf98",
-        "e789c0c0.571e6",
-        "7c9d2cd5.85be04"
+        "40528bdc.5b5f94",
+        "6d718115.bc2bd",
+        "fba83ea2.6feb9",
+        "5f3aca59.c0fbb4",
+        "1643498b.4256a6",
+        "afd35eb.c4071a",
+        "f6449001.6bbfb",
+        "77ac16a7.2846a8"
       ]
     ]
   },
   {
-    "id": "70aaa20a.67efcc",
+    "id": "40528bdc.5b5f94",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 912.3928070068359,
-    "y": 68.00390625,
-    "z": "54170a80.42c614",
+    "x": 975.3889007568359,
+    "y": 93,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "b5a2c023.8548a",
+    "id": "6d718115.bc2bd",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Activate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 712.5595054626465,
-    "y": 121.78175926208496,
-    "z": "54170a80.42c614",
+    "x": 775.5555992126465,
+    "y": 146.77785301208496,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "d1073f16.8ed91",
+    "id": "fba83ea2.6feb9",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 803.5595550537109,
-    "y": 310.31720066070557,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 866.5556488037109,
+    "y": 335.31329441070557,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "78851dc5.db0384",
+    "id": "5f3aca59.c0fbb4",
     "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": 725.3373565673828,
-    "y": 499.87262058258057,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 788.3334503173828,
+    "y": 524.8687143325806,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "4ca1d850.ac9f28",
+    "id": "1643498b.4256a6",
     "type": "set",
     "name": "set network-level-oper-status",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 770.4484710693359,
-    "y": 371.5393753051758,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 833.4445648193359,
+    "y": 396.5354690551758,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "d2a509fb.abaf98",
+    "id": "afd35eb.c4071a",
     "type": "execute",
     "name": "execute Properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 744.8616104125977,
-    "y": 174.78179550170898,
-    "z": "54170a80.42c614",
+    "x": 807.8577041625977,
+    "y": 199.77788925170898,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "e789c0c0.571e6",
+    "id": "f6449001.6bbfb",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />",
     "comments": "",
     "outputs": 1,
-    "x": 804.6670532226562,
-    "y": 431.242564201355,
-    "z": "54170a80.42c614",
+    "x": 867.6631469726562,
+    "y": 456.238657951355,
+    "z": "fd297d2b.31cb1",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "7c9d2cd5.85be04",
+    "id": "77ac16a7.2846a8",
     "type": "set",
     "name": "set network in service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 767.0040283203125,
-    "y": 242.09496021270752,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 830.0001220703125,
+    "y": 267.0910539627075,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   },
   {
-    "id": "ccc44411.171148",
+    "id": "96de6db0.b05dc",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 992.03515625,
-    "y": 165.03518676757812,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 1055.03125,
+    "y": 190.03128051757812,
+    "z": "fd297d2b.31cb1",
+    "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 49437c77..212b3cb1 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "81cd1a9a.ed4778",
+    "id": "75ca7680.1d3a58",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 104.00390625,
-    "y": 120.28887966228649,
-    "z": "7cf7d682.dbbec8",
+    "x": 115,
+    "y": 94,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1bef31e6.92d38e"
+        "129f94ba.7fe03b"
       ]
     ]
   },
   {
-    "id": "1bef31e6.92d38e",
+    "id": "129f94ba.7fe03b",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1136 +22,1032 @@
     "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": 358.50390625,
-    "y": 120.28887966228649,
-    "z": "7cf7d682.dbbec8",
+    "x": 333.49999237060547,
+    "y": 174.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "22d8cb0f.1fe844"
+        "436daa76.7579c4"
       ]
     ]
   },
   {
-    "id": "22d8cb0f.1fe844",
+    "id": "436daa76.7579c4",
     "type": "method",
     "name": "sotn-network-topology-operation-create",
     "xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 357.50390625,
-    "y": 220.2888796622865,
-    "z": "7cf7d682.dbbec8",
+    "x": 332.49999237060547,
+    "y": 274.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1ac6ec58.6cc8c4"
+        "d7bbd3b7.969f1"
       ]
     ]
   },
   {
-    "id": "1ac6ec58.6cc8c4",
+    "id": "d7bbd3b7.969f1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 497.50390625,
-    "y": 320.2888796622865,
-    "z": "7cf7d682.dbbec8",
+    "x": 472.49999237060547,
+    "y": 374.9999928767793,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "dccba4bb.ec45e8",
-        "8d26ff9f.61d6",
-        "9cc5feac.c16eb",
-        "611e5fda.9173",
-        "493b5551.491c0c",
-        "7896c4df.77216c",
-        "cade84ce.caa788",
-        "d2e2bb0e.8628c8",
-        "dc47979f.672478",
-        "949f871e.3694a8",
-        "2d8bf094.04a15"
+        "5f387e8f.fd62",
+        "eb116abb.3ac2e8",
+        "4aa45281.84acec",
+        "a532dc93.80ef6",
+        "b1588e73.71447",
+        "553a6b9e.729ec4",
+        "36ffcb33.4e1fd4",
+        "77abacf.f4efc54",
+        "5a59ba8.9380644",
+        "582840e.ea42fc",
+        "fc2a5352.16901"
       ]
     ]
   },
   {
-    "id": "dccba4bb.ec45e8",
+    "id": "5f387e8f.fd62",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 927.5039176940918,
-    "y": 138.0666315848939,
-    "z": "7cf7d682.dbbec8",
+    "x": 902.5000038146973,
+    "y": 192.7777447993867,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "8d26ff9f.61d6",
+    "id": "eb116abb.3ac2e8",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 721.0595626831055,
-    "y": 315.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 696.0556488037109,
+    "y": 370.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "9cc5feac.c16eb",
+    "id": "4aa45281.84acec",
     "type": "execute",
     "name": "execute generate-sotn-vpn-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 821.5039176940918,
-    "y": 178.0666315848939,
-    "z": "7cf7d682.dbbec8",
+    "x": 796.5000038146973,
+    "y": 232.7777447993867,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "611e5fda.9173",
+    "id": "a532dc93.80ef6",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 812.0595626831055,
-    "y": 275.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 789.0556564331055,
+    "y": 321.2221913631074,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "73a5159b.c3206c",
-        "82bb8d63.17326"
+        "d42a3b2a.ffbae8",
+        "2876f1e7.3bf11e"
       ]
     ]
   },
   {
-    "id": "73a5159b.c3206c",
+    "id": "d42a3b2a.ffbae8",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.0595626831055,
-    "y": 255.51109147071838,
-    "z": "7cf7d682.dbbec8",
+    "x": 1016.0556488037109,
+    "y": 310.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "b454d6b2.ed7f78"
+        "fde1029e.0da77"
       ]
     ]
   },
   {
-    "id": "82bb8d63.17326",
+    "id": "2876f1e7.3bf11e",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1041.0595626831055,
-    "y": 295.5110914707184,
-    "z": "7cf7d682.dbbec8",
+    "x": 1016.0556488037109,
+    "y": 350.2222046852112,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1c6a631d.a6467d"
+        "895d1c39.9fd62"
       ]
     ]
   },
   {
-    "id": "b454d6b2.ed7f78",
+    "id": "fde1029e.0da77",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1183.5595626831055,
-    "y": 255.51109147071838,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1158.555648803711,
+    "y": 310.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "29335226.4cde8e",
+    "id": "e9c489d1.6bc028",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1317.1150817871094,
-    "y": 257.06670117378235,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1292.1111679077148,
+    "y": 311.77781438827515,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "493b5551.491c0c",
+    "id": "b1588e73.71447",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name='service-data.networks.network_length' value='`$nidx+1`' />\n\n",
     "comments": "",
-    "x": 782.5595626831055,
-    "y": 355.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 757.5556488037109,
+    "y": 410.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "7896c4df.77216c",
+    "id": "553a6b9e.729ec4",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 818.0595626831055,
-    "y": 395.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 793.0556488037109,
+    "y": 450.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "cade84ce.caa788",
+    "id": "36ffcb33.4e1fd4",
     "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": 741.7264022827148,
-    "y": 562.1778182983398,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 716.7224884033203,
+    "y": 616.8889315128326,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "d2e2bb0e.8628c8",
+    "id": "77abacf.f4efc54",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 789.5595626831055,
-    "y": 435.5110914707184,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 764.5556488037109,
+    "y": 490.2222046852112,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "dc47979f.672478",
+    "id": "5a59ba8.9380644",
     "type": "save",
     "name": "save SOTN connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->\n<!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->\n<!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />",
     "comments": "",
     "outputs": 1,
-    "x": 822.0595626831055,
-    "y": 482.17778038978577,
-    "z": "7cf7d682.dbbec8",
+    "x": 797.0556488037109,
+    "y": 536.8888936042786,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "949f871e.3694a8",
+    "id": "582840e.ea42fc",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 797.0595741271973,
-    "y": 519.9555323123932,
-    "z": "7cf7d682.dbbec8",
+    "x": 772.0556602478027,
+    "y": 574.666645526886,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "bcdf0e05.a3fa2",
+    "id": "7821c135.be528",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1186.5436248779297,
-    "y": 400.28884336398914,
-    "z": "7cf7d682.dbbec8",
+    "x": 1161.5397109985352,
+    "y": 454.99995657848194,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c6c47ed0.cb847"
+        "c1a7031.d1ed7"
       ]
     ]
   },
   {
-    "id": "1c6a631d.a6467d",
+    "id": "895d1c39.9fd62",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1185.4166069030762,
-    "y": 295.4476034641266,
-    "z": "7cf7d682.dbbec8",
+    "x": 1160.4126930236816,
+    "y": 350.1587166786194,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "bcdf0e05.a3fa2",
-        "29335226.4cde8e"
+        "7821c135.be528",
+        "e9c489d1.6bc028"
       ]
     ]
   },
   {
-    "id": "c6c47ed0.cb847",
+    "id": "c1a7031.d1ed7",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1461.829345703125,
-    "y": 399.860346049536,
-    "z": "7cf7d682.dbbec8",
+    "x": 1436.8254318237305,
+    "y": 454.5714592640288,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "af281df5.a00a9"
+        "9367b5e2.953668"
       ]
     ]
   },
   {
-    "id": "af281df5.a00a9",
+    "id": "9367b5e2.953668",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1362.5595436096191,
-    "y": 458.43177720950916,
-    "z": "7cf7d682.dbbec8",
+    "x": 1337.5556297302246,
+    "y": 513.142890424002,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "6774871.c3ba278"
+        "4001ac49.be63c4"
       ]
     ]
   },
   {
-    "id": "ec60dbfe.f45f08",
+    "id": "2f9e76b8.9b7e8a",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1410.1943550109863,
-    "y": 358.5429007713683,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1385.1904411315918,
+    "y": 413.2540139858611,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "6774871.c3ba278",
+    "id": "4001ac49.be63c4",
     "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 already found in service-data\" />\n",
     "comments": "",
-    "x": 1510.3096466064453,
-    "y": 458.28896927833557,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 1485.3057327270508,
+    "y": 513.0000824928284,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "fa710c0b.f8f7f",
+    "id": "e30a216c.06ee1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1476.961139678955,
-    "y": 228.06668877601624,
-    "z": "7cf7d682.dbbec8",
+    "x": 1451.9572257995605,
+    "y": 282.77780199050903,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "3da7e963.953786",
-        "ea8c87f0.c92e88",
-        "f149851b.9a9dd8",
-        "74ce1a73.a6b444",
-        "a5724e6b.3f9f1",
-        "53daad6a.5244e4",
-        "8867a34e.4671a",
-        "3149ec04.0b57f4",
-        "1e784180.8a488f",
-        "ca14452f.51d7b8",
-        "600f2d8b.ac1e64",
-        "f8776a5f.dd77d8",
-        "6867734f.34178c",
-        "e09fe051.1cbb8",
-        "1d14a0da.1e8adf",
-        "8cf376b5.6cba28"
+        "64587c87.c4ced4",
+        "8393b82d.d5e438",
+        "6c36148d.1e8d6c",
+        "723317bf.383f98",
+        "86d16c8d.31d4e",
+        "26134e93.750692",
+        "5c4d7e43.e8961",
+        "729993a3.c5fcac",
+        "14dc371b.e7d799",
+        "b6721dfb.b1a0a",
+        "a5bddbeb.2c8598",
+        "9f8ad772.f86798",
+        "6553f7b8.604f48",
+        "ccf147e.f3f84b8",
+        "ca42d623.87ba58"
       ]
     ]
   },
   {
-    "id": "3da7e963.953786",
+    "id": "64587c87.c4ced4",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1735.1828842163086,
-    "y": 85.39999222755432,
-    "z": "7cf7d682.dbbec8",
+    "x": 1710.178970336914,
+    "y": 140.11110544204712,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "42c647fe.f59548"
+        "c4b37985.1946d8"
       ]
     ]
   },
   {
-    "id": "42c647fe.f59548",
+    "id": "c4b37985.1946d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1922.1828842163086,
-    "y": 81.39999222755432,
-    "z": "7cf7d682.dbbec8",
+    "x": 1897.178970336914,
+    "y": 136.11110544204712,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "22eef4c4.58190c"
+        "5fad2e08.81224"
       ]
     ]
   },
   {
-    "id": "22eef4c4.58190c",
+    "id": "5fad2e08.81224",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2072.1830139160156,
-    "y": 79.9999988079071,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2047.179100036621,
+    "y": 134.7111120223999,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "ea8c87f0.c92e88",
+    "id": "8393b82d.d5e438",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.0225448608398,
-    "y": 125.39999032020569,
-    "z": "7cf7d682.dbbec8",
+    "x": 1721.0186309814453,
+    "y": 180.1111035346985,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "3266ff0a.32d5c"
+        "e7f48cb.3fc207"
       ]
     ]
   },
   {
-    "id": "3266ff0a.32d5c",
+    "id": "e7f48cb.3fc207",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1916.0225448608398,
-    "y": 121.39999032020569,
-    "z": "7cf7d682.dbbec8",
+    "x": 1891.0186309814453,
+    "y": 176.1111035346985,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "e4bed62.ba99828"
+        "5c031099.8cebf"
       ]
     ]
   },
   {
-    "id": "e4bed62.ba99828",
+    "id": "5c031099.8cebf",
     "type": "set",
     "name": "set etht-svc-descr",
     "xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2103.3559856414795,
-    "y": 119.86114716529846,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2078.352071762085,
+    "y": 174.57226037979126,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "2d8bf094.04a15",
+    "id": "fc2a5352.16901",
     "type": "for",
     "name": "for loop i - Network input parameters",
     "xml": "<for index=\"idx\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 814.7383041381836,
-    "y": 225.8444197177887,
-    "z": "7cf7d682.dbbec8",
+    "x": 790.7343673706055,
+    "y": 281.5555348689668,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "fa710c0b.f8f7f"
+        "e30a216c.06ee1"
       ]
     ]
   },
   {
-    "id": "f149851b.9a9dd8",
+    "id": "6c36148d.1e8d6c",
     "type": "switchNode",
     "name": "switch tenantId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1736.4049263000488,
-    "y": 168.73331761360168,
-    "z": "7cf7d682.dbbec8",
+    "x": 1711.4010124206543,
+    "y": 223.44443082809448,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "776be651.50d848"
+        "b44c76e.15dfe88"
       ]
     ]
   },
   {
-    "id": "776be651.50d848",
+    "id": "b44c76e.15dfe88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1923.4049263000488,
-    "y": 164.73331761360168,
-    "z": "7cf7d682.dbbec8",
+    "x": 1898.4010124206543,
+    "y": 219.44443082809448,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "a00211ac.55fa"
+        "96f73c26.559e8"
       ]
     ]
   },
   {
-    "id": "a00211ac.55fa",
+    "id": "96f73c26.559e8",
     "type": "set",
     "name": "set tenantId",
     "xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2091.404926300049,
-    "y": 165.3333237171173,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2066.4010124206543,
+    "y": 220.0444369316101,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "74ce1a73.a6b444",
+    "id": "723317bf.383f98",
     "type": "switchNode",
-    "name": "switch CIR",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`\">\n",
+    "name": "switch cir",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1718.2445831298828,
-    "y": 258.733375787735,
-    "z": "7cf7d682.dbbec8",
+    "x": 1693.2406692504883,
+    "y": 313.4444890022278,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "701ee64a.e717f8"
+        "1a52097e.d09ff7"
       ]
     ]
   },
   {
-    "id": "701ee64a.e717f8",
+    "id": "1a52097e.d09ff7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1926.2446517944336,
-    "y": 254.73338913917542,
-    "z": "7cf7d682.dbbec8",
+    "x": 1901.240737915039,
+    "y": 309.4445023536682,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c0353e87.7a345"
+        "f62306dc.1325f8"
       ]
     ]
   },
   {
-    "id": "c0353e87.7a345",
+    "id": "f62306dc.1325f8",
     "type": "set",
     "name": "set cir",
     "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2075.5779724121094,
-    "y": 253.19453644752502,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2050.574058532715,
+    "y": 307.9056496620178,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "a5724e6b.3f9f1",
+    "id": "86d16c8d.31d4e",
     "type": "switchNode",
     "name": "switch vpnType",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1737.5530548095703,
-    "y": 212.5110948085785,
-    "z": "7cf7d682.dbbec8",
+    "x": 1712.5491409301758,
+    "y": 267.2222080230713,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "89501c3c.39e65"
+        "703f29bd.fdd258"
       ]
     ]
   },
   {
-    "id": "89501c3c.39e65",
+    "id": "703f29bd.fdd258",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1924.5530548095703,
-    "y": 208.5110948085785,
-    "z": "7cf7d682.dbbec8",
+    "x": 1899.5491409301758,
+    "y": 263.2222080230713,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "2f537b9c.402a54"
+        "ebf1a004.f1ef9"
       ]
     ]
   },
   {
-    "id": "2f537b9c.402a54",
+    "id": "ebf1a004.f1ef9",
     "type": "set",
     "name": "set vpnType",
     "xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2093.886688232422,
-    "y": 205.97225975990295,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2068.8827743530273,
+    "y": 260.68337297439575,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "53daad6a.5244e4",
+    "id": "26134e93.750692",
     "type": "switchNode",
     "name": "switch access-provider-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1759.0346908569336,
-    "y": 534.9556133747101,
-    "z": "7cf7d682.dbbec8",
+    "x": 1734.030776977539,
+    "y": 589.6667265892029,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c9908bde.d3d748"
+        "4515fd29.b598c4"
       ]
     ]
   },
   {
-    "id": "8867a34e.4671a",
+    "id": "5c4d7e43.e8961",
     "type": "switchNode",
     "name": "switch access-client-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1751.5901718139648,
-    "y": 580.2889425754547,
-    "z": "7cf7d682.dbbec8",
+    "x": 1726.5862579345703,
+    "y": 635.0000557899475,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "8bdcf612.c4ddd8"
+        "47c3d65c.233b78"
       ]
     ]
   },
   {
-    "id": "3149ec04.0b57f4",
+    "id": "729993a3.c5fcac",
     "type": "switchNode",
     "name": "switch access-topology-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1756.0346298217773,
-    "y": 619.1778280735016,
-    "z": "7cf7d682.dbbec8",
+    "x": 1731.0307159423828,
+    "y": 673.8889412879944,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "3417d7e.4ccb528"
+        "c3fc1f87.71129"
       ]
     ]
   },
   {
-    "id": "c9908bde.d3d748",
+    "id": "4515fd29.b598c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.0346908569336,
-    "y": 533.9556286334991,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.030776977539,
+    "y": 588.666741847992,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "39defa6f.d38fd6"
+        "48e66b6b.492674"
       ]
     ]
   },
   {
-    "id": "8bdcf612.c4ddd8",
+    "id": "47c3d65c.233b78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1938.5901718139648,
-    "y": 576.2889425754547,
-    "z": "7cf7d682.dbbec8",
+    "x": 1913.5862579345703,
+    "y": 631.0000557899475,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f50e4f7e.4a67d"
+        "d6533a63.6dbd38"
       ]
     ]
   },
   {
-    "id": "3417d7e.4ccb528",
+    "id": "c3fc1f87.71129",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.0346298217773,
-    "y": 615.1778280735016,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.0307159423828,
+    "y": 669.8889412879944,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "53d7cb35.9e4a94"
+        "7c60d7e3.12f4c8"
       ]
     ]
   },
   {
-    "id": "39defa6f.d38fd6",
+    "id": "48e66b6b.492674",
     "type": "set",
     "name": "set access-provider-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2126.257049560547,
-    "y": 533.0668127536774,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2101.2531356811523,
+    "y": 587.7779259681702,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "f50e4f7e.4a67d",
+    "id": "d6533a63.6dbd38",
     "type": "set",
     "name": "set access-client-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2115.1460876464844,
-    "y": 574.2994191646576,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2090.14217376709,
+    "y": 629.0105323791504,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "53d7cb35.9e4a94",
+    "id": "7c60d7e3.12f4c8",
     "type": "set",
     "name": "set access-topology-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2125.0350036621094,
-    "y": 613.1882755756378,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2100.031089782715,
+    "y": 667.8993887901306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "1e784180.8a488f",
+    "id": "14dc371b.e7d799",
     "type": "switchNode",
     "name": "switch access-node-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1756.8493881225586,
-    "y": 665.8444716930389,
-    "z": "7cf7d682.dbbec8",
+    "x": 1731.845474243164,
+    "y": 720.5555849075317,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "76b87020.8228"
+        "d1fbb326.d667a"
       ]
     ]
   },
   {
-    "id": "76b87020.8228",
+    "id": "d1fbb326.d667a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1943.8493881225586,
-    "y": 661.8444716930389,
-    "z": "7cf7d682.dbbec8",
+    "x": 1918.845474243164,
+    "y": 716.5555849075317,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "c5389f2b.e694e"
+        "aecd373e.842bf8"
       ]
     ]
   },
   {
-    "id": "ca14452f.51d7b8",
+    "id": "b6721dfb.b1a0a",
     "type": "switchNode",
     "name": "switch access-ltp-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1753.6271591186523,
-    "y": 708.2889482975006,
-    "z": "7cf7d682.dbbec8",
+    "x": 1728.6232452392578,
+    "y": 763.0000615119934,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f814a8ba.16d968"
+        "3439641.1ff369c"
       ]
     ]
   },
   {
-    "id": "f814a8ba.16d968",
+    "id": "3439641.1ff369c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1940.6271591186523,
-    "y": 704.2889482975006,
-    "z": "7cf7d682.dbbec8",
+    "x": 1915.6232452392578,
+    "y": 759.0000615119934,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "ae0c0f38.c407d"
+        "668b4d7f.54d754"
       ]
     ]
   },
   {
-    "id": "c5389f2b.e694e",
+    "id": "aecd373e.842bf8",
     "type": "set",
     "name": "set access-node-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2115.8497009277344,
-    "y": 660.5216057300568,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2090.84578704834,
+    "y": 715.2327189445496,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "ae0c0f38.c407d",
+    "id": "668b4d7f.54d754",
     "type": "set",
     "name": "set access-ltp-id",
     "xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2106.2938537597656,
-    "y": 703.2993776798248,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2081.289939880371,
+    "y": 758.0104908943176,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "600f2d8b.ac1e64",
+    "id": "a5bddbeb.2c8598",
     "type": "switchNode",
-    "name": "switch EIR",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`\">\n",
+    "name": "switch eir",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'eir'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.5350341796875,
-    "y": 301.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 356.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "39a162af.cbdf4e"
+        "b200bce6.41ba6"
       ]
     ]
   },
   {
-    "id": "39a162af.cbdf4e",
+    "id": "b200bce6.41ba6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1921.5349960327148,
-    "y": 296.43126225471497,
-    "z": "7cf7d682.dbbec8",
+    "x": 1896.5310821533203,
+    "y": 351.14237546920776,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "5150b53b.34980c"
+        "179fefa2.e4ec6"
       ]
     ]
   },
   {
-    "id": "5150b53b.34980c",
+    "id": "179fefa2.e4ec6",
     "type": "set",
     "name": "set eir",
     "xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2077.8684997558594,
-    "y": 295.8923981189728,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2052.864585876465,
+    "y": 350.6035113334656,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "f8776a5f.dd77d8",
+    "id": "9f8ad772.f86798",
     "type": "switchNode",
-    "name": "switch CBS",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`\">\n",
+    "name": "switch cbs",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cbs'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.5350341796875,
-    "y": 350.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 405.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "52870b8e.6e27b4"
+        "9fcff056.2543f"
       ]
     ]
   },
   {
-    "id": "52870b8e.6e27b4",
+    "id": "9fcff056.2543f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5349960327148,
-    "y": 346.43124890327454,
-    "z": "7cf7d682.dbbec8",
+    "x": 1893.5310821533203,
+    "y": 401.14236211776733,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "1fed4c26.5b7f64"
+        "a1886f40.011c"
       ]
     ]
   },
   {
-    "id": "1fed4c26.5b7f64",
+    "id": "a1886f40.011c",
     "type": "set",
     "name": "set cbs",
     "xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2076.8685607910156,
-    "y": 344.89240860939026,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2051.864646911621,
+    "y": 399.60352182388306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "6867734f.34178c",
+    "id": "6553f7b8.604f48",
     "type": "switchNode",
-    "name": "switch PBS",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`\">\n",
+    "name": "switch ebs",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ebs'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.5350341796875,
-    "y": 395.4312422275543,
-    "z": "7cf7d682.dbbec8",
+    "x": 1694.531120300293,
+    "y": 450.1423554420471,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "dc43d92a.b102c8"
+        "4251079.c8008f8"
       ]
     ]
   },
   {
-    "id": "dc43d92a.b102c8",
+    "id": "4251079.c8008f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1918.5349960327148,
-    "y": 388.43124985694885,
-    "z": "7cf7d682.dbbec8",
+    "x": 1893.5310821533203,
+    "y": 443.14236307144165,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "a31e90a2.55db7"
+        "d1fd139b.e3892"
       ]
     ]
   },
   {
-    "id": "a31e90a2.55db7",
+    "id": "d1fd139b.e3892",
     "type": "set",
-    "name": "set pbs",
-    "xml": "<set>\n<parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "name": "set ebs",
+    "xml": "<set>\n<parameter name='prop.sotn.ebs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2079.8685607910156,
-    "y": 389.89240860939026,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2054.864646911621,
+    "y": 444.60352182388306,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "e09fe051.1cbb8",
+    "id": "ccf147e.f3f84b8",
     "type": "switchNode",
-    "name": "switch color-aware",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`\">\n",
+    "name": "switch colorAware",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'colorAware'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.5351181030273,
-    "y": 442.431259393692,
-    "z": "7cf7d682.dbbec8",
+    "x": 1716.5312042236328,
+    "y": 497.1423726081848,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "6b010031.f7dc"
+        "b84d7f0e.a9757"
       ]
     ]
   },
   {
-    "id": "6b010031.f7dc",
+    "id": "b84d7f0e.a9757",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1919.5351219177246,
-    "y": 436.4312517642975,
-    "z": "7cf7d682.dbbec8",
+    "x": 1894.53120803833,
+    "y": 491.1423649787903,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "f64a6ad7.75c698"
+        "72e50f94.71d84"
       ]
     ]
   },
   {
-    "id": "f64a6ad7.75c698",
+    "id": "72e50f94.71d84",
     "type": "set",
     "name": "set colorAware",
     "xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2100.8684997558594,
-    "y": 435.8924105167389,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2075.864585876465,
+    "y": 490.6035237312317,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "1d14a0da.1e8adf",
+    "id": "ca42d623.87ba58",
     "type": "switchNode",
-    "name": "switch coupling-flag",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`\">\n",
+    "name": "switch couplingFlag",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'couplingFlag'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1741.5351257324219,
-    "y": 488.43128418922424,
-    "z": "7cf7d682.dbbec8",
+    "x": 1716.5312118530273,
+    "y": 543.142397403717,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "465a723d.71bccc"
+        "40eab97.899c148"
       ]
     ]
   },
   {
-    "id": "465a723d.71bccc",
+    "id": "40eab97.899c148",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1919.5351181030273,
-    "y": 480.4312527179718,
-    "z": "7cf7d682.dbbec8",
+    "x": 1894.5312042236328,
+    "y": 535.1423659324646,
+    "z": "1c0ed07d.5c9b3",
     "wires": [
       [
-        "abc827cf.8d31c8"
+        "af755d0d.ba992"
       ]
     ]
   },
   {
-    "id": "abc827cf.8d31c8",
+    "id": "af755d0d.ba992",
     "type": "set",
     "name": "set couplingFlag",
     "xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2104.8684997558594,
-    "y": 480.8924353122711,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "8cf376b5.6cba28",
-    "type": "switchNode",
-    "name": "switch cVLAN",
-    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1732.5350646972656,
-    "y": 753.4312918186188,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      [
-        "cbfe2ddc.e03c2"
-      ]
-    ]
-  },
-  {
-    "id": "cbfe2ddc.e03c2",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1937.5350341796875,
-    "y": 754.4312422275543,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      [
-        "57793550.48202c"
-      ]
-    ]
-  },
-  {
-    "id": "57793550.48202c",
-    "type": "set",
-    "name": "set cVLAN",
-    "xml": "<set>\n<parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments": "",
-    "x": 2091.201873779297,
-    "y": 753.4417135715485,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 2079.864585876465,
+    "y": 535.6035485267639,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   },
   {
-    "id": "5bd71de4.186664",
+    "id": "e55153cb.9f1cd",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 786.0351867675781,
-    "y": 84.43131852149963,
-    "z": "7cf7d682.dbbec8",
-    "wires": [
-      
-    ]
+    "x": 761.0312728881836,
+    "y": 139.14243173599243,
+    "z": "1c0ed07d.5c9b3",
+    "wires": []
   }
-]
+]
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
index 5caf6849..41d183e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "1cff3dd.1bd75c2",
+    "id": "3ac27f10.3a8f4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 132.00390625,
-    "y": 51.00390625,
-    "z": "54170a80.42c614",
+    "x": 201,
+    "y": 111,
+    "z": "4bc69b52.b6d424",
     "wires": [
       [
-        "93d49eff.25811"
+        "a4d35571.5a50a8"
       ]
     ]
   },
   {
-    "id": "93d49eff.25811",
+    "id": "a4d35571.5a50a8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,182 +22,164 @@
     "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": 288.00391006469727,
-    "y": 142.00392818450928,
-    "z": "54170a80.42c614",
+    "x": 357.00000381469727,
+    "y": 202.00002193450928,
+    "z": "4bc69b52.b6d424",
     "wires": [
       [
-        "92b42a02.8d5ca8"
+        "227b9b33.0bedd4"
       ]
     ]
   },
   {
-    "id": "92b42a02.8d5ca8",
+    "id": "227b9b33.0bedd4",
     "type": "method",
     "name": "method sotn-network-topology-operation-deactivate",
     "xml": "<method rpc='sotn-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 276.0040283203125,
-    "y": 230.00391101837158,
-    "z": "54170a80.42c614",
+    "x": 345.0001220703125,
+    "y": 290.0000047683716,
+    "z": "4bc69b52.b6d424",
     "wires": [
       [
-        "366ea887.121e48"
+        "5e6e65c4.2242fc"
       ]
     ]
   },
   {
-    "id": "366ea887.121e48",
+    "id": "5e6e65c4.2242fc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 499.0039825439453,
-    "y": 302.00398445129395,
-    "z": "54170a80.42c614",
+    "x": 568.0000762939453,
+    "y": 362.00007820129395,
+    "z": "4bc69b52.b6d424",
     "wires": [
       [
-        "cd5f7c65.252fa",
-        "62b5f38f.a23b1c",
-        "321a98d2.d65578",
-        "acc7b853.93de78",
-        "66a195e2.15165c",
-        "e88b4c8f.26b3d",
-        "f5303ddb.a29a7",
-        "85416f02.f4216"
+        "d2ec6450.70e238",
+        "e44a5ce1.2a6d1",
+        "ae274e39.92bc9",
+        "368c52e1.6b342e",
+        "1101140b.a4b22c",
+        "2730f4e7.d0214c",
+        "96a05e1e.a91ab",
+        "9cbc0828.b45c18"
       ]
     ]
   },
   {
-    "id": "cd5f7c65.252fa",
+    "id": "d2ec6450.70e238",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 930.6150512695312,
-    "y": 50.337249755859375,
-    "z": "54170a80.42c614",
+    "x": 999.6111450195312,
+    "y": 110.33334350585938,
+    "z": "4bc69b52.b6d424",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "62b5f38f.a23b1c",
+    "id": "e44a5ce1.2a6d1",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sotn-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SOTN-Deactivate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 735.03515625,
-    "y": 93.36850261688232,
-    "z": "54170a80.42c614",
+    "x": 804.03125,
+    "y": 153.36459636688232,
+    "z": "4bc69b52.b6d424",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "66a195e2.15165c",
+    "id": "1101140b.a4b22c",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 826.0352058410645,
-    "y": 281.90394401550293,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 897.0313110351562,
+    "y": 340.9000244140625,
+    "z": "4bc69b52.b6d424",
+    "wires": []
   },
   {
-    "id": "85416f02.f4216",
+    "id": "9cbc0828.b45c18",
     "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": 747.8130073547363,
-    "y": 471.45936393737793,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 816.8091011047363,
+    "y": 531.4554576873779,
+    "z": "4bc69b52.b6d424",
+    "wires": []
   },
   {
-    "id": "e88b4c8f.26b3d",
+    "id": "2730f4e7.d0214c",
     "type": "set",
     "name": "set network-level-oper-status",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
     "comments": "",
-    "x": 792.9241218566895,
-    "y": 343.12611865997314,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 861.9202156066895,
+    "y": 403.12221240997314,
+    "z": "4bc69b52.b6d424",
+    "wires": []
   },
   {
-    "id": "321a98d2.d65578",
+    "id": "ae274e39.92bc9",
     "type": "execute",
     "name": "execute Properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 767.3372611999512,
-    "y": 146.36853885650635,
-    "z": "54170a80.42c614",
+    "x": 836.3333549499512,
+    "y": 206.36463260650635,
+    "z": "4bc69b52.b6d424",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "f5303ddb.a29a7",
+    "id": "96a05e1e.a91ab",
     "type": "update",
     "name": "update SOTN Connectivity status to AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
-    "x": 827.1427040100098,
-    "y": 402.82930755615234,
-    "z": "54170a80.42c614",
+    "x": 896.1387977600098,
+    "y": 462.82540130615234,
+    "z": "4bc69b52.b6d424",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "acc7b853.93de78",
+    "id": "368c52e1.6b342e",
     "type": "set",
     "name": "set network in service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />",
     "comments": "",
-    "x": 789.479679107666,
-    "y": 213.68170356750488,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 858.475772857666,
+    "y": 273.6777973175049,
+    "z": "4bc69b52.b6d424",
+    "wires": []
   },
   {
-    "id": "b10f480b.ef7f98",
+    "id": "44f3a46.f2f575c",
     "type": "comment",
     "name": "TODO MP2MP",
     "info": "Current implementation is for P2P connectivity\nFor MP2MP connectivity in future DG needs to be modified",
     "comments": "",
-    "x": 1014.5108070373535,
-    "y": 136.6219301223755,
-    "z": "54170a80.42c614",
-    "wires": [
-      
-    ]
+    "x": 1083.5069007873535,
+    "y": 196.6180238723755,
+    "z": "4bc69b52.b6d424",
+    "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
index e0563866..f7ddb437 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "30540b72.a3da84",
+    "id": "e0ea16ce.30b528",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119.01040649414062,
-    "y": 58.010414123535156,
-    "z": "85ea7447.de94b8",
+    "x": 129,
+    "y": 55.76192092895508,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "5db42949.04e028"
+        "421503a6.f5b1fc"
       ]
     ]
   },
   {
-    "id": "5db42949.04e028",
+    "id": "421503a6.f5b1fc",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1235 +22,1179 @@
     "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": 364.2961196899414,
-    "y": 57.24849319458008,
-    "z": "85ea7447.de94b8",
+    "x": 374.2857131958008,
+    "y": 55,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "8510d543.ea49c8"
+        "39c1834a.bed64c"
       ]
     ]
   },
   {
-    "id": "8510d543.ea49c8",
+    "id": "39c1834a.bed64c",
     "type": "method",
     "name": "validate-sotn-network-input-parameters",
     "xml": "<method rpc='validate-sotn-network-input-parameters' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 321.9270935058594,
-    "y": 132.26343154907227,
-    "z": "85ea7447.de94b8",
+    "x": 331.91668701171875,
+    "y": 130.0149383544922,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "9906fd18.4ac52"
+        "8c035f21.9908d"
       ]
     ]
   },
   {
-    "id": "9906fd18.4ac52",
+    "id": "8c035f21.9908d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 605.9271011352539,
-    "y": 120.26345634460449,
-    "z": "85ea7447.de94b8",
+    "x": 615.9166946411133,
+    "y": 118.01496315002441,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "d110bc81.4e37c",
-        "e101af22.28a5c"
+        "71b449ba.b5b6e8",
+        "58081ff8.7b99b"
       ]
     ]
   },
   {
-    "id": "d110bc81.4e37c",
+    "id": "71b449ba.b5b6e8",
     "type": "switchNode",
     "name": "switch  svc-action",
     "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 886.9271011352539,
-    "y": 115.26344203948975,
-    "z": "85ea7447.de94b8",
+    "x": 896.9166946411133,
+    "y": 113.01494884490967,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "71be43d8.37b15c"
+        "2e891b63.abe3c4"
       ]
     ]
   },
   {
-    "id": "71be43d8.37b15c",
+    "id": "2e891b63.abe3c4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1077.6414031982422,
-    "y": 116.26344299316406,
-    "z": "85ea7447.de94b8",
+    "x": 1087.6309967041016,
+    "y": 114.01494979858398,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "bc10300e.78772"
+        "87e5a766.06c0f8"
       ]
     ]
   },
   {
-    "id": "bc10300e.78772",
+    "id": "87e5a766.06c0f8",
     "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": 1252.069953918457,
-    "y": 115.26343536376953,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1262.0595474243164,
+    "y": 113.01494216918945,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "e101af22.28a5c",
+    "id": "58081ff8.7b99b",
     "type": "switchNode",
     "name": "switch svc-action",
     "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 187.9270477294922,
-    "y": 391.2634563446045,
-    "z": "85ea7447.de94b8",
+    "x": 197.91664123535156,
+    "y": 389.0149631500244,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "3bf943df.6744bc",
-        "10f717b7.132f48",
-        "8c12a16e.cbb18",
-        "47b862af.fda80c",
-        "7a94502c.8a083"
+        "244d88a8.8b34f8",
+        "ed647530.fd1808",
+        "e7e5dea9.76643",
+        "e66827c9.add5d8",
+        "708e7f97.f011a"
       ]
     ]
   },
   {
-    "id": "3bf943df.6744bc",
+    "id": "244d88a8.8b34f8",
     "type": "outcome",
     "name": "create",
     "xml": "<outcome value='create'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 396.5104217529297,
-    "y": 220.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 406.50001525878906,
+    "y": 218.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "eda4c0e0.9d0f8"
+        "77a0c94f.323ad8"
       ]
     ]
   },
   {
-    "id": "eda4c0e0.9d0f8",
+    "id": "77a0c94f.323ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 557.5104217529297,
-    "y": 220.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 567.5000152587891,
+    "y": 218.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "61aab614.c8bcf8"
+        "45b5c3e7.7e8fdc"
       ]
     ]
   },
   {
-    "id": "10f717b7.132f48",
+    "id": "ed647530.fd1808",
     "type": "outcome",
     "name": "deactivate",
     "xml": "<outcome value='deactivate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 369.5024108886719,
-    "y": 829.4389524459839,
-    "z": "85ea7447.de94b8",
+    "x": 379.49200439453125,
+    "y": 827.1904592514038,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "9eddcf71.5eb8f"
+        "d552d87c.91c978"
       ]
     ]
   },
   {
-    "id": "8c12a16e.cbb18",
+    "id": "e7e5dea9.76643",
     "type": "outcome",
     "name": "delete",
     "xml": "<outcome value='delete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 373.21679306030273,
-    "y": 1000.153510093689,
-    "z": "85ea7447.de94b8",
+    "x": 383.2063865661621,
+    "y": 997.9050168991089,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "15081a49.63f566"
+        "dfce9d99.75939"
       ]
     ]
   },
   {
-    "id": "47b862af.fda80c",
+    "id": "e66827c9.add5d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 372.9786834716797,
-    "y": 1173.5817956924438,
-    "z": "85ea7447.de94b8",
+    "x": 382.96827697753906,
+    "y": 1171.3333024978638,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "b2e1256a.056728"
+        "25d5e03b.c57d5"
       ]
     ]
   },
   {
-    "id": "b2e1256a.056728",
+    "id": "25d5e03b.c57d5",
     "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": 556.5502166748047,
-    "y": 1174.2009363174438,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 566.5398101806641,
+    "y": 1171.9524431228638,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "61aab614.c8bcf8",
+    "id": "45b5c3e7.7e8fdc",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 781.0104217529297,
-    "y": 220.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 791.0000152587891,
+    "y": 218.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "6d75ab83.475bf4",
-        "7ea03444.87b99c"
+        "5607ba9c.a01254",
+        "5b72d140.94b19"
       ]
     ]
   },
   {
-    "id": "6d75ab83.475bf4",
+    "id": "5607ba9c.a01254",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 956.5104217529297,
-    "y": 240.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 966.5000152587891,
+    "y": 238.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "b89e04db.633018"
+        "e3e018a8.e54428"
       ]
     ]
   },
   {
-    "id": "b89e04db.633018",
+    "id": "e3e018a8.e54428",
     "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 SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",
     "comments": "",
-    "x": 1094.0104217529297,
-    "y": 240.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1104.000015258789,
+    "y": 238.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "ffa5b3a1.3441c",
+    "id": "c81e309.24d38d",
     "type": "other",
-    "name": "DeleteSOTNConnectivityIntance",
-    "xml": "<outcome value='DeleteSOTNConnectivityIntance'>",
+    "name": "DeleteSOTNConnectivityInstance",
+    "xml": "<outcome value='DeleteSOTNConnectivityInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 795.0738334655762,
-    "y": 1000.7087802886963,
-    "z": "85ea7447.de94b8",
+    "x": 805.0634269714355,
+    "y": 998.4602870941162,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "7d07be98.5012f"
+        "b9972944.66ec38"
       ]
     ]
   },
   {
-    "id": "29b99a15.11a946",
+    "id": "b2f524af.680db8",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 730.6293792724609,
-    "y": 1072.9310493469238,
-    "z": "85ea7447.de94b8",
+    "x": 740.6189727783203,
+    "y": 1070.6825561523438,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "db297816.605e88"
+        "ced4fad3.246c68"
       ]
     ]
   },
   {
-    "id": "db297816.605e88",
+    "id": "ced4fad3.246c68",
     "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 SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",
     "comments": "",
-    "x": 890.9627990722656,
-    "y": 1075.0421867370605,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 900.952392578125,
+    "y": 1072.7936935424805,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "7d07be98.5012f",
+    "id": "b9972944.66ec38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1038.9627075195312,
-    "y": 1002.9310321807861,
-    "z": "85ea7447.de94b8",
+    "x": 1048.9523010253906,
+    "y": 1000.682538986206,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "3952213.ae947de",
-        "8110b258.792d5",
-        "7745399b.00a168",
-        "314d388e.78f918"
+        "61c91a24.083064",
+        "fa32e176.13d09",
+        "11242577.05a18b",
+        "5728f3e8.67ddbc"
       ]
     ]
   },
   {
-    "id": "7a94502c.8a083",
+    "id": "708e7f97.f011a",
     "type": "outcome",
     "name": "activate",
     "xml": "<outcome value='activate'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 390.4389762878418,
-    "y": 483.7247266769409,
-    "z": "85ea7447.de94b8",
+    "x": 400.4285697937012,
+    "y": 481.47623348236084,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "b94cc46d.828738"
+        "96fbea47.53b048"
       ]
     ]
   },
   {
-    "id": "b94cc46d.828738",
+    "id": "96fbea47.53b048",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 573.296142578125,
-    "y": 480.8675765991211,
-    "z": "85ea7447.de94b8",
+    "x": 583.2857360839844,
+    "y": 478.619083404541,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "31b835e5.4dbdaa",
-        "390f9d7d.f4c4a2"
+        "74c54cdd.16f624",
+        "eb74a3dc.cd3c3"
       ]
     ]
   },
   {
-    "id": "31b835e5.4dbdaa",
+    "id": "74c54cdd.16f624",
     "type": "other",
-    "name": "ActivateSOTNConnectivityIntance",
-    "xml": "<outcome value='ActivateSOTNConnectivityIntance'>",
+    "name": "ActivateSOTNConnectivityInstance",
+    "xml": "<outcome value='ActivateSOTNConnectivityInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 826.5104217529297,
-    "y": 460.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 836.5000152587891,
+    "y": 458.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "77468a6f.0fba64"
+        "5309ed2f.aa6f94"
       ]
     ]
   },
   {
-    "id": "390f9d7d.f4c4a2",
+    "id": "eb74a3dc.cd3c3",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 756.5104217529297,
-    "y": 500.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 766.5000152587891,
+    "y": 498.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "f71c1a16.68c918"
+        "dce7936d.fb9c7"
       ]
     ]
   },
   {
-    "id": "f71c1a16.68c918",
+    "id": "dce7936d.fb9c7",
     "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 SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",
     "comments": "",
-    "x": 914.0104217529297,
-    "y": 500.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 924.0000152587891,
+    "y": 498.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "77468a6f.0fba64",
+    "id": "5309ed2f.aa6f94",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1057.5104217529297,
-    "y": 460.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1067.500015258789,
+    "y": 458.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "7745399b.00a168",
-        "3952213.ae947de",
-        "8110b258.792d5",
-        "1f6f232b.661ccd"
+        "11242577.05a18b",
+        "61c91a24.083064",
+        "fa32e176.13d09",
+        "decc2f59.1541d"
       ]
     ]
   },
   {
-    "id": "e3c2b14b.36676",
+    "id": "f16eb507.dd9548",
     "type": "other",
-    "name": "DeactivateSOTNConnectivityIntance",
-    "xml": "<outcome value='DeactivateSOTNConnectivityIntance'>",
+    "name": "DeactivateSOTNConnectivityInstance",
+    "xml": "<outcome value='DeactivateSOTNConnectivityInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 812.931037902832,
-    "y": 831.1533460617065,
-    "z": "85ea7447.de94b8",
+    "x": 822.9206314086914,
+    "y": 828.9048528671265,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "b5920e80.fae14"
+        "a0749457.21f388"
       ]
     ]
   },
   {
-    "id": "c46566d8.dada58",
+    "id": "a74c9bd7.c78918",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 727.9310302734375,
-    "y": 900.1533536911011,
-    "z": "85ea7447.de94b8",
+    "x": 737.9206237792969,
+    "y": 897.904860496521,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "a6bce96d.58eb58"
+        "432b7019.21a33"
       ]
     ]
   },
   {
-    "id": "a6bce96d.58eb58",
+    "id": "432b7019.21a33",
     "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 SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",
     "comments": "",
-    "x": 908.9310455322266,
-    "y": 901.1533536911011,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 918.9206390380859,
+    "y": 898.904860496521,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "9eddcf71.5eb8f",
+    "id": "d552d87c.91c978",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 549.7880935668945,
-    "y": 831.6291799545288,
-    "z": "85ea7447.de94b8",
+    "x": 559.7776870727539,
+    "y": 829.3806867599487,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "e3c2b14b.36676",
-        "c46566d8.dada58"
+        "f16eb507.dd9548",
+        "a74c9bd7.c78918"
       ]
     ]
   },
   {
-    "id": "15081a49.63f566",
+    "id": "dfce9d99.75939",
     "type": "switchNode",
     "name": "switch request-action",
     "xml": "<switch test='`$network-topology-operation-input.request-information.request-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 553.5658950805664,
-    "y": 999.9627339839935,
-    "z": "85ea7447.de94b8",
+    "x": 563.5554885864258,
+    "y": 997.7142407894135,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "ffa5b3a1.3441c",
-        "29b99a15.11a946"
+        "c81e309.24d38d",
+        "b2f524af.680db8"
       ]
     ]
   },
   {
-    "id": "b5920e80.fae14",
+    "id": "a0749457.21f388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1072.899185180664,
-    "y": 833.9627408981323,
-    "z": "85ea7447.de94b8",
+    "x": 1065.8887939453125,
+    "y": 828.7142333984375,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "3952213.ae947de",
-        "8110b258.792d5",
-        "7745399b.00a168",
-        "8df757db.a56268"
+        "61c91a24.083064",
+        "fa32e176.13d09",
+        "11242577.05a18b",
+        "260e1e66.250fe2"
       ]
     ]
   },
   {
-    "id": "7ea03444.87b99c",
+    "id": "5b72d140.94b19",
     "type": "other",
-    "name": "CreateSOTNConnectivityIntance",
-    "xml": "<outcome value='CreateSOTNConnectivityIntance'>",
+    "name": "CreateSOTNConnectivityInstance",
+    "xml": "<outcome value='CreateSOTNConnectivityInstance'>",
     "comments": "",
     "outputs": 1,
-    "x": 1022.5104217529297,
-    "y": 200.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1032.500015258789,
+    "y": 198.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "5c394cce.8332b4"
+        "71db169.8db0ce8"
       ]
     ]
   },
   {
-    "id": "5c394cce.8332b4",
+    "id": "71db169.8db0ce8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1237.5104217529297,
-    "y": 200.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1247.500015258789,
+    "y": 198.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "aacac661.db5fc8"
+        "555e685a.dea178"
       ]
     ]
   },
   {
-    "id": "aacac661.db5fc8",
+    "id": "555e685a.dea178",
     "type": "for",
     "name": "for loop i - Network input parameters",
     "xml": "<for index=\"i\" start=\"0\" end=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1488.0104217529297,
-    "y": 200.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1498.000015258789,
+    "y": 198.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "f1c9f306.088fe"
+        "b5d38a93.c445f8"
       ]
     ]
   },
   {
-    "id": "f1c9f306.088fe",
+    "id": "b5d38a93.c445f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1716.5104217529297,
-    "y": 200.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1726.500015258789,
+    "y": 198.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "1c0f238b.8a133c",
-        "22c01d86.bf0c72",
-        "5fb7d8b1.555d08"
+        "663493d6.882fcc",
+        "25318af6.c353a6",
+        "2f66aae0.b823b6"
       ]
     ]
   },
   {
-    "id": "1c0f238b.8a133c",
+    "id": "663493d6.882fcc",
     "type": "set",
     "name": "clear tmp-data",
     "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
     "comments": "",
-    "x": 1899.5104217529297,
-    "y": 160.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1909.500015258789,
+    "y": 158.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "22c01d86.bf0c72",
+    "id": "25318af6.c353a6",
     "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",
     "comments": "",
-    "x": 1894.0104217529297,
-    "y": 200.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1904.000015258789,
+    "y": 198.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "5fb7d8b1.555d08",
+    "id": "2f66aae0.b823b6",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$tmp.name`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1894.0104217529297,
-    "y": 240.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1904.000015258789,
+    "y": 238.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "3a78badb.a37d36",
-        "6d81ed6a.535234",
-        "d7b4d45a.818368"
+        "eb2e473.c9088b8",
+        "b4eb27a6.d1dc38",
+        "db337906.a847b8"
       ]
     ]
   },
   {
-    "id": "a8cb3e9.94103c",
+    "id": "e4f121ba.30fe6",
     "type": "switchNode",
     "name": "switch value",
     "xml": "<switch test=\"`$tmp.value`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2354.0105895996094,
-    "y": 192.6771045923233,
-    "z": "85ea7447.de94b8",
+    "x": 2364.0001831054688,
+    "y": 190.42861139774323,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "f59640c.a9369c"
+        "a8215ff9.64a2b"
       ]
     ]
   },
   {
-    "id": "d7b4d45a.818368",
+    "id": "db337906.a847b8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2113.510757446289,
-    "y": 258.6770921945572,
-    "z": "85ea7447.de94b8",
+    "x": 2123.5003509521484,
+    "y": 256.4285989999771,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "83193a9c.5212a8"
+        "9b19d225.785e"
       ]
     ]
   },
   {
-    "id": "83193a9c.5212a8",
+    "id": "9b19d225.785e",
     "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-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
     "comments": "",
-    "x": 2288.5107612609863,
-    "y": 257.6770921945572,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 2298.5003547668457,
+    "y": 255.4285989999771,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "3a78badb.a37d36",
+    "id": "eb2e473.c9088b8",
     "type": "other",
     "name": "name",
     "xml": "<outcome value='name'>",
     "comments": "",
     "outputs": 1,
-    "x": 2113.510757446289,
-    "y": 142.6770864725113,
-    "z": "85ea7447.de94b8",
+    "x": 2123.5003509521484,
+    "y": 140.4285932779312,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "a8cb3e9.94103c"
+        "e4f121ba.30fe6"
       ]
     ]
   },
   {
-    "id": "6d81ed6a.535234",
+    "id": "b4eb27a6.d1dc38",
     "type": "other",
     "name": "description",
     "xml": "<outcome value='description'>",
     "comments": "",
     "outputs": 1,
-    "x": 2125.510513305664,
-    "y": 196.34374868869781,
-    "z": "85ea7447.de94b8",
+    "x": 2135.5001068115234,
+    "y": 194.09525549411774,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "a8cb3e9.94103c"
+        "e4f121ba.30fe6"
       ]
     ]
   },
   {
-    "id": "f59640c.a9369c",
+    "id": "a8215ff9.64a2b",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 2497.5105895996094,
-    "y": 192.6771045923233,
-    "z": "85ea7447.de94b8",
+    "x": 2507.5001831054688,
+    "y": 190.42861139774323,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "d1c13d61.21b1c"
+        "12290ec0.ce8691"
       ]
     ]
   },
   {
-    "id": "d1c13d61.21b1c",
+    "id": "12290ec0.ce8691",
     "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",
     "comments": "",
-    "x": 2655.5105895996094,
-    "y": 192.6771045923233,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 2665.5001831054688,
+    "y": 190.42861139774323,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "7745399b.00a168",
+    "id": "11242577.05a18b",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1362.399284362793,
-    "y": 504.01039695739746,
-    "z": "85ea7447.de94b8",
+    "x": 1372.3888778686523,
+    "y": 501.7619037628174,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "c70694c.d9fd968",
-        "f88531e6.ae397"
+        "58eed4d5.00134c",
+        "e4c0c5bb.6ddd38"
       ]
     ]
   },
   {
-    "id": "c70694c.d9fd968",
+    "id": "58eed4d5.00134c",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1616.0104217529297,
-    "y": 480.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1626.000015258789,
+    "y": 478.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "58bafa7d.dc8534"
+        "5cea3771.9a9808"
       ]
     ]
   },
   {
-    "id": "58bafa7d.dc8534",
+    "id": "5cea3771.9a9808",
     "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": 1794.0104217529297,
-    "y": 480.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1804.000015258789,
+    "y": 478.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "f88531e6.ae397",
+    "id": "e4c0c5bb.6ddd38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.5104217529297,
-    "y": 520.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1606.500015258789,
+    "y": 518.4285907745361,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "adf12a25.f70768"
+        "134578c4.184aa7"
       ]
     ]
   },
   {
-    "id": "adf12a25.f70768",
+    "id": "134578c4.184aa7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1757.5104217529297,
-    "y": 520.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1767.500015258789,
+    "y": 518.4285907745361,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "81a71d76.fca27",
-        "81dbd082.fe84e"
+        "c72c7291.2c7c8",
+        "78223b76.7839b4"
       ]
     ]
   },
   {
-    "id": "81a71d76.fca27",
+    "id": "c72c7291.2c7c8",
     "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": 2020.0104217529297,
-    "y": 500.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 2030.000015258789,
+    "y": 498.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "bfc00421.e16008"
+        "982e1437.a4b908"
       ]
     ]
   },
   {
-    "id": "bfc00421.e16008",
+    "id": "982e1437.a4b908",
     "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": 2306.0104217529297,
-    "y": 500.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 2316.000015258789,
+    "y": 498.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "c0cf0cfd.ee88d"
+        "ac9a1fa9.bdd22"
       ]
     ]
   },
   {
-    "id": "c0cf0cfd.ee88d",
+    "id": "ac9a1fa9.bdd22",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2476.5104217529297,
-    "y": 500.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 2486.500015258789,
+    "y": 498.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "be39b005.2a634"
+        "ec9e80f0.5ec38"
       ]
     ]
   },
   {
-    "id": "4180e683.809aa8",
+    "id": "6fad3509.6130ec",
     "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].network-data.`' />\n",
     "comments": "",
-    "x": 2866.510482788086,
-    "y": 443.67710971832275,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 2883.5,
+    "y": 501.4286193847656,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "8f21dfe1.e194f",
+    "id": "93e38c19.231d",
     "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": 2234.0104217529297,
-    "y": 540.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 2244.000015258789,
+    "y": 538.4285907745361,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "d566fcec.dd82e",
+    "id": "428fac3b.062274",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2096.5104217529297,
-    "y": 540.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 2106.500015258789,
+    "y": 538.4285907745361,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "8f21dfe1.e194f"
+        "93e38c19.231d"
       ]
     ]
   },
   {
-    "id": "81dbd082.fe84e",
+    "id": "78223b76.7839b4",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1942.5104217529297,
-    "y": 540.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1952.500015258789,
+    "y": 538.4285907745361,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "d566fcec.dd82e"
+        "428fac3b.062274"
       ]
     ]
   },
   {
-    "id": "1f6f232b.661ccd",
+    "id": "decc2f59.1541d",
     "type": "switchNode",
     "name": "switch network-level-oper-status",
     "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1321.6771087646484,
-    "y": 579.5659618377686,
-    "z": "85ea7447.de94b8",
+    "x": 1331.6667022705078,
+    "y": 577.3174686431885,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "2ea404ed.2890bc",
-        "3fc8a371.2d444c"
+        "f48d98e8.f89ba8",
+        "184fe59.3a0381a"
       ]
     ]
   },
   {
-    "id": "2ea404ed.2890bc",
+    "id": "f48d98e8.f89ba8",
     "type": "outcome",
     "name": "outcome Created",
     "xml": "<outcome value='Created'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1618.5105247497559,
-    "y": 579.5659599304199,
-    "z": "85ea7447.de94b8",
+    "x": 1628.5001182556152,
+    "y": 577.3174667358398,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "4920efaf.e8518"
+        "a8cf04ce.747cb8"
       ]
     ]
   },
   {
-    "id": "3fc8a371.2d444c",
+    "id": "184fe59.3a0381a",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1586.5105247497559,
-    "y": 619.5659599304199,
-    "z": "85ea7447.de94b8",
+    "x": 1596.5001182556152,
+    "y": 617.3174667358398,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "e8e9554e.9ed228"
+        "3cd001a0.c45e6e"
       ]
     ]
   },
   {
-    "id": "e8e9554e.9ed228",
+    "id": "3cd001a0.c45e6e",
     "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 is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
     "comments": "",
-    "x": 1744.0105247497559,
-    "y": 619.5659599304199,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1754.0001182556152,
+    "y": 617.3174667358398,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "8110b258.792d5",
+    "id": "fa32e176.13d09",
     "type": "switchNode",
     "name": "switch network-id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-information.network-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1268.5104217529297,
-    "y": 440.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1278.500015258789,
+    "y": 438.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "2154102d.3723d"
+        "d8c5d1a3.b04f7"
       ]
     ]
   },
   {
-    "id": "2154102d.3723d",
+    "id": "d8c5d1a3.b04f7",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1496.5104217529297,
-    "y": 440.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1506.500015258789,
+    "y": 438.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "6116891a.4a7628"
+        "4b563acc.78f384"
       ]
     ]
   },
   {
-    "id": "6116891a.4a7628",
+    "id": "4b563acc.78f384",
     "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": 1634.0104217529297,
-    "y": 440.6770839691162,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1644.000015258789,
+    "y": 438.42859077453613,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "3952213.ae947de",
+    "id": "61c91a24.083064",
     "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=\"$network-topology-operation-input.network-information.network-id\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1303.0104217529297,
-    "y": 400.6770839691162,
-    "z": "85ea7447.de94b8",
+    "x": 1313.000015258789,
+    "y": 398.42859077453613,
+    "z": "86a643d3.ad3a2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "8df757db.a56268",
+    "id": "260e1e66.250fe2",
     "type": "switchNode",
     "name": "switch network-level-oper-status",
     "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1349.8436737060547,
-    "y": 829.565938949585,
-    "z": "85ea7447.de94b8",
+    "x": 1359.833267211914,
+    "y": 827.3174457550049,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "20aef547.50072a",
-        "df0219da.c64748"
+        "91b37393.c0324",
+        "ffe16248.a4bf"
       ]
     ]
   },
   {
-    "id": "20aef547.50072a",
+    "id": "91b37393.c0324",
     "type": "outcome",
     "name": "outcome Active",
     "xml": "<outcome value='Active'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1623.1770477294922,
-    "y": 804.0103969573975,
-    "z": "85ea7447.de94b8",
+    "x": 1633.1666412353516,
+    "y": 801.7619037628174,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "7cd2b1ba.76f03"
+        "809f3296.9b18a"
       ]
     ]
   },
   {
-    "id": "df0219da.c64748",
+    "id": "ffe16248.a4bf",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1593.1770477294922,
-    "y": 844.0103969573975,
-    "z": "85ea7447.de94b8",
+    "x": 1603.1666412353516,
+    "y": 841.7619037628174,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "cde4a066.01eff"
+        "4b27e236.5ebf5c"
       ]
     ]
   },
   {
-    "id": "cde4a066.01eff",
+    "id": "4b27e236.5ebf5c",
     "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 is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
     "comments": "",
-    "x": 1759.1770477294922,
-    "y": 846.0103969573975,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1769.1666412353516,
+    "y": 843.7619037628174,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "314d388e.78f918",
+    "id": "5728f3e8.67ddbc",
     "type": "switchNode",
     "name": "switch network-level-oper-status",
     "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1338.7325897216797,
-    "y": 1000.67702293396,
-    "z": "85ea7447.de94b8",
+    "x": 1348.722183227539,
+    "y": 998.4285297393799,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "7c9245c6.2a554c",
-        "6b9c73ba.23740c"
+        "56251f9.92115e",
+        "5f1c70a5.5c197"
       ]
     ]
   },
   {
-    "id": "7c9245c6.2a554c",
+    "id": "56251f9.92115e",
     "type": "outcome",
     "name": "outcome PendingDelete",
     "xml": "<outcome value='PendingDelete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1638.732650756836,
-    "y": 968.4548187255859,
-    "z": "85ea7447.de94b8",
+    "x": 1648.7222442626953,
+    "y": 966.2063255310059,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "342b3c07.812f54"
+        "a83a5460.627c38"
       ]
     ]
   },
   {
-    "id": "6b9c73ba.23740c",
+    "id": "5f1c70a5.5c197",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1582.0659637451172,
-    "y": 1015.1214809417725,
-    "z": "85ea7447.de94b8",
+    "x": 1592.0555572509766,
+    "y": 1012.8729877471924,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "ed451401.504a48"
+        "91838c11.18855"
       ]
     ]
   },
   {
-    "id": "ed451401.504a48",
+    "id": "91838c11.18855",
     "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 is not in appropriate state for delete. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />",
     "comments": "",
-    "x": 1748.0659637451172,
-    "y": 1017.1214809417725,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      
-    ]
+    "x": 1758.0555572509766,
+    "y": 1014.8729877471924,
+    "z": "86a643d3.ad3a2",
+    "wires": []
   },
   {
-    "id": "4920efaf.e8518",
+    "id": "a8cf04ce.747cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1806.5104026794434,
-    "y": 580.6770439147949,
-    "z": "85ea7447.de94b8",
+    "x": 1816.4999961853027,
+    "y": 578.4285507202148,
+    "z": "86a643d3.ad3a2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "7cd2b1ba.76f03",
+    "id": "809f3296.9b18a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1823.1769256591797,
-    "y": 802.1585292816162,
-    "z": "85ea7447.de94b8",
+    "x": 1833.166519165039,
+    "y": 799.9100360870361,
+    "z": "86a643d3.ad3a2",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "342b3c07.812f54",
+    "id": "a83a5460.627c38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1854.2881317138672,
-    "y": 968.8251552581787,
-    "z": "85ea7447.de94b8",
-    "wires": [
-      [
-        
-      ]
-    ]
-  },
-  {
-    "id": "f267869b.ce6d48",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
-    "comments": "",
-    "x": 2768.676830291748,
-    "y": 545.0103549957275,
-    "z": "85ea7447.de94b8",
+    "x": 1864.2777252197266,
+    "y": 966.5766620635986,
+    "z": "86a643d3.ad3a2",
     "wires": [
-      
+      []
     ]
   },
   {
-    "id": "be39b005.2a634",
+    "id": "ec9e80f0.5ec38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2626.676933288574,
-    "y": 497.01043224334717,
-    "z": "85ea7447.de94b8",
+    "x": 2636.6665267944336,
+    "y": 494.7619390487671,
+    "z": "86a643d3.ad3a2",
     "wires": [
       [
-        "4180e683.809aa8",
-        "f267869b.ce6d48"
+        "6fad3509.6130ec"
       ]
     ]
   }
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
index 7e3fca53..bee22722 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
@@ -15,19 +15,19 @@
                 <parameter name='contextPrefix' value='prop' />
             </execute>
             <set>
-                <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
             </set>
             <set>
                 <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
                 <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` " />
             </set>
             <set>
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Active' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
             </set>
             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
       key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index 446d8a19..e5e6d079 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -1,214 +1,209 @@
-<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}'>
-    <method rpc='sotn-network-topology-operation-create' mode='sync'>
-        <block atomic="true">
-            <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
-                <parameter name="ctx-destination" value="prop.sotn.network-id"/>
-            </execute>
-            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                <block>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CIR'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'EIR'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'CBS'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'PBS'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.pbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'color-aware'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'coupling-flag'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cVLAN'`">
-                        <outcome value='true'>
-                            <set>
-                                <parameter name='prop.sotn.cVLAN' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
-                            </set>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <switch test='`$service-data.networks.network_length`'>
-                <outcome value=''>
-                    <set>
-                        <parameter name='nidx' value='0' />
-                    </set>
-                </outcome>
-                <outcome value='Other'>
-                    <block>
-                        <set>
-                            <parameter name='nidx' value='`$service-data.networks.network_length`' />
-                        </set>
-                        <for index='idx' start='0' end='`$nidx`' >
-                            <switch test="`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`">
-                                <outcome value='true'>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id already found in service-data" />
-                                    </return>
-                                </outcome>
-                            </switch>
-                        </for>
-                    </block>
-                </outcome>
-            </switch>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
-                <parameter name="field1" value="__TIMESTAMP__"/>
-                <parameter name="field2" value="sotn-network-topology-operation-create"/>
-                <parameter name="field3" value="SOTN-Config"/>
-            </record>
-            <set>
-                <parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />
-                <parameter name='service-data.networks.network_length' value='`$nidx+1`' />
-            </set>
-            <set>
-                <parameter name='networkId' value='`$prop.sotn.network-id`' />
-                <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
-            </set>
-            <set>
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
-            </set>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $prop.sotn.network-id' >
-                <parameter name='connectivity-id' value='`$prop.sotn.network-id`' />
-                <parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />
-                <parameter name='CIR' value='`$prop.sotn.cir`' />
-                <parameter name='EIR' value='`$prop.sotn.eir`' />
-                <parameter name='CBS' value='`$prop.sotn.cbs`' />
-                <parameter name='EBS' value='`$prop.sotn.ebs`' />
-                <parameter name='color-aware' value='`$prop.sotn.colorAware`' />
-                <parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />
-                <parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />
-                <parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />
-                <parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />
-                <parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />
-                <parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
-                <parameter name='cvlan-tag-entry' value='`$prop.sotn.cVLAN`' />
-                <parameter name='operational-status' value='Created' />
-                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
-                <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
-            </save>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
-      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id 
-         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id 
-         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' 
-      force="true" pfx="tmp.AnAI-data">
-                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
-                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
-                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
-            </save>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-network-topology-operation-create' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="prop.sotn.network-id"/>
+            </execute>
+            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                <block>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cir'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'eir'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cbs'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ebs'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.ebs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'colorAware'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'couplingFlag'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`">
+                        <outcome value='true'>
+                            <set>
+                                <parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <switch test='`$service-data.networks.network_length`'>
+                <outcome value=''>
+                    <set>
+                        <parameter name='nidx' value='0' />
+                    </set>
+                </outcome>
+                <outcome value='Other'>
+                    <block>
+                        <set>
+                            <parameter name='nidx' value='`$service-data.networks.network_length`' />
+                        </set>
+                        <for index='idx' start='0' end='`$nidx`' >
+                            <switch test="`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`">
+                                <outcome value='true'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id already found in service-data" />
+                                    </return>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+            </switch>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+                <parameter name="field1" value="__TIMESTAMP__"/>
+                <parameter name="field2" value="sotn-network-topology-operation-create"/>
+                <parameter name="field3" value="SOTN-Config"/>
+            </record>
+            <set>
+                <parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.network-id`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />
+                <parameter name='service-data.networks.network_length' value='`$nidx+1`' />
+            </set>
+            <set>
+                <parameter name='networkId' value='`$prop.sotn.network-id`' />
+                <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+            </set>
+            <set>
+                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />
+                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+            </set>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $prop.sotn.network-id' >
+                <parameter name='connectivity-id' value='`$prop.sotn.network-id`' />
+                <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />
+                <parameter name='vpn-type' value='`$prop.sotn.vpnType`' />
+                <parameter name='CIR' value='`$prop.sotn.cir`' />
+                <parameter name='EIR' value='`$prop.sotn.eir`' />
+                <parameter name='CBS' value='`$prop.sotn.cbs`' />
+                <parameter name='EBS' value='`$prop.sotn.ebs`' />
+                <parameter name='color-aware' value='`$prop.sotn.colorAware`' />
+                <parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />
+                <parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />
+                <parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />
+                <parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />
+                <parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />
+                <parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />
+                <parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
+                <parameter name='cvlan' value='`$prop.sotn.cVLAN`' />
+                <parameter name='operational-status' value='Created' />
+                <!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->
+                <!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->
+                <!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->
+                <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+            </save>
+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
+      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id 
+         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id 
+         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' 
+      force="true" pfx="tmp.AnAI-data">
+                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />
+            </save>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
index ac891e34..53dae268 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
@@ -1,44 +1,44 @@
-<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}'>
-    <method rpc='sotn-network-topology-operation-deactivate' mode='sync'>
-        <block atomic="true">
-            <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
-                <parameter name="field1" value="__TIMESTAMP__"/>
-                <parameter name="field2" value="sotn-network-topology-operation-activate"/>
-                <parameter name="field3" value="SOTN-Deactivate"/>
-            </record>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <set>
-                <parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
-            </set>
-            <set>
-                <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
-                <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` " />
-            </set>
-            <set>
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
-                <parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
-            </set>
-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
-      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
-                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
-                <parameter name='operational-status' value='PendingDelete' />
-            </update>
-            <return status='success'>
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
+<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}'>
+    <method rpc='sotn-network-topology-operation-deactivate' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' ></call>
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+                <parameter name="field1" value="__TIMESTAMP__"/>
+                <parameter name="field2" value="sotn-network-topology-operation-activate"/>
+                <parameter name="field3" value="SOTN-Deactivate"/>
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />
+            </set>
+            <set>
+                <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />
+                <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` " />
+            </set>
+            <set>
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='PendingDelete' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />
+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />
+            </set>
+            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' 
+      key='connectivity.connectivity-id = $network-topology-operation-input.network-information.network-id' >
+                <parameter name='connectivity-id' value='`$network-topology-operation-input.network-information.network-id`' />
+                <parameter name='operational-status' value='PendingDelete' />
+            </update>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
+\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
index a8587049..2669e641 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
@@ -16,7 +16,7 @@
                 <outcome value='create'>
                     <block atomic="true">
                         <switch test='`$network-topology-operation-input.request-information.request-action`'>
-                            <outcome value='CreateSOTNConnectivityIntance'>
+                            <outcome value='CreateSOTNConnectivityInstance'>
                                 <block atomic="true">
                                     <for index="i" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
                                         <block>
@@ -75,7 +75,7 @@
                 </outcome>
                 <outcome value='activate'>
                     <switch test='`$network-topology-operation-input.request-information.request-action`'>
-                        <outcome value='ActivateSOTNConnectivityIntance'>
+                        <outcome value='ActivateSOTNConnectivityInstance'>
                             <block atomic="true">
                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
                                     <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id"/>
@@ -107,7 +107,6 @@
                                                                 <parameter name='tmp.nidx' value='`$nidx`' />
                                                                 <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
                                                             </set>
-                                                            <break></break>
                                                         </block>
                                                     </outcome>
                                                 </switch>
@@ -149,7 +148,7 @@
                 </outcome>
                 <outcome value='deactivate'>
                     <switch test='`$network-topology-operation-input.request-information.request-action`'>
-                        <outcome value='DeactivateSOTNConnectivityIntance'>
+                        <outcome value='DeactivateSOTNConnectivityInstance'>
                             <block atomic="true">
                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
                                     <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id"/>
@@ -181,7 +180,6 @@
                                                                 <parameter name='tmp.nidx' value='`$nidx`' />
                                                                 <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
                                                             </set>
-                                                            <break></break>
                                                         </block>
                                                     </outcome>
                                                 </switch>
@@ -223,7 +221,7 @@
                 </outcome>
                 <outcome value='delete'>
                     <switch test='`$network-topology-operation-input.request-information.request-action`'>
-                        <outcome value='DeleteSOTNConnectivityIntance'>
+                        <outcome value='DeleteSOTNConnectivityInstance'>
                             <block atomic="true">
                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
                                     <parameter name="network-topology-operation-input.network-information.network-id" value="$network-topology-operation-input.network-information.network-id"/>
@@ -255,7 +253,6 @@
                                                                 <parameter name='tmp.nidx' value='`$nidx`' />
                                                                 <parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].network-data.`' />
                                                             </set>
-                                                            <break></break>
                                                         </block>
                                                     </outcome>
                                                 </switch>
author	Dan Timoney <dt5972@att.com>	2018-08-09 20:37:04 +0000
committer	Gerrit Code Review <gerrit@onap.org>	2018-08-09 20:37:04 +0000
commit	c27e144516affd3b064fc9c51d50a637d75bb35a (patch)
tree	fbbb918527ed8969e3dcf64d97c908f8ebc92bdc /platform-logic
parent	d2c717698e503e0ad29f92b740f82632675a3997 (diff)
parent	0e1791d92c7ae3c8c0703431a752feb424732970 (diff)