SDWAN sdnc DGs aai resource changes

SDWAN configuration save in aai resource-name changes are updated in SDWAN DGs

Change-Id: I9097f205751af47b5db8f228142f27786e9d190d
Issue-ID: SDNC-357
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: fad8ff4f0b3660a5c1dd4b7abdb5ac5b95c8fec2

34 files changed, 1023 insertions, 1008 deletions

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 6b630e54..c1cf62db 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "75e675fb.618e5c",
+    "id": "20435d2f.b707b2",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 135.00390625,
-    "y": 77.00390625,
-    "z": "3dcb52b5.f95fbe",
+    "x": 129.01040649414062,
+    "y": 61.010414123535156,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "7fa0e5e0.b33c5c"
+        "83ca6f8e.538a2"
       ]
     ]
   },
   {
-    "id": "7fa0e5e0.b33c5c",
+    "id": "83ca6f8e.538a2",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,218 +22,218 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 224.00393676757812,
-    "y": 167.89281845092773,
-    "z": "3dcb52b5.f95fbe",
+    "x": 218.01043701171875,
+    "y": 151.8993263244629,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "d74cb25a.e2de3"
+        "5fa2f1f3.bb35e"
       ]
     ]
   },
   {
-    "id": "d74cb25a.e2de3",
+    "id": "5fa2f1f3.bb35e",
     "type": "method",
     "name": "method update-network-to-aai",
     "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 260.1151580810547,
-    "y": 238.22614288330078,
-    "z": "3dcb52b5.f95fbe",
+    "x": 254.1216583251953,
+    "y": 222.23265075683594,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "a101ac8e.c59f1"
+        "44238134.7d97f"
       ]
     ]
   },
   {
-    "id": "a101ac8e.c59f1",
+    "id": "44238134.7d97f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 485.33734130859375,
-    "y": 237.78182983398438,
-    "z": "3dcb52b5.f95fbe",
+    "x": 479.3438415527344,
+    "y": 221.78833770751953,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "d5314164.19147",
-        "1d637de0.aa2f02",
-        "b183cf6c.88416"
+        "84458cb3.2004e",
+        "282c5771.31f2f8",
+        "c27c36c9.fe0038"
       ]
     ]
   },
   {
-    "id": "1d637de0.aa2f02",
+    "id": "282c5771.31f2f8",
     "type": "update",
     "name": "save network-resource",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 715.337158203125,
-    "y": 143.00392150878906,
-    "z": "3dcb52b5.f95fbe",
+    "x": 709.3436584472656,
+    "y": 127.01042938232422,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "8399fa0a.e7e2c8",
+    "id": "8db597cb.e2ef58",
     "type": "update",
     "name": "save pnf",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='network-resource.network-id = $tmp.network-id\n      AND pnf.pnf-name = $node.node-id' >\n<parameter name='pnf-name' value='`$node.node-id`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 905.1150512695312,
-    "y": 195.11500549316406,
-    "z": "3dcb52b5.f95fbe",
+    "x": 899.1215515136719,
+    "y": 179.12151336669922,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "b183cf6c.88416",
+    "id": "c27c36c9.fe0038",
     "type": "for",
     "name": "for each node",
     "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 691.8927612304688,
-    "y": 187.33721923828125,
-    "z": "3dcb52b5.f95fbe",
+    "x": 685.8992614746094,
+    "y": 171.3437271118164,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "8399fa0a.e7e2c8",
-        "a42bad10.3ef0b",
-        "21ad025b.8c4fee",
-        "9a109c49.5a457",
-        "4710678b.b2f898"
+        "8db597cb.e2ef58",
+        "6b246a86.7d22b4",
+        "79357b97.6a6604",
+        "629488d9.a436f8",
+        "89ed3af1.c4f958"
       ]
     ]
   },
   {
-    "id": "a42bad10.3ef0b",
+    "id": "6b246a86.7d22b4",
     "type": "set",
     "name": "set network",
     "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n",
     "comments": "",
-    "x": 912.114990234375,
-    "y": 161.2261199951172,
-    "z": "3dcb52b5.f95fbe",
+    "x": 906.1214904785156,
+    "y": 145.23262786865234,
+    "z": "3e15e6f8.d8900a",
     "wires": []
   },
   {
-    "id": "21ad025b.8c4fee",
+    "id": "79357b97.6a6604",
     "type": "save",
     "name": "save pnf relationship to network-resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1023.7819213867188,
-    "y": 228.44839477539062,
-    "z": "3dcb52b5.f95fbe",
+    "x": 1017.7884216308594,
+    "y": 212.45490264892578,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "4710678b.b2f898",
+    "id": "89ed3af1.c4f958",
     "type": "for",
     "name": "for each termination point",
     "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 956.4483642578125,
-    "y": 344.114990234375,
-    "z": "3dcb52b5.f95fbe",
+    "x": 950.4548645019531,
+    "y": 328.12149810791016,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       [
-        "7bcb0931.538d48",
-        "56653317.e67e9c",
-        "5da0d24d.9b201c",
-        "2065ea1d.9bce86"
+        "6bc546b5.f87e18",
+        "8d1a709c.fbdf6",
+        "ad4de444.eb7858",
+        "bd80da47.090a88"
       ]
     ]
   },
   {
-    "id": "7bcb0931.538d48",
+    "id": "6bc546b5.f87e18",
     "type": "set",
     "name": "set termination point",
     "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
     "comments": "",
-    "x": 1223.115234375,
-    "y": 305.0039520263672,
-    "z": "3dcb52b5.f95fbe",
+    "x": 1217.1217346191406,
+    "y": 289.01045989990234,
+    "z": "3e15e6f8.d8900a",
     "wires": []
   },
   {
-    "id": "2065ea1d.9bce86",
+    "id": "bd80da47.090a88",
     "type": "update",
     "name": "save p-interface",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='network-resource.network-id = $tmp.network-id\n      AND pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='network-resource.network-id = $tmp.network-id\n      AND pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1206.8189697265625,
-    "y": 373.55950927734375,
-    "z": "3dcb52b5.f95fbe",
+    "x": 1200.8254699707031,
+    "y": 357.5660171508789,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "56653317.e67e9c",
+    "id": "8d1a709c.fbdf6",
     "type": "save",
     "name": "save pnf relationship to p-interface in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $node.node-id' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1284.707763671875,
-    "y": 411.3372497558594,
-    "z": "3dcb52b5.f95fbe",
+    "x": 1278.7142639160156,
+    "y": 395.34375762939453,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "5da0d24d.9b201c",
+    "id": "ad4de444.eb7858",
     "type": "set",
     "name": "set unique-ltpId",
     "xml": "<set>\n<parameter name='unique-ltpId' value=\"`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`\" />\n",
     "comments": "",
-    "x": 1207.004150390625,
-    "y": 339.1150207519531,
-    "z": "3dcb52b5.f95fbe",
+    "x": 1201.0106506347656,
+    "y": 323.1215286254883,
+    "z": "3e15e6f8.d8900a",
     "wires": []
   },
   {
-    "id": "d5314164.19147",
+    "id": "84458cb3.2004e",
     "type": "execute",
     "name": "execute",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
     "comments": "",
     "outputs": 1,
-    "x": 664.9974365234375,
-    "y": 103.99739837646484,
-    "z": "3dcb52b5.f95fbe",
+    "x": 659.0039367675781,
+    "y": 88.00390625,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a109c49.5a457",
+    "id": "629488d9.a436f8",
     "type": "save",
     "name": "save pnf relation with esr-thirdparty-sdnc",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1005.00390625,
-    "y": 264.9974060058594,
-    "z": "3dcb52b5.f95fbe",
+    "x": 999.0104064941406,
+    "y": 249.00391387939453,
+    "z": "3e15e6f8.d8900a",
     "wires": [
       []
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 740ace01..f3f089a9 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,75 +1,76 @@
-<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='DataChange' version='${project.version}'>
-    <method rpc='update-network-to-aai' mode='sync'>
-        <block atomic="true">
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                <parameter name="source" value="`$network.network-id`"/>
-                <parameter name="outputPath" value="tmp.network-id"/>
-                <parameter name="target" value="/"/>
-                <parameter name="replacement" value="-"/>
-            </execute>
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  
-     key='network-resource.network-id = $tmp.network-id' >
-                <parameter name='network-id' value='`$tmp.network-id`' />
-                <parameter name='client-id' value='`$network.client-id`' />
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />
-                <parameter name='provider-id' value='`$network.provider-id`' />
-            </save>
-            <for index='pidx' start='0' end='`$network.node_length`' >
-                <set>
-                    <parameter name='node.' value='`$network.node[$pidx].`' />
-                </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 
-      key='network-resource.network-id = $tmp.network-id
-      AND pnf.pnf-name = $node.node-id' >
-                    <parameter name='pnf-name' value='`$node.node-id`' />
-                    <parameter name='pnf-id' value='`$node.node-id`' />
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
-                    <parameter name='in-maint' value='true' />
-                </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
-                </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 
-      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 
-      force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
-                </save>
-                <for index='tidx' start='0' end='`$node.termination-point_length`' >
-                    <set>
-                        <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
-                    </set>
-                    <set>
-                        <parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />
-                    </set>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 
-      key='network-resource.network-id = $tmp.network-id
-      AND pnf.pnf-name = $node.node-id
-      AND p-interface.interface-name = $unique-ltpId' >
-                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
-                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
-                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
-                        <parameter name='operational-status' value='`$tp.te.oper-status`' />
-                        <parameter name='in-maint' value="true" />
-                    </save>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 
-      key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">
-                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
-                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`" />
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId`" />
-                    </save>
-                </for>
-            </for>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<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='DataChange' version='${project.version}'>

+    <method rpc='update-network-to-aai' mode='sync'>

+        <block atomic="true">

+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >

+                <parameter name="source" value="`$network.network-id`"/>

+                <parameter name="outputPath" value="tmp.network-id"/>

+                <parameter name="target" value="/"/>

+                <parameter name="replacement" value="-"/>

+            </execute>

+            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  

+     key='network-resource.network-id = $tmp.network-id' >

+                <parameter name='network-id' value='`$tmp.network-id`' />

+                <parameter name='client-id' value='`$network.client-id`' />

+                <parameter name='te-topo-id' value='`$network.te-topology-id`' />

+                <parameter name='provider-id' value='`$network.provider-id`' />

+            </save>

+            <for index='pidx' start='0' end='`$network.node_length`' >

+                <set>

+                    <parameter name='node.' value='`$network.node[$pidx].`' />

+                </set>

+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 

+      key='network-resource.network-id = $tmp.network-id

+      AND pnf.pnf-name = $node.node-id' >

+                    <parameter name='pnf-name' value='`$node.node-id`' />

+                    <parameter name='pnf-id' value='`$node.node-id`' />

+                    <parameter name='operational-status' value='`$node.te.oper-status`' />

+                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />

+                    <parameter name='in-maint' value='true' />

+                </save>

+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 

+      key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">

+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />

+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />

+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />

+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />

+                </save>

+                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' 

+      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' 

+      force="true" pfx="tmp.AnAI-data">

+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />

+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />

+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />

+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />

+                </save>

+                <for index='tidx' start='0' end='`$node.termination-point_length`' >

+                    <set>

+                        <parameter name='tp.' value='`$node.termination-point[$tidx].`' />

+                    </set>

+                    <set>

+                        <parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />

+                    </set>

+                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 

+      key='network-resource.network-id = $tmp.network-id

+      AND pnf.pnf-name = $node.node-id

+      AND p-interface.interface-name = $unique-ltpId' >

+                        <parameter name='interface-name' value='`$unique-ltpId`' />

+                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />

+                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />

+                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />

+                        <parameter name='operational-status' value='`$tp.te.oper-status`' />

+                        <parameter name='in-maint' value="true" />

+                    </save>

+                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 

+      key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">

+                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />

+                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`" />

+                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />

+                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId`" />

+                    </save>

+                </for>

+            </for>

+        </block>

+    </method>

+</service-logic>

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
index 7d5dfcaa..7bba81aa 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4ddcb062.8ecdb",
+    "id": "65a8b91d.24abd8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 88.03125,
-    "y": 50.03125,
-    "z": "28e3f0b9.24cf2",
+    "x": 151.00390625,
+    "y": 84.99999904632568,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "596e35be.20cc4c"
+        "84123a61.191508"
       ]
     ]
   },
   {
-    "id": "596e35be.20cc4c",
+    "id": "84123a61.191508",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,755 +22,767 @@
     "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": 274.03125381469727,
-    "y": 122.0312671661377,
-    "z": "28e3f0b9.24cf2",
+    "x": 337.00391006469727,
+    "y": 157.00001621246338,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "c01d9d60.83407"
+        "8bfdb728.fd5fb8"
       ]
     ]
   },
   {
-    "id": "c01d9d60.83407",
+    "id": "8bfdb728.fd5fb8",
     "type": "method",
     "name": "method sdwan-network-topology-operation-activate",
     "xml": "<method rpc='sdwan-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 262.0313720703125,
-    "y": 210.03125,
-    "z": "28e3f0b9.24cf2",
+    "x": 325.0040283203125,
+    "y": 244.99999904632568,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "18ab359f.ed0fba"
+        "61fe5ec.24b3ea"
       ]
     ]
   },
   {
-    "id": "18ab359f.ed0fba",
+    "id": "61fe5ec.24b3ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 436.03126525878906,
-    "y": 318.0313091278076,
-    "z": "28e3f0b9.24cf2",
+    "x": 499.00392150878906,
+    "y": 353.0000581741333,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "c561faa1.7d7778",
-        "6dc01778.009fd8",
-        "da487e61.56608",
-        "c6b01240.db33",
-        "3f3b0e5f.2cbb02",
-        "98c44abf.148e28",
-        "21c2ad92.7e1fb2",
-        "2511a75a.f0a8b8",
-        "1ae62a5a.18e726",
-        "fc4fc9d4.5f3178",
-        "3bff9e87.90adb2",
-        "3355eb7a.3cf5b4",
-        "fce8b550.d12f88",
-        "cc83cf92.13ac4",
-        "5ff87b45.2a9d04"
+        "1c31cf0.eb62931",
+        "3d6bcf7d.5c2b4",
+        "55b053ca.9c8fec",
+        "efb367a9.777348",
+        "faa41b3d.6507b8",
+        "25d677c3.3e42d8",
+        "eb7cc280.f6366",
+        "178920a9.13ec3f",
+        "546fc3e9.7052dc",
+        "dc4c0558.42daa8",
+        "f31fc51b.0a7188",
+        "2ab6006d.5b2cc",
+        "1a43627f.6e263e",
+        "204db58e.69892a",
+        "634732f9.1dcf5c",
+        "d5289859.e9ecf8"
       ]
     ]
   },
   {
-    "id": "c561faa1.7d7778",
+    "id": "1c31cf0.eb62931",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 894.4201507568359,
-    "y": 67.03125,
-    "z": "28e3f0b9.24cf2",
+    "x": 957.3928070068359,
+    "y": 101.99999904632568,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "6dc01778.009fd8",
+    "id": "3d6bcf7d.5c2b4",
     "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=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 694.5868492126465,
-    "y": 120.80910301208496,
-    "z": "28e3f0b9.24cf2",
+    "x": 757.5595054626465,
+    "y": 155.77785205841064,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "da487e61.56608",
+    "id": "55b053ca.9c8fec",
     "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": 781.5871276855469,
-    "y": 1043.344719171524,
-    "z": "28e3f0b9.24cf2",
+    "x": 844.5597839355469,
+    "y": 1078.3134682178497,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "c6b01240.db33",
+    "id": "efb367a9.777348",
     "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": 703.3649291992188,
-    "y": 1232.900139093399,
-    "z": "28e3f0b9.24cf2",
+    "x": 766.3375854492188,
+    "y": 1267.8688881397247,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "3f3b0e5f.2cbb02",
+    "id": "faa41b3d.6507b8",
     "type": "set",
     "name": "set network-level-oper-status",
     "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": 748.4760437011719,
-    "y": 1104.5668938159943,
-    "z": "28e3f0b9.24cf2",
+    "x": 811.4486999511719,
+    "y": 1139.53564286232,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "98c44abf.148e28",
+    "id": "25d677c3.3e42d8",
     "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": 726.8889541625977,
-    "y": 173.80913925170898,
-    "z": "28e3f0b9.24cf2",
+    "x": 789.8616104125977,
+    "y": 208.77788829803467,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "21c2ad92.7e1fb2",
+    "id": "eb7cc280.f6366",
     "type": "update",
     "name": "update SDWAN VPN status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanatId' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 765.6947593688965,
-    "y": 1167.2701053619385,
-    "z": "28e3f0b9.24cf2",
+    "x": 828.6674156188965,
+    "y": 1202.2388544082642,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "2511a75a.f0a8b8",
+    "id": "178920a9.13ec3f",
     "type": "set",
     "name": "set network in service-data",
     "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": 742.0316581726074,
-    "y": 990.1225531101227,
-    "z": "28e3f0b9.24cf2",
+    "x": 805.0043144226074,
+    "y": 1025.0913021564484,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "1ae62a5a.18e726",
+    "id": "546fc3e9.7052dc",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 779.03125,
-    "y": 244.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 842.00390625,
+    "y": 279.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "b794657d.4da128"
+        "7343f9f8.91aa58"
       ]
     ]
   },
   {
-    "id": "b794657d.4da128",
+    "id": "7343f9f8.91aa58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1035.8646812438965,
-    "y": 178.36850866675377,
-    "z": "28e3f0b9.24cf2",
+    "x": 1098.8373374938965,
+    "y": 213.33725771307945,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "53501d6c.c520f4",
-        "e1341c8f.56768"
+        "8d49b6eb.aacfa8",
+        "75ed8e31.a1e03"
       ]
     ]
   },
   {
-    "id": "53501d6c.c520f4",
+    "id": "8d49b6eb.aacfa8",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1226.8647422790527,
-    "y": 174.36854109168053,
-    "z": "28e3f0b9.24cf2",
+    "x": 1289.8373985290527,
+    "y": 209.3372901380062,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "2cafaedf.cedf32"
+        "9aed38f3.ef1268"
       ]
     ]
   },
   {
-    "id": "2cafaedf.cedf32",
+    "id": "9aed38f3.ef1268",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1400.8648681640625,
-    "y": 174.3685449063778,
-    "z": "28e3f0b9.24cf2",
+    "x": 1463.8375244140625,
+    "y": 209.33729395270348,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "529c0b0c.8d2074"
+        "f86c1bb0.83c838"
       ]
     ]
   },
   {
-    "id": "529c0b0c.8d2074",
+    "id": "f86c1bb0.83c838",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1563.8647537231445,
-    "y": 173.96853956580162,
-    "z": "28e3f0b9.24cf2",
+    "x": 1626.8374099731445,
+    "y": 208.9372886121273,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "fce8b550.d12f88",
+    "id": "1a43627f.6e263e",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 773.03125,
-    "y": 353.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 836.00390625,
+    "y": 388.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "9b25121d.283a4",
-        "385f822e.d7b4ae",
-        "f3914c31.422ce"
+        "1feb8ff6.c06a9",
+        "a8710737.3b8c28",
+        "e42763ba.ed5ab"
       ]
     ]
   },
   {
-    "id": "9b25121d.283a4",
+    "id": "1feb8ff6.c06a9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1018.03125,
-    "y": 299.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 1081.00390625,
+    "y": 334.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "f386956a.705be8"
+        "4a6a181d.584358"
       ]
     ]
   },
   {
-    "id": "385f822e.d7b4ae",
+    "id": "a8710737.3b8c28",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1021.522216796875,
-    "y": 346.6091931760311,
-    "z": "28e3f0b9.24cf2",
+    "x": 1084.494873046875,
+    "y": 381.5779422223568,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "e34bc405.635f88"
+        "e9aab137.64b04"
       ]
     ]
   },
   {
-    "id": "f3914c31.422ce",
+    "id": "e42763ba.ed5ab",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1016.855224609375,
-    "y": 387.94250616431236,
-    "z": "28e3f0b9.24cf2",
+    "x": 1079.827880859375,
+    "y": 422.91125521063805,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "799bf116.3f716"
+        "4b35376e.7e4788"
       ]
     ]
   },
   {
-    "id": "f386956a.705be8",
+    "id": "4a6a181d.584358",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1215.5313110351562,
-    "y": 287.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 1278.5039672851562,
+    "y": 322.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "e34bc405.635f88",
+    "id": "e9aab137.64b04",
     "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1198.0936279296875,
-    "y": 334.8949292600155,
-    "z": "28e3f0b9.24cf2",
+    "x": 1261.0662841796875,
+    "y": 369.86367830634117,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "799bf116.3f716",
+    "id": "4b35376e.7e4788",
     "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1204.6277809143066,
-    "y": 383.381698936224,
-    "z": "28e3f0b9.24cf2",
+    "x": 1267.6004371643066,
+    "y": 418.35044798254967,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "cc83cf92.13ac4",
+    "id": "204db58e.69892a",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 781.03125,
-    "y": 464.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 844.00390625,
+    "y": 499.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "de360ea0.df86c",
-        "8ab64288.ec606"
+        "ced0b203.a391b",
+        "184980af.bcb96f"
       ]
     ]
   },
   {
-    "id": "de360ea0.df86c",
+    "id": "ced0b203.a391b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1020.031322479248,
-    "y": 442.03518772125244,
-    "z": "28e3f0b9.24cf2",
+    "x": 1083.003978729248,
+    "y": 477.0039367675781,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "d8a5f197.3daff"
+        "17cfd49c.8c98fb"
       ]
     ]
   },
   {
-    "id": "8ab64288.ec606",
+    "id": "184980af.bcb96f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1012.281322479248,
-    "y": 495.6780710220337,
-    "z": "28e3f0b9.24cf2",
+    "x": 1075.253978729248,
+    "y": 530.6468200683594,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "761741d1.08b81"
+        "2ec37152.e84eee"
       ]
     ]
   },
   {
-    "id": "d8a5f197.3daff",
+    "id": "17cfd49c.8c98fb",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1170.03125,
-    "y": 443.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 1233.00390625,
+    "y": 478.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "761741d1.08b81",
+    "id": "2ec37152.e84eee",
     "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=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 1165.031322479248,
-    "y": 495.42813205718994,
-    "z": "28e3f0b9.24cf2",
+    "x": 1228.003978729248,
+    "y": 530.3968811035156,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "e1341c8f.56768",
+    "id": "75ed8e31.a1e03",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1225.28125,
-    "y": 227.03515753149986,
-    "z": "28e3f0b9.24cf2",
+    "x": 1288.25390625,
+    "y": 262.00390657782555,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "abb60c8f.8ac5f"
+        "6c4b55cb.0408ec"
       ]
     ]
   },
   {
-    "id": "abb60c8f.8ac5f",
+    "id": "6c4b55cb.0408ec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1399.2813758850098,
-    "y": 227.03516134619713,
-    "z": "28e3f0b9.24cf2",
+    "x": 1462.2540321350098,
+    "y": 262.0039103925228,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "36b54251.f429ce"
+        "6d553f1a.6f2d"
       ]
     ]
   },
   {
-    "id": "36b54251.f429ce",
+    "id": "6d553f1a.6f2d",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1562.2812614440918,
-    "y": 226.63515600562096,
-    "z": "28e3f0b9.24cf2",
+    "x": 1625.2539176940918,
+    "y": 261.60390505194664,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "5ff87b45.2a9d04",
+    "id": "634732f9.1dcf5c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 702.7812957763672,
-    "y": 710.0352792739868,
-    "z": "28e3f0b9.24cf2",
+    "x": 765.7539520263672,
+    "y": 745.0040283203125,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "34512469.61377c"
+        "f913ba01.d721f8"
       ]
     ]
   },
   {
-    "id": "34512469.61377c",
+    "id": "f913ba01.d721f8",
     "type": "execute",
     "name": "execute RestApiCallNode Create network orchestration",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"orchestration-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1023.2814025878906,
-    "y": 699.0353622436523,
-    "z": "28e3f0b9.24cf2",
+    "x": 1086.2540588378906,
+    "y": 734.004111289978,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc4fc9d4.5f3178",
+    "id": "dc4c0558.42daa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 705.2812652587891,
-    "y": 772.0352075994015,
-    "z": "28e3f0b9.24cf2",
+    "x": 768.2539215087891,
+    "y": 807.0039566457272,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "dcf83ef9.92d4e",
-        "6fd086ba.35f488",
-        "ccbce6bf.529778"
+        "fb537bd1.22fa68",
+        "e996dfd6.0f7c",
+        "81b5cd25.b683d"
       ]
     ]
   },
   {
-    "id": "6fd086ba.35f488",
+    "id": "e996dfd6.0f7c",
     "type": "execute",
     "name": "execute RestApiCallNode Create vpn",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 976.7813110351562,
-    "y": 762.0353315770626,
-    "z": "28e3f0b9.24cf2",
+    "x": 1039.7539672851562,
+    "y": 797.0040806233883,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "dcf83ef9.92d4e",
+    "id": "fb537bd1.22fa68",
     "type": "set",
     "name": "set prop.vpn-id and prop.vpn1Id",
-    "xml": "<set>\n<!--parameter name='prop.vpn-id' value='`$vpn-result.id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.id`' /-->\n\n<parameter name='prop.vpn-id' value='10' />\n<parameter name='prop.vpn1Id' value='10' />\n",
+    "xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n",
     "comments": "",
-    "x": 972.7814674377441,
-    "y": 814.0354309082031,
-    "z": "28e3f0b9.24cf2",
+    "x": 1035.7541236877441,
+    "y": 849.0041799545288,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "ccbce6bf.529778",
+    "id": "81b5cd25.b683d",
     "type": "execute",
     "name": "execute RestApiCallNode Create vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1004.2813148498535,
-    "y": 866.0352058410645,
-    "z": "28e3f0b9.24cf2",
+    "x": 1067.2539710998535,
+    "y": 901.0039548873901,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bff9e87.90adb2",
+    "id": "f31fc51b.0a7188",
     "type": "set",
-    "name": "set tenant-id and vpn-id to service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].name' value='vpn-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].value' value='`$prop.vpn-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 2`' />",
+    "name": "set tenant-id to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
     "comments": "",
-    "x": 784.2812538146973,
-    "y": 935.7852268218994,
-    "z": "28e3f0b9.24cf2",
+    "x": 803.2540588378906,
+    "y": 942.7540893554688,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "3355eb7a.3cf5b4",
+    "id": "2ab6006d.5b2cc",
     "type": "get-resource",
     "name": "get-resource service-subscription",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'\n      force=\"true\" pfx=\"tmp.AnAI-data\">\n      \n",
     "comments": "",
     "outputs": 1,
-    "x": 758.5313873291016,
-    "y": 613.2851915359497,
-    "z": "28e3f0b9.24cf2",
+    "x": 821.5040435791016,
+    "y": 648.2539405822754,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "edc9287a.cc5518",
-        "5b0f29d9.42a638"
+        "7a3e9a9e.b5ebe4",
+        "beceadfe.18cd7"
       ]
     ]
   },
   {
-    "id": "a1fba96c.417d58",
+    "id": "1272bfc5.9264a",
     "type": "switchNode",
     "name": "switch temp-ub-sub-account-id",
     "xml": "<switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1170.531478881836,
-    "y": 578.0352725982666,
-    "z": "28e3f0b9.24cf2",
+    "x": 1233.504135131836,
+    "y": 613.0040216445923,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "e5d2c50b.cba8f8",
-        "21c5a234.6190ae"
+        "89f0974b.4d94b8",
+        "b024d53.775b128"
       ]
     ]
   },
   {
-    "id": "e5d2c50b.cba8f8",
+    "id": "89f0974b.4d94b8",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1363.2459297180176,
-    "y": 552.0353136062622,
-    "z": "28e3f0b9.24cf2",
+    "x": 1426.2185859680176,
+    "y": 587.0040626525879,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "f0651115.93559"
+        "13ebb7af.038dc8"
       ]
     ]
   },
   {
-    "id": "21c5a234.6190ae",
+    "id": "b024d53.775b128",
     "type": "other",
     "name": "Other",
     "xml": "<outcome value='Other'>",
     "comments": "",
     "outputs": 1,
-    "x": 1363.531494140625,
-    "y": 607.0352764129639,
-    "z": "28e3f0b9.24cf2",
+    "x": 1426.504150390625,
+    "y": 642.0040254592896,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "867c2305.719d4"
+        "fbfaef01.8c56a"
       ]
     ]
   },
   {
-    "id": "867c2305.719d4",
+    "id": "fbfaef01.8c56a",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />\n",
     "comments": "",
-    "x": 1519.5316696166992,
-    "y": 665.0351943969727,
-    "z": "28e3f0b9.24cf2",
+    "x": 1582.5043258666992,
+    "y": 700.0039434432983,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "f0651115.93559",
+    "id": "13ebb7af.038dc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1501.2812385559082,
-    "y": 553.7851538658142,
-    "z": "28e3f0b9.24cf2",
+    "x": 1564.2538948059082,
+    "y": 588.7539029121399,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "369b1850.33da28",
-        "6de36f9a.0a191",
-        "1299a0cc.66391f",
-        "8cc3c364.b95fb",
-        "c1785bc5.472658"
+        "4e788339.2d713c",
+        "a323c09d.a8718",
+        "93da7d77.20b82",
+        "fa0331db.90ed7",
+        "b9f4426f.77ac"
       ]
     ]
   },
   {
-    "id": "8cc3c364.b95fb",
+    "id": "fa0331db.90ed7",
     "type": "set",
     "name": "set prop.customer-id",
     "xml": "<set>\n<parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />\n",
     "comments": "",
-    "x": 1716.7815170288086,
-    "y": 490.78530991077423,
-    "z": "28e3f0b9.24cf2",
+    "x": 1776.7542114257812,
+    "y": 525.7540578842163,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "369b1850.33da28",
+    "id": "4e788339.2d713c",
     "type": "execute",
     "name": "execute RestApiCallNode Create tenant",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-tenant.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1774.78125,
-    "y": 567.785163551569,
-    "z": "28e3f0b9.24cf2",
+    "x": 1837.75390625,
+    "y": 602.7539125978947,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "6de36f9a.0a191",
+    "id": "a323c09d.a8718",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />\n",
     "comments": "",
-    "x": 1724.7814826965332,
-    "y": 619.785234451294,
-    "z": "28e3f0b9.24cf2",
+    "x": 1787.7541389465332,
+    "y": 654.7539834976196,
+    "z": "8dba42d4.2fc58",
     "wires": []
   },
   {
-    "id": "1299a0cc.66391f",
+    "id": "93da7d77.20b82",
     "type": "execute",
     "name": "execute RestApiCallNode Create tenant auth",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenanats/authorization/' + $prop.tenant-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"tenant-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1792.281478881836,
-    "y": 655.535234451294,
-    "z": "28e3f0b9.24cf2",
+    "x": 1855.254135131836,
+    "y": 690.5039834976196,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "c1785bc5.472658",
+    "id": "b9f4426f.77ac",
     "type": "get-resource",
     "name": "save-resource customer-id in service-subscription",
     "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-subscription\" \n        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type \n        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>\n<parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1794.7813568115234,
-    "y": 528.7853126525879,
-    "z": "28e3f0b9.24cf2",
+    "x": 1857.7540130615234,
+    "y": 563.7540616989136,
+    "z": "8dba42d4.2fc58",
     "wires": [
       []
     ]
   },
   {
-    "id": "edc9287a.cc5518",
+    "id": "7a3e9a9e.b5ebe4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 969.03125,
-    "y": 586.03125,
-    "z": "28e3f0b9.24cf2",
+    "x": 1032.00390625,
+    "y": 620.9999990463257,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "a1fba96c.417d58"
+        "1272bfc5.9264a"
       ]
     ]
   },
   {
-    "id": "5b0f29d9.42a638",
+    "id": "beceadfe.18cd7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 961.28125,
-    "y": 639.6741333007812,
-    "z": "28e3f0b9.24cf2",
+    "x": 1024.25390625,
+    "y": 674.6428823471069,
+    "z": "8dba42d4.2fc58",
     "wires": [
       [
-        "406169f1.4046c8"
+        "e7f65c34.ba5cc"
       ]
     ]
   },
   {
-    "id": "406169f1.4046c8",
+    "id": "e7f65c34.ba5cc",
     "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=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 1114.03125,
-    "y": 639.4241943359375,
-    "z": "28e3f0b9.24cf2",
+    "x": 1177.00390625,
+    "y": 674.3929433822632,
+    "z": "8dba42d4.2fc58",
+    "wires": []
+  },
+  {
+    "id": "d5289859.e9ecf8",
+    "type": "set",
+    "name": "set  vpn-id to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />",
+    "comments": "",
+    "x": 801.5039825439453,
+    "y": 980.5039672851562,
+    "z": "8dba42d4.2fc58",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
index 898d4c67..b7276f20 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "688d11a7.db457",
+    "id": "e738f63f.208ea8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119.00390625,
-    "y": 85.28888085437939,
-    "z": "60d023c5.cabe1c",
+    "x": 87.00390625,
+    "y": 55.857561140786856,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "e1d5eba9.a13628"
+        "80341a9d.8eb738"
       ]
     ]
   },
   {
-    "id": "e1d5eba9.a13628",
+    "id": "80341a9d.8eb738",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,458 +22,458 @@
     "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": 373.50390625,
-    "y": 85.28888085437939,
-    "z": "60d023c5.cabe1c",
+    "x": 341.50390625,
+    "y": 55.857561140786856,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "d4ccfb4f.558f18"
+        "5110d08c.83594"
       ]
     ]
   },
   {
-    "id": "d4ccfb4f.558f18",
+    "id": "5110d08c.83594",
     "type": "method",
     "name": "sdwan-network-topology-operation-create",
     "xml": "<method rpc='sdwan-network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 372.50390625,
-    "y": 185.28888085437939,
-    "z": "60d023c5.cabe1c",
+    "x": 340.50390625,
+    "y": 155.85756114078686,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "6f5dfed8.385d3"
+        "a22e3b13.76c488"
       ]
     ]
   },
   {
-    "id": "6f5dfed8.385d3",
+    "id": "a22e3b13.76c488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 512.50390625,
-    "y": 285.2888808543794,
-    "z": "60d023c5.cabe1c",
+    "x": 480.50390625,
+    "y": 255.85756114078686,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "122df2f8.6d274d",
-        "a575c3fa.61f11",
-        "922e69e7.a3d7a8",
-        "5d7736de.4069b8",
-        "27cb2b03.b23a84",
-        "47c22ea2.aab27",
-        "8f02d925.52aa28",
-        "eec5382a.01c068",
-        "6cba311b.177c7",
-        "aba522ee.20d06",
-        "6bb7e42.0db951c"
+        "f691075.4d857f8",
+        "cb88cbb7.42bd98",
+        "8ba6b398.46ed6",
+        "346ae50a.91fcda",
+        "9b181769.a4b628",
+        "e7358faf.a402d",
+        "dbb7121b.abe6a",
+        "fdf26bca.f03768",
+        "a7873db9.8b28e",
+        "d8cec38f.bc599",
+        "74be5192.2ede4"
       ]
     ]
   },
   {
-    "id": "122df2f8.6d274d",
+    "id": "f691075.4d857f8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 942.5039176940918,
-    "y": 103.06663277698681,
-    "z": "60d023c5.cabe1c",
+    "x": 910.5039176940918,
+    "y": 73.63531306339428,
+    "z": "d1658b32.d98238",
     "wires": [
       []
     ]
   },
   {
-    "id": "a575c3fa.61f11",
+    "id": "cb88cbb7.42bd98",
     "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=\"sdwan-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SDWAN-Config\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 736.0595626831055,
-    "y": 280.5110926628113,
-    "z": "60d023c5.cabe1c",
+    "x": 704.0595626831055,
+    "y": 251.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": [
       []
     ]
   },
   {
-    "id": "922e69e7.a3d7a8",
+    "id": "8ba6b398.46ed6",
     "type": "execute",
     "name": "execute generate prop.sdwan.network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sdwan.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 838.5039138793945,
-    "y": 147.06663513183594,
-    "z": "60d023c5.cabe1c",
+    "x": 806.5039138793945,
+    "y": 117.63531541824341,
+    "z": "d1658b32.d98238",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d7736de.4069b8",
+    "id": "346ae50a.91fcda",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 827.0595626831055,
-    "y": 240.51109266281128,
-    "z": "60d023c5.cabe1c",
+    "x": 795.0595626831055,
+    "y": 211.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "18f092a5.32926d",
-        "30abb8ec.b5d758"
+        "5636a9a3.7efe68",
+        "b63f0739.980f28"
       ]
     ]
   },
   {
-    "id": "18f092a5.32926d",
+    "id": "5636a9a3.7efe68",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1056.0595626831055,
-    "y": 220.51109266281128,
-    "z": "60d023c5.cabe1c",
+    "x": 1024.0595626831055,
+    "y": 191.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "6b96ad21.6fe954"
+        "c36e2515.dba218"
       ]
     ]
   },
   {
-    "id": "30abb8ec.b5d758",
+    "id": "b63f0739.980f28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1056.0595626831055,
-    "y": 260.5110926628113,
-    "z": "60d023c5.cabe1c",
+    "x": 1024.0595626831055,
+    "y": 231.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "9b1eb0f3.03df9"
+        "75983c07.a5a874"
       ]
     ]
   },
   {
-    "id": "6b96ad21.6fe954",
+    "id": "c36e2515.dba218",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1198.5595626831055,
-    "y": 220.51109266281128,
-    "z": "60d023c5.cabe1c",
+    "x": 1166.5595626831055,
+    "y": 191.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "144f1430.6e2a2c",
+    "id": "99e46d9c.cb058",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1332.1150817871094,
-    "y": 222.06670236587524,
-    "z": "60d023c5.cabe1c",
+    "x": 1300.1150817871094,
+    "y": 192.63538265228271,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "27cb2b03.b23a84",
+    "id": "9b181769.a4b628",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sdwan.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": 797.5595626831055,
-    "y": 320.5110926628113,
-    "z": "60d023c5.cabe1c",
+    "x": 765.5595626831055,
+    "y": 291.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "47c22ea2.aab27",
+    "id": "e7358faf.a402d",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.sdwan.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.sdwan.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 833.0595626831055,
-    "y": 360.5110926628113,
-    "z": "60d023c5.cabe1c",
+    "x": 801.0595626831055,
+    "y": 331.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "8f02d925.52aa28",
+    "id": "dbb7121b.abe6a",
     "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": 757.7264022827148,
-    "y": 530.1778182983398,
-    "z": "60d023c5.cabe1c",
+    "x": 725.7264022827148,
+    "y": 500.7464985847473,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "eec5382a.01c068",
+    "id": "fdf26bca.f03768",
     "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": 804.5595626831055,
-    "y": 400.5110926628113,
-    "z": "60d023c5.cabe1c",
+    "x": 772.5595626831055,
+    "y": 371.07977294921875,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "97c23cb8.cc8d8",
+    "id": "713ce360.f628ac",
     "type": "for",
     "name": "for each existing network",
     "xml": "<for index='idx' start='0' end='`$nidx`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1201.5436248779297,
-    "y": 365.28884455608204,
-    "z": "60d023c5.cabe1c",
+    "x": 1169.5436248779297,
+    "y": 335.8575248424895,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "30c4fff.3f577"
+        "eb4807cf.0d23d8"
       ]
     ]
   },
   {
-    "id": "9b1eb0f3.03df9",
+    "id": "75983c07.a5a874",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1200.4166069030762,
-    "y": 260.4476046562195,
-    "z": "60d023c5.cabe1c",
+    "x": 1168.4166069030762,
+    "y": 231.01628494262695,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "97c23cb8.cc8d8",
-        "144f1430.6e2a2c"
+        "713ce360.f628ac",
+        "99e46d9c.cb058"
       ]
     ]
   },
   {
-    "id": "30c4fff.3f577",
+    "id": "eb4807cf.0d23d8",
     "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": 1476.829345703125,
-    "y": 364.8603472416289,
-    "z": "60d023c5.cabe1c",
+    "x": 1444.829345703125,
+    "y": 335.4290275280364,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "d2ce2b28.5e29e8"
+        "ad204630.0981b8"
       ]
     ]
   },
   {
-    "id": "d2ce2b28.5e29e8",
+    "id": "ad204630.0981b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1377.5595436096191,
-    "y": 423.43177840160206,
-    "z": "60d023c5.cabe1c",
+    "x": 1345.5595436096191,
+    "y": 394.00045868800953,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "f1e681ab.ee1c1"
+        "5de29638.c9b308"
       ]
     ]
   },
   {
-    "id": "5f52499a.1b3a58",
+    "id": "e4848432.b300d8",
     "type": "comment",
     "name": "make sure this network doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1425.1943550109863,
-    "y": 323.5429019634612,
-    "z": "60d023c5.cabe1c",
+    "x": 1393.1943550109863,
+    "y": 294.11158224986866,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "f1e681ab.ee1c1",
+    "id": "5de29638.c9b308",
     "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": 1525.3096466064453,
-    "y": 423.28897047042847,
-    "z": "60d023c5.cabe1c",
+    "x": 1493.3096466064453,
+    "y": 393.85765075683594,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "3715a6c8.5b9a7a",
+    "id": "3a8170a.8edea9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1491.961139678955,
-    "y": 193.06668996810913,
-    "z": "60d023c5.cabe1c",
+    "x": 1459.961139678955,
+    "y": 163.6353702545166,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "e8cbf5d3.3c9d38",
-        "54012a96.723714"
+        "5e4af687.3413b8",
+        "267dff81.9df9a"
       ]
     ]
   },
   {
-    "id": "e8cbf5d3.3c9d38",
+    "id": "5e4af687.3413b8",
     "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": 1680.1829833984375,
-    "y": 175.39999413490295,
-    "z": "60d023c5.cabe1c",
+    "x": 1648.1829833984375,
+    "y": 145.96867442131042,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "f228e37d.0f2a2"
+        "e9584cec.7c047"
       ]
     ]
   },
   {
-    "id": "f228e37d.0f2a2",
+    "id": "e9584cec.7c047",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1867.1829833984375,
-    "y": 171.39999413490295,
-    "z": "60d023c5.cabe1c",
+    "x": 1835.1829833984375,
+    "y": 141.96867442131042,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "7c1c28e6.2d07b8"
+        "4f9d1895.e6c898"
       ]
     ]
   },
   {
-    "id": "7c1c28e6.2d07b8",
+    "id": "4f9d1895.e6c898",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2017.1831130981445,
-    "y": 170.00000071525574,
-    "z": "60d023c5.cabe1c",
+    "x": 1985.1831130981445,
+    "y": 140.5686810016632,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "54012a96.723714",
+    "id": "267dff81.9df9a",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1691.0226440429688,
-    "y": 215.39999222755432,
-    "z": "60d023c5.cabe1c",
+    "x": 1659.0226440429688,
+    "y": 185.9686725139618,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "e98b9c1d.e4ed8"
+        "a3ecb652.b268e8"
       ]
     ]
   },
   {
-    "id": "e98b9c1d.e4ed8",
+    "id": "a3ecb652.b268e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1861.0226440429688,
-    "y": 211.39999222755432,
-    "z": "60d023c5.cabe1c",
+    "x": 1829.0226440429688,
+    "y": 181.9686725139618,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "dbc89ad1.a2ed48"
+        "5ddbd0bc.06582"
       ]
     ]
   },
   {
-    "id": "dbc89ad1.a2ed48",
+    "id": "5ddbd0bc.06582",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2048.3560848236084,
-    "y": 209.8611490726471,
-    "z": "60d023c5.cabe1c",
+    "x": 2016.3560848236084,
+    "y": 180.42982935905457,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "6cba311b.177c7",
+    "id": "a7873db9.8b28e",
     "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": 829.7383041381836,
-    "y": 190.8444209098816,
-    "z": "60d023c5.cabe1c",
+    "x": 797.7383041381836,
+    "y": 161.41310119628906,
+    "z": "d1658b32.d98238",
     "wires": [
       [
-        "3715a6c8.5b9a7a"
+        "3a8170a.8edea9"
       ]
     ]
   },
   {
-    "id": "35a9ce0f.ae54c2",
+    "id": "3a427aaa.1513f6",
     "type": "comment",
     "name": "TODO: Recheck AAI schemas",
     "info": "",
     "comments": "",
-    "x": 801.0351867675781,
-    "y": 49.43131971359253,
-    "z": "60d023c5.cabe1c",
+    "x": 769.0351867675781,
+    "y": 20,
+    "z": "d1658b32.d98238",
     "wires": []
   },
   {
-    "id": "aba522ee.20d06",
+    "id": "d8cec38f.bc599",
     "type": "save",
     "name": "save sdwan vpn resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.id = $prop.sdwan.network-id' >\n<parameter name='id' value='`$prop.sdwan.network-id`' />\n<parameter name='name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\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='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sdwan.network-id  + '/network-data/'` \" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $prop.sdwan.network-id' >\n<parameter name='sdwan-vpn-id' value='`$prop.sdwan.network-id`' />\n<parameter name='sdwan-vpn-name' value='`$prop.name`' />\n<parameter name='topology' value='`$prop.topology`' />\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='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sdwan.network-id  + '/network-data/'` \" />",
     "comments": "",
     "outputs": 1,
-    "x": 814.0038986206055,
-    "y": 440.0039348602295,
-    "z": "60d023c5.cabe1c",
+    "x": 782.0038986206055,
+    "y": 410.57261514663696,
+    "z": "d1658b32.d98238",
     "wires": [
       []
     ]
   },
   {
-    "id": "6bb7e42.0db951c",
+    "id": "74be5192.2ede4",
     "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=\"sdwan-vpn\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/sdwan-vpns/sdwan-vpn/' + $prop.sdwan.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"sdwan-vpn.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sdwan.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 810.00390625,
-    "y": 487.00390625,
-    "z": "60d023c5.cabe1c",
+    "x": 778.00390625,
+    "y": 457.57258653640747,
+    "z": "d1658b32.d98238",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
index 9c84f2d7..547ed010 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "793dbdb3.de8be4",
+    "id": "2cfde233.a1cf6e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 95.00390625,
-    "y": 45.00390625,
-    "z": "c3c952bc.05e95",
+    "x": 103.00390625,
+    "y": 35.003907203674316,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "3a91b25b.2f4cce"
+        "3b2e232c.fd060c"
       ]
     ]
   },
   {
-    "id": "3a91b25b.2f4cce",
+    "id": "3b2e232c.fd060c",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,562 +22,562 @@
     "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": 281.00391006469727,
-    "y": 117.0039234161377,
-    "z": "c3c952bc.05e95",
+    "x": 265.00391006469727,
+    "y": 107.0039234161377,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "eca97066.caaf3"
+        "a53b2fce.2a65f"
       ]
     ]
   },
   {
-    "id": "eca97066.caaf3",
+    "id": "a53b2fce.2a65f",
     "type": "method",
     "name": "method sdwan-network-topology-operation-deactivate",
     "xml": "<method rpc='sdwan-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 269.0040283203125,
-    "y": 205.00390625,
-    "z": "c3c952bc.05e95",
+    "x": 253.0040283203125,
+    "y": 195.00390625,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "4de7b297.7c56ec"
+        "663d77f7.214e28"
       ]
     ]
   },
   {
-    "id": "4de7b297.7c56ec",
+    "id": "663d77f7.214e28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 443.00392150878906,
-    "y": 313.0039653778076,
-    "z": "c3c952bc.05e95",
+    "x": 427.00392150878906,
+    "y": 303.0039653778076,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "b335849f.1ecf78",
-        "4b508beb.3a8574",
-        "49f08c5d.a4c334",
-        "c621318b.d31c",
-        "335b7a74.877be6",
-        "cf0d2147.3c1a7",
-        "fc2f3bed.6dcf68",
-        "6ed3cf6a.44f1b",
-        "2cf71503.16f17a",
-        "69c0586.74e3ea8",
-        "bd5c4a5d.9d8378",
-        "6cc3df01.2a98a",
-        "b06c361a.4ff338"
+        "b928d5a5.e0ad38",
+        "4e2c1ff0.9578e",
+        "f4a9e349.c682f",
+        "23c4ff52.00447",
+        "77ecaa70.6d0df4",
+        "2ea7cfac.fbbe5",
+        "15a8b2bc.455b8d",
+        "b657cd65.d8e7b",
+        "e4693af9.dc3458",
+        "c69b48c1.cce2a8",
+        "992bd0be.f4511",
+        "565518bc.dd3838",
+        "5cca3c72.23bd74"
       ]
     ]
   },
   {
-    "id": "b335849f.1ecf78",
+    "id": "b928d5a5.e0ad38",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 901.3928070068359,
-    "y": 62.00390625,
-    "z": "c3c952bc.05e95",
+    "x": 885.3928070068359,
+    "y": 52.00390625,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b508beb.3a8574",
+    "id": "4e2c1ff0.9578e",
     "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=\"sdwan-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Deactivate\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 701.5595054626465,
-    "y": 115.78175926208496,
-    "z": "c3c952bc.05e95",
+    "x": 685.5595054626465,
+    "y": 105.78175926208496,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
   },
   {
-    "id": "49f08c5d.a4c334",
+    "id": "f4a9e349.c682f",
     "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": 793.5597496032715,
-    "y": 742.3173627853394,
-    "z": "c3c952bc.05e95",
+    "x": 777.5597496032715,
+    "y": 732.3173627853394,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "c621318b.d31c",
+    "id": "23c4ff52.00447",
     "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": 715.3375511169434,
-    "y": 931.8727827072144,
-    "z": "c3c952bc.05e95",
+    "x": 699.3375511169434,
+    "y": 921.8727827072144,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "335b7a74.877be6",
+    "id": "77ecaa70.6d0df4",
     "type": "set",
     "name": "set network-level-oper-status",
     "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": 760.4486656188965,
-    "y": 803.5395374298096,
-    "z": "c3c952bc.05e95",
+    "x": 744.4486656188965,
+    "y": 793.5395374298096,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "cf0d2147.3c1a7",
+    "id": "2ea7cfac.fbbe5",
     "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": 733.8616104125977,
-    "y": 168.78179550170898,
-    "z": "c3c952bc.05e95",
+    "x": 717.8616104125977,
+    "y": 158.78179550170898,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc2f3bed.6dcf68",
+    "id": "15a8b2bc.455b8d",
     "type": "set",
     "name": "set network in service-data",
     "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": 754.004280090332,
-    "y": 689.095196723938,
-    "z": "c3c952bc.05e95",
+    "x": 738.004280090332,
+    "y": 679.095196723938,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "6ed3cf6a.44f1b",
+    "id": "b657cd65.d8e7b",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 786.00390625,
-    "y": 239.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 770.00390625,
+    "y": 229.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "8e8065b6.1084e8"
+        "630ca78d.27ae88"
       ]
     ]
   },
   {
-    "id": "8e8065b6.1084e8",
+    "id": "630ca78d.27ae88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1042.8373374938965,
-    "y": 173.34116491675377,
-    "z": "c3c952bc.05e95",
+    "x": 1026.8373374938965,
+    "y": 163.34116491675377,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "db93bdb.d26bf4",
-        "ac2e8139.951b",
-        "1e600efe.efd971",
-        "d6b3741d.b12d48"
+        "3612556b.bbed1a",
+        "c60af583.51da48",
+        "a8faff93.c15f9",
+        "3a3baf52.54ed7"
       ]
     ]
   },
   {
-    "id": "db93bdb.d26bf4",
+    "id": "3612556b.bbed1a",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1264.837417602539,
-    "y": 63.34119987487793,
-    "z": "c3c952bc.05e95",
+    "x": 1248.837417602539,
+    "y": 53.34119987487793,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "c5296581.642598"
+        "8c14fd7b.27081"
       ]
     ]
   },
   {
-    "id": "c5296581.642598",
+    "id": "8c14fd7b.27081",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1438.8375434875488,
-    "y": 63.341203689575195,
-    "z": "c3c952bc.05e95",
+    "x": 1422.8375434875488,
+    "y": 53.341203689575195,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "209fc8ff.4a3e38"
+        "f4242145.e0099"
       ]
     ]
   },
   {
-    "id": "209fc8ff.4a3e38",
+    "id": "f4242145.e0099",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1601.8374290466309,
-    "y": 62.94119834899902,
-    "z": "c3c952bc.05e95",
+    "x": 1585.8374290466309,
+    "y": 52.94119834899902,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "2cf71503.16f17a",
+    "id": "e4693af9.dc3458",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 780.00390625,
-    "y": 348.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 764.00390625,
+    "y": 338.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "fc6c7998.f0e088",
-        "27566cb3.03e2a4",
-        "235c43b0.c60f6c"
+        "fdb52017.6dec1",
+        "5ded5567.77825c",
+        "2c94536.83be9ac"
       ]
     ]
   },
   {
-    "id": "fc6c7998.f0e088",
+    "id": "fdb52017.6dec1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1025.00390625,
-    "y": 294.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 1009.00390625,
+    "y": 284.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "37902c28.eb9774"
+        "2b35b6e5.d07f8a"
       ]
     ]
   },
   {
-    "id": "27566cb3.03e2a4",
+    "id": "5ded5567.77825c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1028.494873046875,
-    "y": 341.5818494260311,
-    "z": "c3c952bc.05e95",
+    "x": 1012.494873046875,
+    "y": 331.5818494260311,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "bebdf762.3c5628"
+        "8424b2a8.48b9d"
       ]
     ]
   },
   {
-    "id": "235c43b0.c60f6c",
+    "id": "2c94536.83be9ac",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1023.827880859375,
-    "y": 382.91516241431236,
-    "z": "c3c952bc.05e95",
+    "x": 1007.827880859375,
+    "y": 372.91516241431236,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "851cb606.194f18"
+        "ab7ddb5c.582b78"
       ]
     ]
   },
   {
-    "id": "37902c28.eb9774",
+    "id": "2b35b6e5.d07f8a",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1222.5039672851562,
-    "y": 282.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 1206.5039672851562,
+    "y": 272.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "bebdf762.3c5628",
+    "id": "8424b2a8.48b9d",
     "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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1205.0662841796875,
-    "y": 329.8675855100155,
-    "z": "c3c952bc.05e95",
+    "x": 1189.0662841796875,
+    "y": 319.8675855100155,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "851cb606.194f18",
+    "id": "ab7ddb5c.582b78",
     "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1211.6004371643066,
-    "y": 378.354355186224,
-    "z": "c3c952bc.05e95",
+    "x": 1195.6004371643066,
+    "y": 368.354355186224,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "69c0586.74e3ea8",
+    "id": "c69b48c1.cce2a8",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 788.00390625,
-    "y": 459.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 772.00390625,
+    "y": 449.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "96f3aa2e.c54988",
-        "cae8eff.6ac8b1"
+        "ce7c1b67.661578",
+        "8a934505.8ec3a8"
       ]
     ]
   },
   {
-    "id": "96f3aa2e.c54988",
+    "id": "ce7c1b67.661578",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1023.00390625,
-    "y": 437.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 1007.00390625,
+    "y": 427.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "91d847c8.f3fc48"
+        "aa6da81f.8e3f18"
       ]
     ]
   },
   {
-    "id": "cae8eff.6ac8b1",
+    "id": "8a934505.8ec3a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1015.25390625,
-    "y": 490.6506970822811,
-    "z": "c3c952bc.05e95",
+    "x": 999.25390625,
+    "y": 480.6506970822811,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "7d2fabee.7ea674"
+        "928c6b17.a04a28"
       ]
     ]
   },
   {
-    "id": "91d847c8.f3fc48",
+    "id": "aa6da81f.8e3f18",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1177.00390625,
-    "y": 438.00781378149986,
-    "z": "c3c952bc.05e95",
+    "x": 1161.00390625,
+    "y": 428.00781378149986,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "7d2fabee.7ea674",
+    "id": "928c6b17.a04a28",
     "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=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 1168.00390625,
-    "y": 490.40075811743736,
-    "z": "c3c952bc.05e95",
+    "x": 1152.00390625,
+    "y": 480.40075811743736,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "ac2e8139.951b",
+    "id": "c60af583.51da48",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1270.253890991211,
-    "y": 106.00781416893005,
-    "z": "c3c952bc.05e95",
+    "x": 1254.253890991211,
+    "y": 96.00781416893005,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "1cd087e9.a0e8d8"
+        "6ea0ea88.c5d044"
       ]
     ]
   },
   {
-    "id": "1cd087e9.a0e8d8",
+    "id": "6ea0ea88.c5d044",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1444.2540168762207,
-    "y": 106.00781798362732,
-    "z": "c3c952bc.05e95",
+    "x": 1428.2540168762207,
+    "y": 96.00781798362732,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "4dc771ac.bec7e"
+        "230bc0ec.589fb"
       ]
     ]
   },
   {
-    "id": "4dc771ac.bec7e",
+    "id": "230bc0ec.589fb",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1607.2539024353027,
-    "y": 105.60781264305115,
-    "z": "c3c952bc.05e95",
+    "x": 1591.2539024353027,
+    "y": 95.60781264305115,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "bd5c4a5d.9d8378",
+    "id": "992bd0be.f4511",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-delete.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn/action/batch-delete'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 786.7539825439453,
-    "y": 626.0080223083496,
-    "z": "c3c952bc.05e95",
+    "x": 770.7539825439453,
+    "y": 616.0080223083496,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cc3df01.2a98a",
+    "id": "565518bc.dd3838",
     "type": "execute",
     "name": "execute RestApiCallNode delete vpn topology",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 816.2539978027344,
-    "y": 559.0079069137573,
-    "z": "c3c952bc.05e95",
+    "x": 800.2539978027344,
+    "y": 549.0079069137573,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e600efe.efd971",
+    "id": "a8faff93.c15f9",
     "type": "switchNode",
     "name": "switch vpn-id",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'vpn-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1264.5039691925049,
-    "y": 189.00390815734863,
-    "z": "c3c952bc.05e95",
+    "x": 1248.5039691925049,
+    "y": 179.00390815734863,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "c1d7d040.09f8"
+        "ae3a63c3.3c738"
       ]
     ]
   },
   {
-    "id": "c1d7d040.09f8",
+    "id": "ae3a63c3.3c738",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1446.5040016174316,
-    "y": 189.00390696525574,
-    "z": "c3c952bc.05e95",
+    "x": 1430.5040016174316,
+    "y": 179.00390696525574,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "c45b30c0.c02ff"
+        "4d67f5b4.fc8eec"
       ]
     ]
   },
   {
-    "id": "c45b30c0.c02ff",
+    "id": "4d67f5b4.fc8eec",
     "type": "set",
     "name": "set prop.vpn-id",
     "xml": "<set>\n<parameter name='prop.vpn-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1609.5038871765137,
-    "y": 188.60390162467957,
-    "z": "c3c952bc.05e95",
+    "x": 1593.5038871765137,
+    "y": 178.60390162467957,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "d6b3741d.b12d48",
+    "id": "3a3baf52.54ed7",
     "type": "switchNode",
     "name": "switch tenant-id",
     "xml": "<switch test=\"`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'tenant-id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1270.25390625,
-    "y": 232.00390625,
-    "z": "c3c952bc.05e95",
+    "x": 1254.25390625,
+    "y": 222.00390625,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "3b68a208.b06d0e"
+        "1a8e58aa.aa1b17"
       ]
     ]
   },
   {
-    "id": "3b68a208.b06d0e",
+    "id": "1a8e58aa.aa1b17",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1444.2540321350098,
-    "y": 232.00391006469727,
-    "z": "c3c952bc.05e95",
+    "x": 1428.2540321350098,
+    "y": 222.00391006469727,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       [
-        "61b35e07.ec39d"
+        "3b8512ac.291e5e"
       ]
     ]
   },
   {
-    "id": "61b35e07.ec39d",
+    "id": "3b8512ac.291e5e",
     "type": "set",
     "name": "set prop.tenant-id",
     "xml": "<set>\n<parameter name='prop.tenant-id' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1607.2539176940918,
-    "y": 231.6039047241211,
-    "z": "c3c952bc.05e95",
+    "x": 1591.2539176940918,
+    "y": 221.6039047241211,
+    "z": "57d2d3d6.9aa6fc",
     "wires": []
   },
   {
-    "id": "b06c361a.4ff338",
+    "id": "5cca3c72.23bd74",
     "type": "update",
     "name": "update SDWAN VPN status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >\n<parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
-    "x": 774.0039443969727,
-    "y": 870.5039930343628,
-    "z": "c3c952bc.05e95",
+    "x": 758.0039443969727,
+    "y": 860.5039930343628,
+    "z": "57d2d3d6.9aa6fc",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
index 735dc300..8e84a93f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "16434d54.ed2623",
+    "id": "557c0d2.e91edf4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119.00390625,
-    "y": 54.00390625,
-    "z": "e1197598.e19d88",
+    "x": 121.00390625,
+    "y": 50.00390625,
+    "z": "f08fa760.244488",
     "wires": [
       [
-        "2405c02a.b511b"
+        "93294ef3.ba70b"
       ]
     ]
   },
   {
-    "id": "2405c02a.b511b",
+    "id": "93294ef3.ba70b",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,136 +22,136 @@
     "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": 331.00391006469727,
-    "y": 126.0039234161377,
-    "z": "e1197598.e19d88",
+    "x": 333.00391006469727,
+    "y": 122.0039234161377,
+    "z": "f08fa760.244488",
     "wires": [
       [
-        "57a7aa96.552214"
+        "d7638881.bfb4c8"
       ]
     ]
   },
   {
-    "id": "57a7aa96.552214",
+    "id": "d7638881.bfb4c8",
     "type": "method",
     "name": "method sdwan-network-topology-operation-delete",
     "xml": "<method rpc='sdwan-network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 319.0040283203125,
-    "y": 214.00390625,
-    "z": "e1197598.e19d88",
+    "x": 321.0040283203125,
+    "y": 210.00390625,
+    "z": "f08fa760.244488",
     "wires": [
       [
-        "143b26be.1b4569"
+        "96e57ca9.97c2e"
       ]
     ]
   },
   {
-    "id": "143b26be.1b4569",
+    "id": "96e57ca9.97c2e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 489.44836044311523,
-    "y": 276.44836235046387,
-    "z": "e1197598.e19d88",
+    "x": 491.44836044311523,
+    "y": 272.44836235046387,
+    "z": "f08fa760.244488",
     "wires": [
       [
-        "562848d7.41e4c8",
-        "59bbd8d6.78d208",
-        "6c3e0fcd.7bef",
-        "358f6dc3.63de32",
-        "d740b485.fa2068",
-        "5120c39b.5dfdac",
-        "28dcbe3c.830122"
+        "3ea486fa.98e8fa",
+        "5a29219c.c419d",
+        "8d5f8731.51c938",
+        "40643a2d.08d114",
+        "24e3bcc2.2186b4",
+        "c8f5f5d0.be2858",
+        "cb920ad8.ed1188"
       ]
     ]
   },
   {
-    "id": "562848d7.41e4c8",
+    "id": "3ea486fa.98e8fa",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-sdwan-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 970.3928146362305,
-    "y": 71.00391006469727,
-    "z": "e1197598.e19d88",
+    "x": 972.3928146362305,
+    "y": 67.00391006469727,
+    "z": "f08fa760.244488",
     "wires": [
       []
     ]
   },
   {
-    "id": "59bbd8d6.78d208",
+    "id": "5a29219c.c419d",
     "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=\"sdwan-network-topology-operation-delete\"/>\n<parameter name=\"field3\" value=\"SDWAN-Delete\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 764.7816314697266,
-    "y": 137.33727836608887,
-    "z": "e1197598.e19d88",
+    "x": 766.7816314697266,
+    "y": 133.33727836608887,
+    "z": "f08fa760.244488",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c3e0fcd.7bef",
+    "id": "8d5f8731.51c938",
     "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='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
     "comments": "",
-    "x": 849.448314666748,
-    "y": 385.4281978607178,
-    "z": "e1197598.e19d88",
+    "x": 851.448314666748,
+    "y": 381.4281978607178,
+    "z": "f08fa760.244488",
     "wires": []
   },
   {
-    "id": "358f6dc3.63de32",
+    "id": "40643a2d.08d114",
     "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": 778.5595626831055,
-    "y": 448.9835858345032,
-    "z": "e1197598.e19d88",
+    "x": 780.5595626831055,
+    "y": 444.9835858345032,
+    "z": "f08fa760.244488",
     "wires": []
   },
   {
-    "id": "5120c39b.5dfdac",
+    "id": "c8f5f5d0.be2858",
     "type": "set",
     "name": "set new network length",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\n\t\n",
     "comments": "",
-    "x": 808.0809860229492,
-    "y": 262.89910793304443,
-    "z": "e1197598.e19d88",
+    "x": 810.0809860229492,
+    "y": 258.89910793304443,
+    "z": "f08fa760.244488",
     "wires": []
   },
   {
-    "id": "d740b485.fa2068",
+    "id": "24e3bcc2.2186b4",
     "type": "set",
     "name": "Remove networks from ServiceData",
     "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.nidx].\" value=\"\"/>\n\n",
     "comments": "",
-    "x": 848.7051429748535,
-    "y": 310.8670496940613,
-    "z": "e1197598.e19d88",
+    "x": 850.7051429748535,
+    "y": 306.8670496940613,
+    "z": "f08fa760.244488",
     "wires": []
   },
   {
-    "id": "28dcbe3c.830122",
+    "id": "cb920ad8.ed1188",
     "type": "delete",
     "name": "delete SDWAN VPNInstance connectivity in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='sdwan-vpn' \n        key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id'>\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='sdwan-vpn' \n        key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 886.6364860534668,
-    "y": 204.01019191741943,
-    "z": "e1197598.e19d88",
+    "x": 888.6364860534668,
+    "y": 200.01019191741943,
+    "z": "f08fa760.244488",
     "wires": [
       []
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
index 0534be5f..93cf8aee 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
@@ -119,7 +119,7 @@
     "id": "a27fb783.ef2f48",
     "type": "save",
     "name": "save deviceInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='device-id' value='`$deviceResp.success[0].id`' />\n<parameter name='operational-status' value='Active' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->\n<parameter name='operational-status' value='Active' />",
     "comments": "",
     "outputs": 1,
     "x": 708.6592712402344,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
index d94d34dc..b25adaf1 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
@@ -95,7 +95,7 @@
     "id": "bf289ee9.17eee",
     "type": "save",
     "name": "save deviceInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $prop.vnf-id' >\n<parameter name='id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.name`' />\n<parameter name='name' value=\"true\" />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.devcie-id = $prop.vnf-id' >\n<parameter name='devcie-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1111.5007019042969,
@@ -547,7 +547,7 @@
     "id": "593b4cfd.497904",
     "type": "save",
     "name": "update deviceInstance configuration in AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $prop.vnf-id' >\n<parameter name='id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.name`' />\n<parameter name='name' value=\"true\" />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vnf-id' >\n<parameter name='device-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
     "x": 1103.5312805175781,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
index fd716bcf..56aa38d2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
@@ -112,7 +112,7 @@
     "id": "86982181.80824",
     "type": "update",
     "name": "update SDWAN DeviceInstance status to AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='operational-status' value='PendingDelete' />",
     "comments": "",
     "outputs": 1,
     "x": 559.2344131469727,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
index 1077d8e2..1a71611e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
@@ -420,7 +420,7 @@
     "id": "7385dfef.35179",
     "type": "delete",
     "name": "delete wan port instance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='device' \n        key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='device' \n        key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
     "comments": "",
     "outputs": 1,
     "x": 1073.0003051757812,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
index a29f5c0c..cc7b1261 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
@@ -466,7 +466,7 @@
     "id": "a1d99b62.d31458",
     "type": "update",
     "name": "save SDWAN wan port instance configuration in AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"wan-port-config-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='Active' />\n<parameter name='device-port-id' value='`$prop.wan.devicePortId`' />\n<parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
     "comments": "",
     "outputs": 1,
     "x": 772.6575050354004,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
index ea2c70fb..7eb486a5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
@@ -90,7 +90,7 @@
     "id": "105b56f8.ca1c29",
     "type": "save",
     "name": "save sdwan device port configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.id = $prop.vnf-index' >\n<parameter name=\"id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAdddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $prop.vnf-index' >\n<parameter name=\"wan-port-config-id\" value=\"`$prop.vnf-index`\" />\n<parameter name=\"wan-port-config-name\" value=\"`$prop.wan.name`\" />\n<parameter name=\"device-id\" value=\"`$prop.wan.deviceName`\" />\n<parameter name='vlan-id' value=\"`$prop.wan.vlanId`\" />\n<parameter name=\"ip-address\" value=\"`$prop.wan.ipAdddress`\" />\n<parameter name=\"provider-ip-address\" value=\"`$prop.wan.providerIpAddress`\" />\n<parameter name=\"input-bandwidth\" value=\"`$prop.wan.inputBandwidth`\" />\n<parameter name=\"output-bandwidth\" value=\"`$prop.wan.outputBandwidth`\" />\n<parameter name=\"description\" value=\"`$prop.wan.description`\" />\n<parameter name=\"port-type\" value=\"`$prop.wan.portType`\" />\n<parameter name=\"port-number\" value=\"`$prop.wan.portNumber`\" />\n<parameter name=\"transport-network-name\" value=\"`$prop.wan.transportNetworkName`\" />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
     "x": 718.0042953491211,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
index 7d63cbe7..c941eb14 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
@@ -675,7 +675,7 @@
     "id": "a5d33dff.966b",
     "type": "update",
     "name": "save SDWAN wan port instance configuration in AAI",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name=\"id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' \n      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='wan-port-config-id' value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name='operational-status' value='PendingDelete' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
     "comments": "",
     "outputs": 1,
     "x": 796.0041923522949,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
index 97bbc00b..bf71f28b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
@@ -431,7 +431,7 @@
     "id": "96916512.691c98",
     "type": "delete",
     "name": "delete wan port instance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='wan-port-config' \n        key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='wan-port-config' \n        key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
     "comments": "",
     "outputs": 1,
     "x": 649.0001983642578,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
index 4f087f58..4a7ed514 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
@@ -786,7 +786,7 @@
     "id": "78b0ee0f.0865f",
     "type": "save",
     "name": "update siteInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />      \n<parameter name='generated-site-id' value='`$site-result.success[0].id`' /> \n<parameter name='operational-status' value='Active' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />      \n<parameter name='generated-site-id' value='`$site-result.success[0].id`' /> \n<parameter name='operational-status' value='Active' />\n",
     "comments": "",
     "outputs": 1,
     "x": 694.0040740966797,
@@ -940,7 +940,7 @@
     "id": "6cfee007.a751c",
     "type": "get-resource",
     "name": "get-resource control pts for sideId",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"site-resource\" \n\t\tkey=\"site-resource.name = $prop.controlPtId AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.controlPoints' local-only='false' >\n\n",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"site-resource\" \n\t\tkey=\"site-resource.site-resource-name = $prop.controlPtId AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.controlPoints' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
     "x": 1711.333595275879,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
index 286200cf..de7bc57b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
@@ -295,7 +295,7 @@
     "id": "671e4dac.744e44",
     "type": "save",
     "name": "save siteInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.id = $prop.vnf-index' >\n<parameter name='id' value='`$prop.vnf-index`' />      \n<parameter name='name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='prop.site.type' />\n<parameter name='role' value='prop.site.role' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $prop.vnf-index' >\n<parameter name='site-resource-id' value='`$prop.vnf-index`' />      \n<parameter name='site-resource-name' value='`$prop.site.name`' />\n<parameter name='description' value='`$prop.site.description`' />\n<parameter name='type' value='prop.site.type' />\n<parameter name='role' value='prop.site.role' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
     "x": 667.6707305908203,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
index 38cff210..6eca6072 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
@@ -845,7 +845,7 @@
     "id": "2ec82407.2cc83c",
     "type": "save",
     "name": "update siteInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />      \n<parameter name='operational-status' value='PendingDelete' />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' \n      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />      \n<parameter name='operational-status' value='PendingDelete' />\n",
     "comments": "",
     "outputs": 1,
     "x": 663.8571701049805,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
index 0426b674..463dc7f2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
@@ -406,7 +406,7 @@
     "id": "372cbde7.587372",
     "type": "delete",
     "name": "delete site instance configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
     "comments": "",
     "outputs": 1,
     "x": 606.4265480041504,
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index 30e20974..07cd7181 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -34,7 +34,7 @@
             </for>

             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND 

+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 

 		     depth = '1'"

         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >

                 <outcome value='success'>

@@ -179,9 +179,8 @@
                     <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                 </execute>

                 <set>

-                    <!--parameter name='prop.vpn-id' value='`$vpn-result.id`' /><parameter name='prop.vpn1Id' value='`$vpn-result.id`' /-->

-                    <parameter name='prop.vpn-id' value='10' />

-                    <parameter name='prop.vpn1Id' value='10' />

+                    <parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />

+                    <parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />

                 </set>

                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology.json'`" />

@@ -201,9 +200,12 @@
             <set>

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].name' value='vpn-id' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].value' value='`$prop.vpn-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 2`' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

+            </set>

+            <set>

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />

+                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

             </set>

             <set>

                 <parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />

@@ -221,10 +223,10 @@
                 <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='sdwan-vpn' 

-      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >

-                <parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />

+      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />

                 <parameter name='operational-status' value='Active' />

-                <parameter name='tenanatId' value='`$prop.tenant-id`' />

+                <parameter name='tenanat-id' value='`$prop.tenant-id`' />

                 <parameter name='vpn-id' value='`$prop.vpn-id`' />

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
index 73ba3bcf..70500ccf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
@@ -75,9 +75,9 @@
                 <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='sdwan-vpn' 

-      key='sdwan-vpn.id = $prop.sdwan.network-id' >

-                <parameter name='id' value='`$prop.sdwan.network-id`' />

-                <parameter name='name' value='`$prop.name`' />

+      key='sdwan-vpn.sdwan-vpn-id = $prop.sdwan.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$prop.sdwan.network-id`' />

+                <parameter name='sdwan-vpn-name' value='`$prop.name`' />

                 <parameter name='topology' value='`$prop.topology`' />

                 <parameter name='operational-status' value='Created' />

                 <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
index 19c027db..162385ab 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
@@ -48,7 +48,7 @@
             </for>

             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND 

+		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 

 		     depth = '1'"

         pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >

                 <outcome value='success'>

@@ -139,8 +139,8 @@
                 <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='sdwan-vpn' 

-      key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id' >

-                <parameter name='id' value='`$network-topology-operation-input.network-information.network-id`' />

+      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >

+                <parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
index 8363b688..afd579de 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
@@ -11,7 +11,7 @@
                 <parameter name="field3" value="SDWAN-Delete"/>

             </record>

             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='sdwan-vpn' 

-        key='sdwan-vpn.id = $network-topology-operation-input.network-information.network-id'></delete>

+        key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id'></delete>

             <set>

                 <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`"/>

             </set>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
index 5402ccdb..1f17ef4a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
@@ -133,9 +133,9 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

-      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

-                <parameter name='device-id' value='`$deviceResp.success[0].id`' />

+      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+                <!--parameter name='device-id' value='`$deviceResp.success[0].id`' /-->

                 <parameter name='operational-status' value='Active' />

             </save>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
index 648ca3a4..cba46ed5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
@@ -107,10 +107,10 @@
             <switch test='`$prop.sdncCreate`'>

                 <outcome value='true'>

                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

-      key='device.id = $prop.vnf-id' >

-                        <parameter name='id' value='`$prop.vnf-id`' />

-                        <parameter name='esn' value='`$prop.device.name`' />

-                        <parameter name='name' value="true" />

+      key='device.devcie-id = $prop.vnf-id' >

+                        <parameter name='devcie-id' value='`$prop.vnf-id`' />

+                        <parameter name='esn' value='`$prop.device.esn`' />

+                        <parameter name='device-name' value='`$prop.device.name`' />

                         <parameter name='description' value='`$prop.device.description`' />

                         <parameter name='vendor' value='`$prop.device.vendor`' />

                         <parameter name='class' value='`$prop.device.class`' />

@@ -126,10 +126,10 @@
                 </outcome>

                 <outcome value='false'>

                     <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

-      key='device.id = $prop.vnf-id' >

-                        <parameter name='id' value='`$prop.vnf-id`' />

-                        <parameter name='esn' value='`$prop.device.name`' />

-                        <parameter name='name' value="true" />

+      key='device.device-id = $prop.vnf-id' >

+                        <parameter name='device-id' value='`$prop.vnf-id`' />

+                        <parameter name='esn' value='`$prop.device.esn`' />

+                        <parameter name='device-name' value='`$prop.device.name`' />

                         <parameter name='description' value='`$prop.device.description`' />

                         <parameter name='vendor' value='`$prop.device.vendor`' />

                         <parameter name='class' value='`$prop.device.class`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
index 830cc46a..7e88cf90 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
@@ -127,8 +127,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' 

-      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='device-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </update>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
index 23cfb025..de29db48 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
@@ -104,7 +104,7 @@
             <switch test="`$prop.device.sdncCreate`">

                 <outcome value='true'>

                     <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='device' 

-        key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

+        key='device.device-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

                 </outcome>

             </switch>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
index 3879fdc1..e6293ad4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
@@ -323,8 +323,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name="id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

+      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name="wan-port-config-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

                 <parameter name='operational-status' value='Active' />

                 <parameter name='device-port-id' value='`$prop.wan.devicePortId`' />

                 <parameter name='wan-port-id' value='`$prop.wan.wanPortId`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
index cf209c08..064236dc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
@@ -75,9 +75,9 @@
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` " />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $prop.vnf-index' >

-                <parameter name="id" value="`$prop.vnf-index`" />

-                <parameter name="name" value="`$prop.wan.name`" />

+      key='wan-port-config.wan-port-config-id = $prop.vnf-index' >

+                <parameter name="wan-port-config-id" value="`$prop.vnf-index`" />

+                <parameter name="wan-port-config-name" value="`$prop.wan.name`" />

                 <parameter name="device-id" value="`$prop.wan.deviceName`" />

                 <parameter name='vlan-id' value="`$prop.wan.vlanId`" />

                 <parameter name="ip-address" value="`$prop.wan.ipAdddress`" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
index 7a7c22e3..ce57e786 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
@@ -169,8 +169,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='wan-port-config' 

-      key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name="id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

+      key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='wan-port-config-id' value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />

                 <parameter name='operational-status' value='PendingDelete' />

                 <parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />

                 <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
index e6810860..9f9eb3b1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
@@ -92,7 +92,7 @@
  + '/service-data/service-topology/'` " />

             </set>

             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='wan-port-config' 

-        key='wan-port-config.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

+        key='wan-port-config.wan-port-config-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

             <return status='success'>

                 <parameter name="ack-final-indicator" value="Y" />

                 <parameter name="error-code" value="200" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index 90ce0e84..9e9759cc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
@@ -88,7 +88,7 @@
                                 </set>

                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

 		resource="site-resource" 

-		key="site-resource.name = $prop.controlPtId AND 

+		key="site-resource.site-resource-name = $prop.controlPtId AND 

 		     depth = '1'"

         pfx='tmp.aai.controlPoints' local-only='false' >

                                     <outcome value='success'>

@@ -200,8 +200,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' 

-      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='generated-site-id' value='`$site-result.success[0].id`' />

                 <parameter name='operational-status' value='Active' />

             </save>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
index 137a148b..2b642df8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
@@ -69,9 +69,9 @@
                 <parameter name="vnf-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-index  + '/vnf-data/'` " />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' 

-      key='site-resource.id = $prop.vnf-index' >

-                <parameter name='id' value='`$prop.vnf-index`' />

-                <parameter name='name' value='`$prop.site.name`' />

+      key='site-resource.site-resource-id = $prop.vnf-index' >

+                <parameter name='site-resource-id' value='`$prop.vnf-index`' />

+                <parameter name='site-resource-name' value='`$prop.site.name`' />

                 <parameter name='description' value='`$prop.site.description`' />

                 <parameter name='type' value='prop.site.type' />

                 <parameter name='role' value='prop.site.role' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
index 7eac5d05..4599910e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
@@ -179,8 +179,8 @@
                 <parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />

             </set>

             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='site-resource' 

-      key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id' >

-                <parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

+      key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id' >

+                <parameter name='site-resource-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

                 <parameter name='operational-status' value='PendingDelete' />

             </save>

             <return status='success'>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
index f5c08816..38f118fc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
@@ -1,103 +1,103 @@
-<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='site-vnf-topology-operation-delete' mode='sync'>

-        <block atomic="true">

-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >

-                <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>

-            </execute>

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

-                <outcome value=''>

-                    <return status='failure'>

-                        <parameter name='ack-final' value='Y'/>

-                        <parameter name="error-code" value="500" />

-                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />

-                    </return>

-                </outcome>

-            </switch>

-            <switch test='`$service-data.vnfs.vnf_length`'>

-                <outcome value=''>

-                    <return status='failure'>

-                        <parameter name='ack-final' value='Y'/>

-                        <parameter name="error-code" value="500" />

-                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />

-                    </return>

-                </outcome>

-                <outcome value='Other'>

-                    <block atomic="true">

-                        <for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >

-                            <switch test="`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">

-                                <outcome value='true'>

-                                    <set>

-                                        <parameter name='tmp.nidx' value='`$nidx`' />

-                                        <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />

-                                    </set>

-                                </outcome>

-                            </switch>

-                        </for>

-                        <switch test="`$tmp.nidx`">

-                            <outcome value=''>

-                                <return status='failure'>

-                                    <parameter name='ack-final' value='Y'/>

-                                    <parameter name="error-code" value="500" />

-                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />

-                                </return>

-                            </outcome>

-                        </switch>

-                    </block>

-                </outcome>

-            </switch>

-            <switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>

-                <outcome value='PendingDelete'>

-                    <block atomic="true"></block>

-                </outcome>

-                <outcome value='Other'>

-                    <return status='failure'>

-                        <parameter name='ack-final' value='Y'/>

-                        <parameter name="error-code" value="500" />

-                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />

-                    </return>

-                </outcome>

-            </switch>

-            <set>

-                <parameter name='prop.vnfidxLen' value='`0`' />

-            </set>

-            <for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >

-                <block atomic="true">

-                    <switch test="`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">

-                        <outcome value='false'>

-                            <block atomic="true">

-                                <set>

-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />

-                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />

-                                </set>

-                                <set>

-                                    <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />

-                                </set>

-                            </block>

-                        </outcome>

-                    </switch>

-                </block>

-            </for>

-            <set>

-                <parameter name="service-data.vnfs.vnf_length" value='`$prop.vnfidxLen`'/>

-            </set>

-            <set>

-                <parameter name="service-data.vnfs.vnf[$prop.vnfidxLen]." value=""/>

-            </set>

-            <set>

-                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />

-                <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'

- + $vnf-topology-operation-input.service-information.service-instance-id

- + '/service-data/service-topology/'` " />

-            </set>

-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource' 

-        key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>

-            <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='site-vnf-topology-operation-delete' mode='sync'>
+        <block atomic="true">
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >
+                <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>
+            </execute>
+            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />
+                    </return>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.vnfs.vnf_length`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+                    </return>
+                </outcome>
+                <outcome value='Other'>
+                    <block atomic="true">
+                        <for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >
+                            <switch test="`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='tmp.nidx' value='`$nidx`' />
+                                        <parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test="`$tmp.nidx`">
+                            <outcome value=''>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </switch>
+            <switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>
+                <outcome value='PendingDelete'>
+                    <block atomic="true"></block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`" />
+                    </return>
+                </outcome>
+            </switch>
+            <set>
+                <parameter name='prop.vnfidxLen' value='`0`' />
+            </set>
+            <for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >
+                <block atomic="true">
+                    <switch test="`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`">
+                        <outcome value='false'>
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />
+                                    <parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />
+                                </set>
+                                <set>
+                                    <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <set>
+                <parameter name="service-data.vnfs.vnf_length" value='`$prop.vnfidxLen`'/>
+            </set>
+            <set>
+                <parameter name="service-data.vnfs.vnf[$prop.vnfidxLen]." value=""/>
+            </set>
+            <set>
+                <parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                <parameter name='vnf-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $vnf-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'` " />
+            </set>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='site-resource' 
+        key='site-resource.site-resource-id = $vnf-topology-operation-input.vnf-information.vnf-id'></delete>
+            <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