diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
index 442a44e..9c07e5f 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "3dae3829.6d50d8",
+    "id": "5858bb6c.1c5b2c",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 83,
-    "z": "5fc7c3fb.48a444",
+    "x": 116,
+    "y": 67,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "de2fffb7.c073f8"
+        "350dfcb7.24e654"
       ]
     ]
   },
   {
-    "id": "de2fffb7.c073f8",
+    "id": "350dfcb7.24e654",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,264 +22,890 @@
     "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": 182,
-    "y": 162.888916015625,
-    "z": "5fc7c3fb.48a444",
+    "x": 173,
+    "y": 146.888916015625,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "8d7f08d3.c67fe8"
+        "92cd3521.3e4e6"
       ]
     ]
   },
   {
-    "id": "8d7f08d3.c67fe8",
+    "id": "92cd3521.3e4e6",
     "type": "method",
     "name": "method update-network-links-to-aai",
     "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 196,
-    "y": 239.22222900390625,
-    "z": "5fc7c3fb.48a444",
+    "x": 187,
+    "y": 223.22222900390625,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "89a3239d.9a961"
+        "b665c6f2.69a4d"
       ]
     ]
   },
   {
-    "id": "89a3239d.9a961",
+    "id": "b665c6f2.69a4d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 207.33343505859375,
-    "y": 316.7779235839844,
-    "z": "5fc7c3fb.48a444",
+    "x": 198.33343505859375,
+    "y": 300.7779235839844,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "f779b713.8cfdc8"
+        "c59c9b79.9f8cc"
       ]
     ]
   },
   {
-    "id": "705ccc82.ecc094",
+    "id": "f41ff5d9.72c91",
     "type": "update",
-    "name": "save logical-link",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n\n\n\n\n\n",
+    "name": "save logical-link with regular id",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 580.1111450195312,
-    "y": 168.11109924316406,
-    "z": "5fc7c3fb.48a444",
+    "x": 1156.111083984375,
+    "y": 546.111083984375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "f779b713.8cfdc8",
+    "id": "c59c9b79.9f8cc",
     "type": "for",
     "name": "for each link",
     "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 235.88885498046875,
-    "y": 410.33331298828125,
-    "z": "5fc7c3fb.48a444",
+    "x": 226.88885498046875,
+    "y": 394.33331298828125,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "705ccc82.ecc094",
-        "45a55196.a54ca",
-        "d54d8abb.5beac",
-        "5271a41c.d8700c"
+        "6d5acc0f.b7df54",
+        "8fbc8f1e.fe24c8",
+        "954c1d48.971018",
+        "915555f.abb44a8"
       ]
     ]
   },
   {
-    "id": "45a55196.a54ca",
+    "id": "6d5acc0f.b7df54",
     "type": "set",
     "name": "set network link's local variables",
-    "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n\n",
+    "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
     "comments": "",
-    "x": 581.111083984375,
-    "y": 109.22221374511719,
-    "z": "5fc7c3fb.48a444",
+    "x": 572.111083984375,
+    "y": 62.22221374511719,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "d54d8abb.5beac",
-    "type": "save",
-    "name": "save source and dest TP",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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=\"`'/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 596.7779541015625,
-    "y": 234.44447326660156,
-    "z": "5fc7c3fb.48a444",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5271a41c.d8700c",
+    "id": "7a38f4d0.9f3e6c",
     "type": "for",
     "name": "for each label-restriction",
     "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 533.4444580078125,
-    "y": 375.111083984375,
-    "z": "5fc7c3fb.48a444",
+    "x": 1535.4444580078125,
+    "y": 712.111083984375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "1b0f5546.e78123",
-        "443c3267.dc2134",
-        "b1de45a9.d99468"
+        "556fc245.d19e3c",
+        "d6c13a1b.e798a",
+        "69e9f586.641064"
       ]
     ]
   },
   {
-    "id": "1b0f5546.e78123",
+    "id": "556fc245.d19e3c",
     "type": "set",
     "name": "set label-restriction's local variables",
     "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
     "comments": "",
-    "x": 805.111328125,
-    "y": 299.00006103515625,
-    "z": "5fc7c3fb.48a444",
+    "x": 1870.111328125,
+    "y": 635.0000610351562,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "759b3331.b0b62c",
+    "id": "3398d2c0.69ae06",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 982.4998779296875,
-    "y": 371.7460632324219,
-    "z": "5fc7c3fb.48a444",
+    "x": 2005.4998779296875,
+    "y": 679.74609375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "1a522f6e.2f6589"
+        "abb716be.3fb59"
       ]
     ]
   },
   {
-    "id": "b709b603.7fa938",
+    "id": "3d46f558.3e53f2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 990.178466796875,
-    "y": 430.96038818359375,
-    "z": "5fc7c3fb.48a444",
+    "x": 2013.178466796875,
+    "y": 738.9604187011719,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "5fd30b98.524afc"
+        "f0df0cf2.e46b6"
       ]
     ]
   },
   {
-    "id": "1a522f6e.2f6589",
+    "id": "abb716be.3fb59",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 318,
-    "z": "5fc7c3fb.48a444",
+    "x": 2166,
+    "y": 679.0000305175781,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "61d66d0d.d0e254",
+    "id": "9aed5c80.54f11",
     "type": "set",
     "name": "set src-ltpId dst-ltpId",
     "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
     "comments": "",
-    "x": 2595.5001220703125,
-    "y": 2430.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2586.5001220703125,
+    "y": 2414.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "d454df86.50acb",
+    "id": "ce693523.2da318",
     "type": "save",
     "name": "save srcLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      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/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-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=\"`$src-ltpId`\" />\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2629.0001220703125,
-    "y": 2470.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2620.0001220703125,
+    "y": 2454.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "f86402c5.f4d968",
+    "id": "72343f4d.bac85",
     "type": "save",
     "name": "save dstLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      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/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-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=\"`$dst-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 2629.0001220703125,
-    "y": 2510.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2620.0001220703125,
+    "y": 2494.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fd30b98.524afc",
+    "id": "f0df0cf2.e46b6",
     "type": "update",
     "name": "save label-restriction",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1114,
-    "y": 507,
-    "z": "5fc7c3fb.48a444",
+    "x": 2197,
+    "y": 739.0000305175781,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "443c3267.dc2134",
+    "id": "d6c13a1b.e798a",
     "type": "save",
     "name": "save link relationship to label-restriction in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 770,
-    "y": 533,
-    "z": "5fc7c3fb.48a444",
+    "x": 1892,
+    "y": 793,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "b1de45a9.d99468",
+    "id": "69e9f586.641064",
     "type": "update",
     "name": "save label-restriction",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 795.815185546875,
-    "y": 425.55560302734375,
-    "z": "5fc7c3fb.48a444",
+    "x": 1814.815185546875,
+    "y": 711.5556640625,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "759b3331.b0b62c",
-        "b709b603.7fa938"
+        "3398d2c0.69ae06",
+        "3d46f558.3e53f2"
       ]
     ]
+  },
+  {
+    "id": "9c77d572.aa0dd",
+    "type": "switchNode",
+    "name": "switch te-link-attributes",
+    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1135,
+    "y": 668,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "acb46a14.faf1b8",
+        "fad2e2be.055cd8"
+      ]
+    ]
+  },
+  {
+    "id": "acb46a14.faf1b8",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1324,
+    "y": 639,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "b663d811.06fad8"
+      ]
+    ]
+  },
+  {
+    "id": "b663d811.06fad8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1484,
+    "y": 638,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fad2e2be.055cd8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1328,
+    "y": 712,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "7a38f4d0.9f3e6c"
+      ]
+    ]
+  },
+  {
+    "id": "8fbc8f1e.fe24c8",
+    "type": "switchNode",
+    "name": "switch link.destination",
+    "xml": "<switch test='`$link.destination`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 540,
+    "y": 158,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "44b39c00.9558ec",
+        "d8a931d0.793fd"
+      ]
+    ]
+  },
+  {
+    "id": "44b39c00.9558ec",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 784,
+    "y": 129,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "dd848e51.9b8178"
+      ]
+    ]
+  },
+  {
+    "id": "d8a931d0.793fd",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 736,
+    "y": 190,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "bdffabea.a9f78"
+      ]
+    ]
+  },
+  {
+    "id": "bdffabea.a9f78",
+    "type": "set",
+    "name": "set network link's destination variables",
+    "xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",
+    "comments": "",
+    "x": 965,
+    "y": 190,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "d1d8b826.4d04f",
+    "type": "set",
+    "name": "set is-open-ended-link",
+    "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
+    "comments": "",
+    "x": 1144,
+    "y": 94,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "b17a800b.11d598",
+    "type": "save",
+    "name": "get p-interface from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $unique-src-node-Id\n\t        and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",
+    "comments": "",
+    "outputs": 1,
+    "x": 1146,
+    "y": 150,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "698d4309.a506a4",
+        "c0b09280.fde57",
+        "b035740b.82c768"
+      ]
+    ]
+  },
+  {
+    "id": "698d4309.a506a4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1389,
+    "y": 145,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d4d599ee.a3913"
+      ]
+    ]
+  },
+  {
+    "id": "c0b09280.fde57",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1387,
+    "y": 234,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d42c9066.3cdb28"
+      ]
+    ]
+  },
+  {
+    "id": "d4d599ee.a3913",
+    "type": "set",
+    "name": "set alternative unique link id",
+    "xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n\n",
+    "comments": "",
+    "x": 1597,
+    "y": 147,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "d42c9066.3cdb28",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1556,
+    "y": 235,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "f65cb67d.b3d368",
+    "type": "save",
+    "name": "get logical-link from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t    key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",
+    "comments": "",
+    "outputs": 1,
+    "x": 943,
+    "y": 355,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "48397109.a69d68",
+        "efa56bf.4c6db98"
+      ]
+    ]
+  },
+  {
+    "id": "b035740b.82c768",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1398.490966796875,
+    "y": 187.57403564453125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "6959706d.7f87e8"
+      ]
+    ]
+  },
+  {
+    "id": "6959706d.7f87e8",
+    "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 pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 1552.0623779296875,
+    "y": 190.85977172851562,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "954c1d48.971018",
+    "type": "switchNode",
+    "name": "switch is-open-ended-link",
+    "xml": "<switch test='`$is-open-ended-link`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 522,
+    "y": 394,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "4e6e74a5.e8af4c",
+        "53a87226.590744"
+      ]
+    ]
+  },
+  {
+    "id": "4e6e74a5.e8af4c",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 739,
+    "y": 416,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2e08f3a1.53987c"
+      ]
+    ]
+  },
+  {
+    "id": "53a87226.590744",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 742,
+    "y": 356,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "f65cb67d.b3d368"
+      ]
+    ]
+  },
+  {
+    "id": "48397109.a69d68",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1140,
+    "y": 325,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "6b973.4170168dc"
+      ]
+    ]
+  },
+  {
+    "id": "efa56bf.4c6db98",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1143.490966796875,
+    "y": 365.57403564453125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "ef51ee2a.cafb5"
+      ]
+    ]
+  },
+  {
+    "id": "842144b1.a1cb2",
+    "type": "update",
+    "name": "save logical-link with alternative link id",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1590,
+    "y": 368,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2e08f3a1.53987c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 917,
+    "y": 424,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "f41ff5d9.72c91",
+        "9c77d572.aa0dd",
+        "34901df.74cf7e2"
+      ]
+    ]
+  },
+  {
+    "id": "6b973.4170168dc",
+    "type": "save",
+    "name": "update dest TP by putting src TP of the current link",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\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=\"`$src-tpId`\" />-->\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1429,
+    "y": 321,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "34901df.74cf7e2",
+    "type": "save",
+    "name": "save source and dest TP",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1142,
+    "y": 601,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dd848e51.9b8178",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 927,
+    "y": 126,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d1d8b826.4d04f",
+        "b17a800b.11d598"
+      ]
+    ]
+  },
+  {
+    "id": "ef51ee2a.cafb5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1314,
+    "y": 366,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "842144b1.a1cb2",
+        "9ab70c9.3d83df",
+        "dd8767a.3acd918"
+      ]
+    ]
+  },
+  {
+    "id": "9ab70c9.3d83df",
+    "type": "save",
+    "name": "save source only",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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=\"`$src-tpId`\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1527,
+    "y": 416,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ec4710d1.a4614",
+    "type": "for",
+    "name": "for each label-restriction",
+    "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1933,
+    "y": 499,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "5f4e6661.8be42",
+        "bf1c8950.f6775",
+        "869edf38.84c148"
+      ]
+    ]
+  },
+  {
+    "id": "5f4e6661.8be42",
+    "type": "set",
+    "name": "set label-restriction's local variables",
+    "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+    "comments": "",
+    "x": 2267.6668701171875,
+    "y": 421.88897705078125,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "7135b68.c08c3c8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2403.055419921875,
+    "y": 466.635009765625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2043dae3.034356"
+      ]
+    ]
+  },
+  {
+    "id": "69007117.c84f9",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2410.7340087890625,
+    "y": 525.8493347167969,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "30f94010.a2f0b"
+      ]
+    ]
+  },
+  {
+    "id": "2043dae3.034356",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2563.5555419921875,
+    "y": 465.8889465332031,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "30f94010.a2f0b",
+    "type": "update",
+    "name": "save label-restriction",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2594.5555419921875,
+    "y": 525.8889465332031,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bf1c8950.f6775",
+    "type": "save",
+    "name": "save link relationship to label-restriction in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2289.5555419921875,
+    "y": 579.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "869edf38.84c148",
+    "type": "update",
+    "name": "save label-restriction",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2212.3707275390625,
+    "y": 498.444580078125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "7135b68.c08c3c8",
+        "69007117.c84f9"
+      ]
+    ]
+  },
+  {
+    "id": "dd8767a.3acd918",
+    "type": "switchNode",
+    "name": "switch te-link-attributes",
+    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1532.5555419921875,
+    "y": 454.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2ac06a2f.120e4e",
+        "45e6587f.a583a"
+      ]
+    ]
+  },
+  {
+    "id": "2ac06a2f.120e4e",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1721.5555419921875,
+    "y": 425.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "5884f4a0.224604"
+      ]
+    ]
+  },
+  {
+    "id": "5884f4a0.224604",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1881.5555419921875,
+    "y": 424.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "45e6587f.a583a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1725.5555419921875,
+    "y": 498.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "ec4710d1.a4614"
+      ]
+    ]
+  },
+  {
+    "id": "915555f.abb44a8",
+    "type": "set",
+    "name": "set more local variables",
+    "xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",
+    "comments": "",
+    "x": 557,
+    "y": 102,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
   }
 ]
\ No newline at end of file
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 7f98062..382a4c9 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": "e71bc70e.124d38",
+    "id": "ef88be3f.517f78",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 142,
-    "y": 49,
-    "z": "a2160ede.50a7f8",
+    "x": 105,
+    "y": 67,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "f849e1fd.7b8e28"
+        "74a7a837.229be"
       ]
     ]
   },
   {
-    "id": "f849e1fd.7b8e28",
+    "id": "74a7a837.229be",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,457 +22,633 @@
     "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": 231.00003051757812,
-    "y": 139.88891220092773,
-    "z": "a2160ede.50a7f8",
+    "x": 194.00003051757812,
+    "y": 157.88891220092773,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "7adf111d.766db8"
+        "284dae72.737532"
       ]
     ]
   },
   {
-    "id": "7adf111d.766db8",
+    "id": "284dae72.737532",
     "type": "method",
-    "name": "method update-network-to-aai",
+    "name": "update-network-to-aai",
     "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 267.1112518310547,
-    "y": 210.22223663330078,
-    "z": "a2160ede.50a7f8",
+    "x": 230.1112518310547,
+    "y": 228.22223663330078,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "802b5752.247908"
+        "da05320e.186d48"
       ]
     ]
   },
   {
-    "id": "802b5752.247908",
+    "id": "da05320e.186d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
+    "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 492.33343505859375,
-    "y": 209.77792358398438,
-    "z": "a2160ede.50a7f8",
+    "x": 455.33343505859375,
+    "y": 227.77792358398438,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "32d96ea8.386a82",
-        "7667af77.0df1e8",
-        "6f623dd3.9a7c44",
-        "ffd24e55.e4afa"
+        "8c187a81.9e4d28",
+        "75113293.98ea0c",
+        "9937b93d.ff5938",
+        "55dde830.cc61b8"
       ]
     ]
   },
   {
-    "id": "7667af77.0df1e8",
-    "type": "update",
+    "id": "75113293.98ea0c",
+    "type": "save",
     "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<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 722.333251953125,
-    "y": 115.00001525878906,
-    "z": "a2160ede.50a7f8",
+    "x": 685.333251953125,
+    "y": 133.00001525878906,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab67cffd.8b31",
-    "type": "update",
+    "id": "74f65e67.75c658",
+    "type": "save",
     "name": "save pnf",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\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": 934.1111450195312,
-    "y": 205.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 897.1111450195312,
+    "y": 223.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "6f623dd3.9a7c44",
+    "id": "9937b93d.ff5938",
     "type": "for",
     "name": "for each node",
     "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 705.8888549804688,
-    "y": 185.33331298828125,
-    "z": "a2160ede.50a7f8",
+    "x": 668.8888549804688,
+    "y": 203.33331298828125,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "ab67cffd.8b31",
-        "c4083363.2a3b2",
-        "ba78539e.d2e248",
-        "c02a5c85.3b448",
-        "499b8cbc.ebafac",
-        "7a876b8.f89b114",
-        "46013f8c.54849"
+        "74f65e67.75c658",
+        "60e29b35.16fbd4",
+        "b27f201.393186",
+        "e83884ed.3fb2d8",
+        "7257c53.4f087bc",
+        "395bef40.08498",
+        "1392eb55.76adbd",
+        "e55192de.2cc998"
       ]
     ]
   },
   {
-    "id": "c4083363.2a3b2",
+    "id": "60e29b35.16fbd4",
     "type": "set",
-    "name": "set network",
-    "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n",
+    "name": "set node",
+    "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
     "comments": "",
-    "x": 950.111083984375,
-    "y": 133.2222137451172,
-    "z": "a2160ede.50a7f8",
+    "x": 902.111083984375,
+    "y": 119.22221374511719,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "c02a5c85.3b448",
+    "id": "e83884ed.3fb2d8",
     "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 = $unique-nodeId' 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": 1030.7779541015625,
-    "y": 380.44447803497314,
-    "z": "a2160ede.50a7f8",
+    "x": 993.7779541015625,
+    "y": 398.44447803497314,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "499b8cbc.ebafac",
+    "id": "9c15e41a.6cfbc8",
     "type": "for",
     "name": "for each termination point",
     "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 963.4444580078125,
-    "y": 496.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 1279.4444580078125,
+    "y": 574.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "c5951e15.43701",
-        "c670da77.075458",
-        "3831ed03.d1f9da",
-        "f6959b19.b0bc18"
+        "3c657cae.66477c",
+        "2e1dc2b9.f23686",
+        "8c144095.b1eaf8"
       ]
     ]
   },
   {
-    "id": "c5951e15.43701",
+    "id": "3c657cae.66477c",
     "type": "set",
     "name": "set termination point",
     "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
     "comments": "",
-    "x": 1230.111328125,
-    "y": 457.0000457763672,
-    "z": "a2160ede.50a7f8",
+    "x": 1550.111328125,
+    "y": 536.0000457763672,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "3831ed03.d1f9da",
-    "type": "update",
+    "id": "8c144095.b1eaf8",
+    "type": "save",
     "name": "save p-interface",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\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<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1213.8151397705078,
-    "y": 630.5555934906006,
-    "z": "a2160ede.50a7f8",
+    "x": 1533.815185546875,
+    "y": 628.5556030273438,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "9d09dea6.d30ca8",
-        "abd50ee3.2f813"
+        "3fc33363.5b82ec",
+        "34c813e4.f5477c"
       ]
     ]
   },
   {
-    "id": "7e259f3c.438d9",
+    "id": "f6e5129a.8bd048",
     "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 = $unique-nodeId' 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/' + $unique-nodeId '/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": 1297.703857421875,
-    "y": 765.3333740234375,
-    "z": "a2160ede.50a7f8",
+    "x": 1610.703857421875,
+    "y": 784.3333740234375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "c670da77.075458",
+    "id": "2e1dc2b9.f23686",
     "type": "set",
     "name": "set unique-ltpId",
     "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
     "comments": "",
-    "x": 1214.000244140625,
-    "y": 491.1111145019531,
-    "z": "a2160ede.50a7f8",
+    "x": 1534.000244140625,
+    "y": 570.1111145019531,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "32d96ea8.386a82",
+    "id": "8c187a81.9e4d28",
     "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": 671.9935302734375,
-    "y": 75.99349212646484,
-    "z": "a2160ede.50a7f8",
+    "x": 640.9935302734375,
+    "y": 83.99349975585938,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "ba78539e.d2e248",
+    "id": "b27f201.393186",
     "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/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": 1012,
-    "y": 416.9934997558594,
-    "z": "a2160ede.50a7f8",
+    "x": 975,
+    "y": 434.9934997558594,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d09dea6.d30ca8",
+    "id": "3fc33363.5b82ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1385.4998397827148,
-    "y": 617.7460689544678,
-    "z": "a2160ede.50a7f8",
+    "x": 1705.499885559082,
+    "y": 615.7460784912109,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "3d744c93.2eb20c"
+        "a873419b.bc81c"
       ]
     ]
   },
   {
-    "id": "abd50ee3.2f813",
+    "id": "34c813e4.f5477c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1379.1784286499023,
-    "y": 669.9603805541992,
-    "z": "a2160ede.50a7f8",
+    "x": 1699.1784744262695,
+    "y": 667.9603900909424,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "a0fb6003.0efd8"
+        "66113f50.7819f8"
       ]
     ]
   },
   {
-    "id": "3d744c93.2eb20c",
+    "id": "a873419b.bc81c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1536,
-    "y": 617,
-    "z": "a2160ede.50a7f8",
+    "x": 1856.0000457763672,
+    "y": 615.0000095367432,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0fb6003.0efd8",
+    "id": "66113f50.7819f8",
     "type": "update",
     "name": "update p-interface",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='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<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\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<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 1556,
-    "y": 667,
-    "z": "a2160ede.50a7f8",
+    "x": 1885,
+    "y": 669,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa9ed7c5.9f2be8",
-    "type": "update",
+    "id": "c8e5472a.d10408",
+    "type": "save",
     "name": "save tunnel-termination-point",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1423,
-    "y": 205,
-    "z": "a2160ede.50a7f8",
+    "x": 1678,
+    "y": 331,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "54fe71d8.edb1c",
-        "6cd48f92.21a288"
+        "11cb3cf8.02c3eb",
+        "1a336806.ba4bc8"
       ]
     ]
   },
   {
-    "id": "7a876b8.f89b114",
+    "id": "8b0a557c.b35cd",
     "type": "for",
     "name": "for each tunnel termination point",
     "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1038,
-    "y": 281,
-    "z": "a2160ede.50a7f8",
+    "x": 1341,
+    "y": 319,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "79913f13.5b1fa",
-        "4552b8b5.e9ba2",
-        "aa9ed7c5.9f2be8",
-        "e23bdb7f.fdc9c"
+        "58c4d943.63d2f",
+        "e7e93cd.8f563c",
+        "c8e5472a.d10408",
+        "7c00c858.c87ab8"
       ]
     ]
   },
   {
-    "id": "79913f13.5b1fa",
+    "id": "58c4d943.63d2f",
     "type": "set",
     "name": "set tunnel termination point",
     "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
     "comments": "",
-    "x": 1393,
-    "y": 114,
-    "z": "a2160ede.50a7f8",
+    "x": 1676,
+    "y": 239,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "4552b8b5.e9ba2",
+    "id": "e7e93cd.8f563c",
     "type": "set",
     "name": "set unique-ttpId",
     "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 1370.888916015625,
-    "y": 151.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 1634.888916015625,
+    "y": 277.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "54fe71d8.edb1c",
+    "id": "11cb3cf8.02c3eb",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1680,
-    "y": 191,
-    "z": "a2160ede.50a7f8",
+    "x": 1944,
+    "y": 317,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "42f8b4e.c7b524c"
+        "9ad375c8.fab3e8"
       ]
     ]
   },
   {
-    "id": "6cd48f92.21a288",
+    "id": "1a336806.ba4bc8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1673.6785888671875,
-    "y": 243.21431159973145,
-    "z": "a2160ede.50a7f8",
+    "x": 1937.6785888671875,
+    "y": 369.21431159973145,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "5f719388.c96efc"
+        "842e7e75.fc0558"
       ]
     ]
   },
   {
-    "id": "42f8b4e.c7b524c",
+    "id": "9ad375c8.fab3e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1830.5001602172852,
-    "y": 190.25393104553223,
-    "z": "a2160ede.50a7f8",
+    "x": 2094.500160217285,
+    "y": 316.2539310455322,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f719388.c96efc",
+    "id": "842e7e75.fc0558",
     "type": "update",
     "name": "update tunnel-termination-point",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $node.node-id\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1911,
-    "y": 245,
-    "z": "a2160ede.50a7f8",
+    "x": 2175,
+    "y": 371,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "46013f8c.54849",
+    "id": "7257c53.4f087bc",
     "type": "set",
     "name": "set local variables",
-    "xml": "<set>\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
+    "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
     "comments": "",
-    "x": 969,
-    "y": 167,
-    "z": "a2160ede.50a7f8",
+    "x": 927,
+    "y": 166,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "ffd24e55.e4afa",
+    "id": "55dde830.cc61b8",
     "type": "call",
     "name": "call update-network-links-to-aai",
     "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 648,
-    "y": 311,
-    "z": "a2160ede.50a7f8",
+    "x": 611,
+    "y": 329,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6959b19.b0bc18",
+    "id": "b86a9ee9.558c2",
     "type": "save",
     "name": "save pnf-interface relationship to pnf in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' 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/pnfs/pnf/' + $unique-nodeId`\" />\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=\"`$unique-nodeId`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1300,
-    "y": 724,
-    "z": "a2160ede.50a7f8",
+    "x": 1617,
+    "y": 728,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "e23bdb7f.fdc9c",
+    "id": "7c00c858.c87ab8",
     "type": "save",
     "name": "save pnf relationship to tunnel termination point in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$ttidx].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1485,
-    "y": 297,
-    "z": "a2160ede.50a7f8",
+    "x": 1749,
+    "y": 423,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "395bef40.08498",
+    "type": "switchNode",
+    "name": "switch node ttp",
+    "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 913,
+    "y": 295,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "84bf875e.b8d51",
+        "cc6df2e.2398e9",
+        "f2d2c388.1aa578"
+      ]
+    ]
+  },
+  {
+    "id": "5889c4ed.3fc544",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1261,
+    "y": 247,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f2d2c388.1aa578",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1103,
+    "y": 318,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "8b0a557c.b35cd"
+      ]
+    ]
+  },
+  {
+    "id": "1392eb55.76adbd",
+    "type": "switchNode",
+    "name": "switch node tp",
+    "xml": "<switch test='`$node.termination-point_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 893,
+    "y": 550,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "c5e649ab.cfe2e8",
+        "d7a3de29.b44a1",
+        "a21fbfb7.b6608"
+      ]
+    ]
+  },
+  {
+    "id": "c5e649ab.cfe2e8",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1072,
+    "y": 502,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "3d51c59d.7acffa"
+      ]
+    ]
+  },
+  {
+    "id": "d7a3de29.b44a1",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1071,
+    "y": 604,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "9c15e41a.6cfbc8"
+      ]
+    ]
+  },
+  {
+    "id": "3d51c59d.7acffa",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1227,
+    "y": 502,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e55192de.2cc998",
+    "type": "record",
+    "name": "log file",
+    "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/hesamlogx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    ",
+    "comments": "",
+    "outputs": 1,
+    "x": 891,
+    "y": 339,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "84bf875e.b8d51",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1101,
+    "y": 181,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "5889c4ed.3fc544"
+      ]
+    ]
+  },
+  {
+    "id": "cc6df2e.2398e9",
+    "type": "outcome",
+    "name": "length 0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1106,
+    "y": 256,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "5889c4ed.3fc544"
+      ]
+    ]
+  },
+  {
+    "id": "a21fbfb7.b6608",
+    "type": "outcome",
+    "name": "length 0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1082,
+    "y": 550,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "3d51c59d.7acffa"
+      ]
+    ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index 3495214..8777891 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,70 +1,192 @@
-<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-links-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-network-links-to-aai" mode="sync">
         <block atomic="true">
-            <for index='pidx' start='0' end='`$network.link_length`' >
+            <for index="pidx" start="0" end="`$network.link_length`">
                 <set>
-                    <parameter name='link.' value='`$network.link[$pidx].`' />
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
-                    <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />
-                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
-                    <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />
+                    <parameter name="link." value="`$network.link[$pidx].`"/>
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
-                      key='logical-link.link-name = $unique-linkId' >
-                    <parameter name='link-name' value='`$unique-linkId`' />
-                    <parameter name='link-id' value='`$link.link-id`' />
-                </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
-                      key='logical-link.link-name = $unique-linkId' 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="`'/p-interfaces/p-interface/' + $src-tpId`" />
-                    <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="`$src-tpId`" />
-                    <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
-                    <parameter name="relationship-list.relationship[1].related-link" value="`'/p-interfaces/p-interface/' + $dst-tpId`" />
-                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
-                </save>
-                <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
-                    <set>
-                        <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
-                        <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
-                    </set>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
-                          key='logical-link.link-name = $unique-linkId
-      AND label-restriction.id = $unique-lrId' >
-                        <parameter name='id' value='`$unique-lrId`' />
-                        <parameter name='label-start' value='`$label-restriction.label-start`' />
-                        <parameter name='label-end' value='`$label-restriction.label-end`' />
-                        <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                        <parameter name='label-step' value='`$label-restriction.label-step`' />
-                        <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
-                        <outcome value='success'>
-                            <block></block>
-                        </outcome>
-                        <outcome value='failure'>
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
-                                    key='logical-link.link-name = $unique-linkId
-      AND label-restriction.id = $unique-lrId' >
-                                <parameter name='id' value='`$unique-lrId`' />
-                                <parameter name='label-start' value='`$label-restriction.label-start`' />
-                                <parameter name='label-end' value='`$label-restriction.label-end`' />
-                                <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
-                            </update>
-                        </outcome>
-                    </save>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
-                          key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
-                        <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
-                        <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
-                        <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
-                        <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
-                    </save>
-                </for>
+                <set>
+                    <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>
+                    <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>
+                    <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>
+                </set>
+                <switch test="`$link.destination`">
+                    <outcome value="">
+                        <block>
+                            <set>
+                                <parameter name="is-open-ended-link" value="true"/>
+                            </set>
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">
+                                <outcome value="success">
+                                    <set>
+                                        <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>
+                                    </set>
+                                </outcome>
+                                <outcome value="not-found">
+                                    <return status="failure">
+                                        <parameter name="ack-final" value="Y"/>
+                                        <parameter name="error-code" value="500"/>
+                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>
+                                    </return>
+                                </outcome>
+                                <outcome value="failure">
+                                    <return status="failure">
+                                        <parameter name="error-code" value=""/>
+                                        <parameter name="error-message" value=""/>
+                                    </return>
+                                </outcome>
+                            </get-resource>
+                        </block>
+                    </outcome>
+                    <outcome value="Other">
+                        <set>
+                            <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>
+                            <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>
+                            <parameter name="is-open-ended-link" value="false"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$is-open-ended-link`">
+                    <outcome value="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">
+                            <outcome value="success">
+                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+                                    -->
+                                    <!--
+                                    <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="`$src-tpId`" />
+                                    -->
+                                    <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+                                    <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$src-tpId`"/>
+                                </update>
+                            </outcome>
+                            <outcome value="not-found">
+                                <block atomic="true">
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">
+                                        <parameter name="link-name" value="`$alt-unique-linkId`"/>
+                                        <parameter name="link-id" value="`$link.link-id`"/>
+                                        <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+                                    </save>
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                        <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="`$src-tpId`"/>
+                                    </save>
+                                    <switch test="`$link.te.te-link-attributes.label-restriction`">
+                                        <outcome value="">
+                                            <block/>
+                                        </outcome>
+                                        <outcome value="Other">
+                                            <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+                                                <set>
+                                                    <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+                                                    <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
+                                                </set>
+                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+                                                    <parameter name="id" value="`$unique-lrId`"/>
+                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                    <outcome value="success">
+                                                        <block/>
+                                                    </outcome>
+                                                    <outcome value="failure">
+                                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+                                                            <parameter name="id" value="`$unique-lrId`"/>
+                                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                        </update>
+                                                    </outcome>
+                                                </save>
+                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
+                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+                                                </save>
+                                            </for>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </outcome>
+                    <outcome value="false">
+                        <block atomic="true">
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">
+                                <parameter name="link-name" value="`$unique-linkId`"/>
+                                <parameter name="link-id" value="`$link.link-id`"/>
+                                <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+                            </save>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                <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="`$src-tpId`"/>
+                                <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+                                <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>
+                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>
+                            </save>
+                            <switch test="`$link.te.te-link-attributes.label-restriction`">
+                                <outcome value="">
+                                    <block/>
+                                </outcome>
+                                <outcome value="Other">
+                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+                                        <set>
+                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+                                            <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>
+                                        </set>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+                                            <parameter name="id" value="`$unique-lrId`"/>
+                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                            <outcome value="success">
+                                                <block/>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+                                                    <parameter name="id" value="`$unique-lrId`"/>
+                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                </update>
+                                            </outcome>
+                                        </save>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
+                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+                                        </save>
+                                    </for>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
             </for>
         </block>
     </method>
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 9c17eac..17be19e 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,148 +1,149 @@
-<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'>
+<service-logic 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' >
+            <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`' />
-                <parameter name='network-type' value='`$network.network-types`' />
+            <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`"/>
+                <parameter name="network-type" value="`$network.network-types`"/>
             </save>
-            <for index='pidx' start='0' end='`$network.node_length`' >
+            <for index="pidx" start="0" end="`$network.node_length`">
                 <set>
-                    <parameter name='node.' value='`$network.node[$pidx].`' />
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
-                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
+                    <parameter name="node." value="`$network.node[$pidx].`"/>
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
                 </set>
                 <set>
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
-                      key='pnf.pnf-name = $unique-nodeId' >
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />
-                    <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 plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>
+                    <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>
-                <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
-                    <set>
-                        <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
-                    </set>
-                    <set>
-                        <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
-                    </set>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
-                          key='pnf.pnf-name = $unique-nodeId
-      AND tunnel-termination-point.ttp-id = $unique-ttpId' >
-                        <parameter name='ttp-id' value='`$unique-ttpId`' />
-                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
-                        <parameter name='name' value='`$ttp.name`' />
-                        <parameter name='admin-status' value='`$ttp.admin-status`' />
-                        <parameter name='oper-status' value='`$ttp.oper-status`' />
-                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                        <parameter name='protection-type' value='`$ttp.protection-type`' />
-                        <parameter name='encoding' value='`$ttp.encoding`' />
-                        <outcome value='success'>
-                            <block></block>
-                        </outcome>
-                        <outcome value='failure'>
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
-                                    key='pnf.pnf-name = $node.node-id
-      AND tunnel-termination-point.ttp-id = $unique-ttpId' >
-                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
-                                <parameter name='name' value='`$ttp.name`' />
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />
-                                <parameter name='encoding' value='`$ttp.encoding`' />
-                            </update>
-                        </outcome>
-                    </save>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
-                          key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
-                        <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point" />
-                        <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
-                        <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
-                        <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
-                    </save>
-                </for>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
-                      key='pnf.pnf-name = $unique-nodeId' 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`" />
+                <switch test="`$node.te.tunnel-termination-point_length`">
+                    <outcome value="">
+                        <block/>
+                    </outcome>
+                    <outcome value="0">
+                        <block/>
+                    </outcome>
+                    <outcome value="Other">
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
+                            <set>
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
+                            </set>
+                            <set>
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+                            </set>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
+                                <parameter name="ttp-id" value="`$unique-ttpId`"/>
+                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+                                <parameter name="name" value="`$ttp.name`"/>
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                <parameter name="encoding" value="`$ttp.encoding`"/>
+                                <outcome value="success">
+                                    <block/>
+                                </outcome>
+                                <outcome value="failure">
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
+                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>
+                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+                                        <parameter name="name" value="`$ttp.name`"/>
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>
+                                    </update>
+                                </outcome>
+                            </save>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+                                <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>
+                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
+                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+                            </save>
+                        </for>
+                    </outcome>
+                </switch>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/onap/hesamlogx.txt"/>
+                    <parameter name="field1" value="__TIMESTAMP__"/>
+                    <parameter name="field2" value="sucess executing Hesam hesam log file"/>
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+                    <parameter name="field4" value="`$node.termination-point_length`"/>
+                </record>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" 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/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 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/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="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
-                    </set>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
-                          key='pnf.pnf-name = $unique-nodeId
-      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" />
-                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
-                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
-                        <outcome value='success'>
-                            <block></block>
-                        </outcome>
-                        <outcome value='failure'>
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
-                                    key='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" />
-                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
-                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
-                            </update>
-                        </outcome>
-                    </save>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
-                          key='pnf.pnf-name = $unique-nodeId
-      AND p-interface.interface-name = $unique-ltpId' 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/pnfs/pnf/' + $unique-nodeId`" />
-                        <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="`$unique-nodeId`" />
-                    </save>
-                </for>
+                <switch test="`$node.termination-point_length`">
+                    <outcome value="">
+                        <block/>
+                    </outcome>
+                    <outcome value="0">
+                        <block/>
+                    </outcome>
+                    <outcome value="Other">
+                        <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="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
+                            </set>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId 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"/>
+                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+                                <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                <outcome value="success">
+                                    <block/>
+                                </outcome>
+                                <outcome value="failure">
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId 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"/>
+                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+                                        <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+                                    </update>
+                                </outcome>
+                            </save>
+                        </for>
+                    </outcome>
+                </switch>
             </for>
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
index 9a63197..49e1d4b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "1d6261af.026296",
+        "id": "1dfeb3dd.1c381c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 106.75,
-        "y": 146.00012969970703,
-        "z": "e0329916.b170f8",
+        "x": 119.75,
+        "y": 180.00012969970703,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "4f356558.c09824"
+                "64cbb377.7c0bf4"
             ]
         ]
     },
     {
-        "id": "4f356558.c09824",
+        "id": "64cbb377.7c0bf4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1194 +22,1209 @@
         "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": 399.74940490722656,
-        "y": 146.0000295639038,
-        "z": "e0329916.b170f8",
+        "x": 412.74940490722656,
+        "y": 180.0000295639038,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f6fdf774.8bb96"
+                "520c0a59.153664"
             ]
         ]
     },
     {
-        "id": "f6fdf774.8bb96",
+        "id": "520c0a59.153664",
         "type": "method",
         "name": "method:bbs-access-connectivity-vnf-topology-operation-create-huawei",
         "xml": "<method rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 397.74940490722656,
-        "y": 342.0000696182251,
-        "z": "e0329916.b170f8",
+        "x": 410.74940490722656,
+        "y": 376.0000696182251,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f3bcfb95.a6758"
+                "acdb8fbc.c4c32"
             ]
         ]
     },
     {
-        "id": "f3bcfb95.a6758",
+        "id": "acdb8fbc.c4c32",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 804.7496185302734,
-        "y": 343.0000696182251,
-        "z": "e0329916.b170f8",
+        "x": 817.7496185302734,
+        "y": 377.0000696182251,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "3a2b8179.f5c316",
-                "f43916c0.05b38",
-                "5819ae74.c281a",
-                "f4291e2e.795f3",
-                "bdcb838b.2c793",
-                "2efe0fba.b3123",
-                "48d2f628.580118",
-                "f603acaf.f2ab88"
+                "92311e7.928946",
+                "7b2360fe.45f79",
+                "f70f044f.f4216",
+                "148d0ddb.c1c5d2",
+                "ab8a01b3.157068",
+                "4fe300f9.717bd",
+                "14ca751b.b082bb",
+                "677aa3bb.4d4e74"
             ]
         ]
     },
     {
-        "id": "3a2b8179.f5c316",
+        "id": "92311e7.928946",
         "type": "execute",
         "name": "excute:readProperties",
         "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\n",
         "comments": "",
         "outputs": 1,
-        "x": 1236.7498779296875,
-        "y": 232.11117553710938,
-        "z": "e0329916.b170f8",
+        "x": 1249.7498779296875,
+        "y": 266.1111755371094,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "f43916c0.05b38",
+        "id": "7b2360fe.45f79",
         "type": "call",
         "name": "call:validate-bbs-vnf-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1317.749755859375,
-        "y": 20,
-        "z": "e0329916.b170f8",
+        "x": 1330.749755859375,
+        "y": 54,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "f603acaf.f2ab88",
+        "id": "677aa3bb.4d4e74",
         "type": "execute",
         "name": "execute:createAccessConnectivityService",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`'http://159.138.58.209:30335/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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    \n       <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />-->",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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    \n       <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1295.4008178710938,
-        "y": 792.9608383178711,
-        "z": "e0329916.b170f8",
+        "x": 1309.4008178710938,
+        "y": 824.9608383178711,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "60f74c55.fe6e34",
-                "d4535369.b036"
+                "6c10e0e6.d236f8",
+                "11f064a9.56fa43"
             ]
         ]
     },
     {
-        "id": "60f74c55.fe6e34",
+        "id": "6c10e0e6.d236f8",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.733585357666,
-        "y": 882.9607381820679,
-        "z": "e0329916.b170f8",
+        "x": 1653.733585357666,
+        "y": 916.9607381820679,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "15628a38.6513e6"
+                "65f44139.642dd"
             ]
         ]
     },
     {
-        "id": "d4535369.b036",
+        "id": "11f064a9.56fa43",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1632.64306640625,
-        "y": 791.1426010131836,
-        "z": "e0329916.b170f8",
+        "x": 1645.64306640625,
+        "y": 825.1426010131836,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "3377addc.d013aa"
+                "f0c20005.cbb8"
             ]
         ]
     },
     {
-        "id": "2efe0fba.b3123",
+        "id": "14ca751b.b082bb",
         "type": "execute",
         "name": "execute:querryTokenID",
-        "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`'http://159.138.58.209:30335/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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\n\n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>-->",
+        "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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\n\n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>-->",
         "comments": "",
         "outputs": 1,
-        "x": 1230.97216796875,
-        "y": 594.5557861328125,
-        "z": "e0329916.b170f8",
+        "x": 1243.97216796875,
+        "y": 628.5557861328125,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f9c0e434.ab18e",
-                "ecb05dd5.09d378"
+                "41d71aa5.903454",
+                "e6e0653b.c6ad58"
             ]
         ]
     },
     {
-        "id": "ecb05dd5.09d378",
+        "id": "e6e0653b.c6ad58",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1518.9169921875,
-        "y": 594.2502002716064,
-        "z": "e0329916.b170f8",
+        "x": 1531.9169921875,
+        "y": 628.2502002716064,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f290b563.afea"
+                "84b8bff2.0e32c8"
             ]
         ]
     },
     {
-        "id": "f9c0e434.ab18e",
+        "id": "41d71aa5.903454",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517.1900024414062,
-        "y": 667.6138753890991,
-        "z": "e0329916.b170f8",
+        "x": 1530.1900024414062,
+        "y": 701.6138753890991,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "50dc0542.4371cc"
+                "d82a2a82.f5e938"
             ]
         ]
     },
     {
-        "id": "369cde33.b9c072",
+        "id": "38fd0525.aa8892",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n",
         "comments": "",
-        "x": 2138.030807495117,
-        "y": 661.1595993041992,
-        "z": "e0329916.b170f8",
+        "x": 2151.030807495117,
+        "y": 695.1595993041992,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "1422e405.e818ac",
+        "id": "9abe0e72.caaf3",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1921.7502174377441,
-        "y": 663.0004110336304,
-        "z": "e0329916.b170f8",
+        "x": 1934.7502174377441,
+        "y": 697.0004110336304,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "369cde33.b9c072"
+                "38fd0525.aa8892"
             ]
         ]
     },
     {
-        "id": "f290b563.afea",
+        "id": "84b8bff2.0e32c8",
         "type": "switchNode",
         "name": "switch:token ",
         "xml": "<switch test='`$token-result.accessSession`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1732.7500495910645,
-        "y": 593.0001859664917,
-        "z": "e0329916.b170f8",
+        "x": 1745.7500495910645,
+        "y": 627.0001859664917,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "1422e405.e818ac",
-                "e2811aac.af4e88"
+                "9abe0e72.caaf3",
+                "9fff6487.f8195"
             ]
         ]
     },
     {
-        "id": "e2811aac.af4e88",
+        "id": "9fff6487.f8195",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1919.750057220459,
-        "y": 592.0001831054688,
-        "z": "e0329916.b170f8",
+        "x": 1932.750057220459,
+        "y": 626.0001831054688,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "83e041e2.11968"
+                "216dd074.c9033"
             ]
         ]
     },
     {
-        "id": "83e041e2.11968",
+        "id": "216dd074.c9033",
         "type": "set",
         "name": "set:token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
         "comments": "",
-        "x": 2130.2500648498535,
-        "y": 592.2501840591431,
-        "z": "e0329916.b170f8",
+        "x": 2143.2500648498535,
+        "y": 626.2501840591431,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "5819ae74.c281a",
+        "id": "f70f044f.f4216",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='prop.bbs.HsiPackage' value='50M' />\n<parameter name='prop.bbs.HsiType' value='IPoE' />\n",
         "comments": "",
-        "x": 1195.7503967285156,
-        "y": 132.00025749206543,
-        "z": "e0329916.b170f8",
+        "x": 1208.7503967285156,
+        "y": 166.00025749206543,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "424a1338.c6c804",
+        "id": "8c8f9f2c.a4f258",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"`$prop.bbs.remote_id`\" />\n    <parameter name=\"field3\" value=\"`$prop.bbs.ONTSN`\" />\n    <parameter name=\"field4\" value=\"`$prop.bbs.CVLAN`\" />\n    <parameter name=\"field5\" value=\"`$prop.bbs.SVLAN`\" />\n    <parameter name=\"field6\" value=\"`$prop.bbs.HsiPackage`\" />\n    <parameter name=\"field7\" value=\"`$prop.bbs.HsiType`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1185.7502746582031,
-        "y": 425.00019550323486,
-        "z": "e0329916.b170f8",
+        "x": 1198.7502746582031,
+        "y": 459.00019550323486,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "2c82d829.e0ab68",
+        "id": "8b12d898.3d72d",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"createAccessConnectivityService success!\" />\n    <parameter name=\"field2\" value=\"`$service-result.accessE2Eservice.serviceID`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2458.7500400543213,
-        "y": 952.0003020167351,
-        "z": "e0329916.b170f8",
+        "x": 2471.7500400543213,
+        "y": 986.0003020167351,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "15628a38.6513e6",
+        "id": "65f44139.642dd",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1875.7497062683105,
-        "y": 882.0000333786011,
-        "z": "e0329916.b170f8",
+        "x": 1888.7497062683105,
+        "y": 916.0000333786011,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f5141e0a.b112f8",
-                "f195f6a2.69ce68"
+                "c071ccac.1342c8",
+                "bd77dc7e.818a8"
             ]
         ]
     },
     {
-        "id": "f5141e0a.b112f8",
+        "id": "c071ccac.1342c8",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2096.750011444092,
-        "y": 804.0002164840698,
-        "z": "e0329916.b170f8",
+        "x": 2109.750011444092,
+        "y": 838.0002164840698,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "8275b3aa.8d1378"
+                "5358758f.0d5684"
             ]
         ]
     },
     {
-        "id": "f195f6a2.69ce68",
+        "id": "bd77dc7e.818a8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2097.7496337890625,
-        "y": 880.0000152587891,
-        "z": "e0329916.b170f8",
+        "x": 2110.7496337890625,
+        "y": 914.0000152587891,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "917abc23.c0d878"
+                "5c433db5.e1230c"
             ]
         ]
     },
     {
-        "id": "ffd1d599.c71c18",
+        "id": "25985c98.53ae4c",
         "type": "record",
         "name": "log error",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"createAccessConnectivityService falied!\" />\n    <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n    <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n    <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2634.7500381469727,
-        "y": 842.0002098083496,
-        "z": "e0329916.b170f8",
+        "x": 2647.7500381469727,
+        "y": 876.0002098083496,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "bdcb838b.2c793",
+        "id": "ab8a01b3.157068",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1260.2501220703125,
-        "y": 335.00017261505127,
-        "z": "e0329916.b170f8",
+        "x": 1273.2501220703125,
+        "y": 369.00017261505127,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "a466675f.e223b"
+                "d22ff9a3.fbfbb"
             ]
         ]
     },
     {
-        "id": "6ab8eedc.cb66a8",
+        "id": "cb807928.2112c8",
         "type": "switchNode",
         "name": "switch:remote_id",
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'remote_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1801.2502479553223,
-        "y": 136.000226020813,
-        "z": "e0329916.b170f8",
+        "x": 1814.2502479553223,
+        "y": 170.000226020813,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "fb671302.f08a28"
+                "d4e1d576.c2d6f8"
             ]
         ]
     },
     {
-        "id": "fb671302.f08a28",
+        "id": "d4e1d576.c2d6f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2004.2501678466797,
-        "y": 136.0001974105835,
-        "z": "e0329916.b170f8",
+        "x": 2017.2501678466797,
+        "y": 170.0001974105835,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "5ca67ab9.1ce66c"
+                "7927b5c0.d398f4"
             ]
         ]
     },
     {
-        "id": "2257c990.31ddd6",
+        "id": "5e2c004f.b53818",
         "type": "set",
         "name": "set:remote_id",
         "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2722.2499237060547,
-        "y": 134.60020351409912,
-        "z": "e0329916.b170f8",
+        "x": 2735.2499237060547,
+        "y": 168.60020351409912,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "a466675f.e223b",
+        "id": "d22ff9a3.fbfbb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1515.2504196166992,
-        "y": 336.00021171569824,
-        "z": "e0329916.b170f8",
+        "x": 1528.2504196166992,
+        "y": 370.00021171569824,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "6ab8eedc.cb66a8",
-                "ad025760.15512",
-                "931e8201.e0a528",
-                "1021a2a7.9d963d"
+                "cb807928.2112c8",
+                "2616fb50.5f93e4",
+                "2be8fa1f.fcef86",
+                "52dab55c.8b17dc"
             ]
         ]
     },
     {
-        "id": "ad025760.15512",
+        "id": "2616fb50.5f93e4",
         "type": "switchNode",
         "name": "switch:ONTSN",
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ONTSN'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1801.1020431518555,
-        "y": 197.00022792816162,
-        "z": "e0329916.b170f8",
+        "x": 1814.1020431518555,
+        "y": 231.00022792816162,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f93e9a17.ed77c"
+                "1175216.ae444df"
             ]
         ]
     },
     {
-        "id": "f93e9a17.ed77c",
+        "id": "1175216.ae444df",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2003.1019458770752,
-        "y": 197.00029182434082,
-        "z": "e0329916.b170f8",
+        "x": 2016.1019458770752,
+        "y": 231.00029182434082,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "4c4d0595.c8d74c"
+                "5561709c.b3df8"
             ]
         ]
     },
     {
-        "id": "9de6cf9d.95e438",
+        "id": "41a1bcbb.4edd5c",
         "type": "set",
         "name": "set:ONTSN",
         "xml": "<set>\n<parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2721.1022300720215,
-        "y": 196.60026836395264,
-        "z": "e0329916.b170f8",
+        "x": 2734.1022300720215,
+        "y": 230.60026836395264,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "931e8201.e0a528",
+        "id": "2be8fa1f.fcef86",
         "type": "switchNode",
         "name": "switch:CVLAN",
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'CVLAN'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1801.1021156311035,
-        "y": 257.0002775192261,
-        "z": "e0329916.b170f8",
+        "x": 1814.1021156311035,
+        "y": 291.0002775192261,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "45aee947.1f79f"
+                "430ccce0.a19a7c"
             ]
         ]
     },
     {
-        "id": "45aee947.1f79f",
+        "id": "430ccce0.a19a7c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2003.1019744873047,
-        "y": 257.00028896331787,
-        "z": "e0329916.b170f8",
+        "x": 2016.1019744873047,
+        "y": 291.00028896331787,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f12f75d1.378e7"
+                "5fa318d2.3cda"
             ]
         ]
     },
     {
-        "id": "b328ff7b.de2178",
+        "id": "23ae22e3.22418e",
         "type": "set",
         "name": "set:CVLAN",
         "xml": "<set>\n<parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2719.1019744873047,
-        "y": 257.60026454925537,
-        "z": "e0329916.b170f8",
+        "x": 2732.1019744873047,
+        "y": 291.60026454925537,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "1021a2a7.9d963d",
+        "id": "52dab55c.8b17dc",
         "type": "switchNode",
         "name": "switch:SVLAN",
-        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'SVLAN'`\">\n",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'serviceID'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1798.102123260498,
-        "y": 333.222544670105,
-        "z": "e0329916.b170f8",
+        "x": 1811.102123260498,
+        "y": 367.222544670105,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "a0cd6bfe.37df4"
+                "d9dc9da4.a45018"
             ]
         ]
     },
     {
-        "id": "a0cd6bfe.37df4",
+        "id": "d9dc9da4.a45018",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2006.1020078659058,
-        "y": 332.22254276275635,
-        "z": "e0329916.b170f8",
+        "x": 2019.1020078659058,
+        "y": 366.22254276275635,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "b2009bd.404af68"
+                "96fa65e7.f61a1"
             ]
         ]
     },
     {
-        "id": "fd36dd78.cdefd",
+        "id": "762a30f5.19315",
         "type": "set",
         "name": "set:SVLAN",
         "xml": "<set>\n<parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2725.1019744873047,
-        "y": 331.82255458831787,
-        "z": "e0329916.b170f8",
+        "x": 2738.1019744873047,
+        "y": 365.82255458831787,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "5ca67ab9.1ce66c",
+        "id": "7927b5c0.d398f4",
         "type": "switchNode",
         "name": "switch:remote_id value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2249.2501678466797,
-        "y": 135.00022792816162,
-        "z": "e0329916.b170f8",
+        "x": 2262.2501678466797,
+        "y": 169.00022792816162,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "9dd975e7.7bf628",
-                "9c64fed9.d1167"
+                "25b5ca63.22e58e",
+                "7f9a22df.b3546c"
             ]
         ]
     },
     {
-        "id": "9c64fed9.d1167",
+        "id": "7f9a22df.b3546c",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2537.2501678466797,
-        "y": 134.00022792816162,
-        "z": "e0329916.b170f8",
+        "x": 2550.2501678466797,
+        "y": 168.00022792816162,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "2257c990.31ddd6"
+                "5e2c004f.b53818"
             ]
         ]
     },
     {
-        "id": "9dd975e7.7bf628",
+        "id": "25b5ca63.22e58e",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2535.250576019287,
-        "y": 65.00020694732666,
-        "z": "e0329916.b170f8",
+        "x": 2548.250576019287,
+        "y": 99.00020694732666,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "e7c90529.4dc4f8"
+                "efd50227.ac304"
             ]
         ]
     },
     {
-        "id": "4c4d0595.c8d74c",
+        "id": "5561709c.b3df8",
         "type": "switchNode",
         "name": "switch:ONTSN value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2249.2501678466797,
-        "y": 197.00022792816162,
-        "z": "e0329916.b170f8",
+        "x": 2262.2501678466797,
+        "y": 231.00022792816162,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "9dd975e7.7bf628",
-                "923642af.93bc88"
+                "25b5ca63.22e58e",
+                "63df4639.d0b868"
             ]
         ]
     },
     {
-        "id": "923642af.93bc88",
+        "id": "63df4639.d0b868",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2539.2501678466797,
-        "y": 197.00022792816162,
-        "z": "e0329916.b170f8",
+        "x": 2552.2501678466797,
+        "y": 231.00022792816162,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "9de6cf9d.95e438"
+                "41a1bcbb.4edd5c"
             ]
         ]
     },
     {
-        "id": "f12f75d1.378e7",
+        "id": "5fa318d2.3cda",
         "type": "switchNode",
         "name": "switch:CVLAN value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2252.2501678466797,
-        "y": 258.0002279281616,
-        "z": "e0329916.b170f8",
+        "x": 2265.2501678466797,
+        "y": 292.0002279281616,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "9dd975e7.7bf628",
-                "f56650c5.51ce2"
+                "25b5ca63.22e58e",
+                "20955e4d.c0a422"
             ]
         ]
     },
     {
-        "id": "f56650c5.51ce2",
+        "id": "20955e4d.c0a422",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2540.2501678466797,
-        "y": 257.0002279281616,
-        "z": "e0329916.b170f8",
+        "x": 2553.2501678466797,
+        "y": 291.0002279281616,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "b328ff7b.de2178"
+                "23ae22e3.22418e"
             ]
         ]
     },
     {
-        "id": "b2009bd.404af68",
+        "id": "96fa65e7.f61a1",
         "type": "switchNode",
         "name": "switch:SVLAN value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2253.2501678466797,
-        "y": 332.0002279281616,
-        "z": "e0329916.b170f8",
+        "x": 2266.2501678466797,
+        "y": 366.0002279281616,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "9dd975e7.7bf628",
-                "b2fcbca3.42bad"
+                "25b5ca63.22e58e",
+                "9fbec5d2.cbbe08"
             ]
         ]
     },
     {
-        "id": "b2fcbca3.42bad",
+        "id": "9fbec5d2.cbbe08",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2543.2501678466797,
-        "y": 333.0002279281616,
-        "z": "e0329916.b170f8",
+        "x": 2556.2501678466797,
+        "y": 367.0002279281616,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "fd36dd78.cdefd"
+                "762a30f5.19315"
             ]
         ]
     },
     {
-        "id": "f4291e2e.795f3",
+        "id": "148d0ddb.c1c5d2",
         "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`\" />",
         "comments": "",
-        "x": 1168.8052062988281,
-        "y": 1376.7781105041504,
-        "z": "e0329916.b170f8",
+        "x": 1181.8052062988281,
+        "y": 1410.7781105041504,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "917abc23.c0d878",
+        "id": "5c433db5.e1230c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2255.9162635803223,
-        "y": 880.9999904632568,
-        "z": "e0329916.b170f8",
+        "x": 2268.9162635803223,
+        "y": 914.9999904632568,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "c2dbfb5a.03777"
+                "4538034.6a1697c"
             ]
         ]
     },
     {
-        "id": "8275b3aa.8d1378",
+        "id": "5358758f.0d5684",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />",
         "comments": "",
-        "x": 2283.2496795654297,
-        "y": 804.0000534057617,
-        "z": "e0329916.b170f8",
+        "x": 2296.2496795654297,
+        "y": 838.0000534057617,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "e7c90529.4dc4f8",
+        "id": "efd50227.ac304",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`\" />\n",
         "comments": "",
-        "x": 2718.2496643066406,
-        "y": 65.00003147125244,
-        "z": "e0329916.b170f8",
+        "x": 2731.2496643066406,
+        "y": 99.00003147125244,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "50dc0542.4371cc",
+        "id": "d82a2a82.f5e938",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n",
         "comments": "",
-        "x": 1717.5055389404297,
-        "y": 668.0284957885742,
-        "z": "e0329916.b170f8",
+        "x": 1730.5055389404297,
+        "y": 702.0284957885742,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "3377addc.d013aa",
+        "id": "f0c20005.cbb8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call  createAccessConnectivityService\" />\n",
         "comments": "",
-        "x": 1847.1422576904297,
-        "y": 790.8467025756836,
-        "z": "e0329916.b170f8",
+        "x": 1860.1422576904297,
+        "y": 824.8467025756836,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "c2ab02c3.18a528",
+        "id": "5e38308f.370118",
         "type": "save",
         "name": "save:generic-vnf",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name=  \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name=  \"vnf-type\" value = \"AccessConnectivity\"/>\n<parameter name=  \"service-id\" value = \"`$vnf-topology-operation-input.service-information.service-id`\"/>\n<parameter name=  \"prov-status\" value = \"ACTIVE\"/>\n<parameter name=  \"orchestration-status\" value = \"Active\"/>\n<parameter name=  \"is-closed-loop-disabled\" value = \"false\" />\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=  \"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1492.2832126617432,
-        "y": 1232.032096862793,
-        "z": "e0329916.b170f8",
+        "x": 1506.283203125,
+        "y": 1264.0321044921875,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "7b50f775.bd98f8",
-                "57259626.7849c",
-                "e87076a5.810bc8"
+                "6773274d.45a418",
+                "cfe6b7ff.d9f358",
+                "fafcc8c3.49e96"
             ]
         ]
     },
     {
-        "id": "7b50f775.bd98f8",
+        "id": "6773274d.45a418",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1728.5050678253174,
-        "y": 1103.9208545684814,
-        "z": "e0329916.b170f8",
+        "x": 1741.5050678253174,
+        "y": 1137.9208545684814,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "929e3be2.0040b8"
+                "a8a66d.ee4ae19"
             ]
         ]
     },
     {
-        "id": "57259626.7849c",
+        "id": "cfe6b7ff.d9f358",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1739.4808864593506,
-        "y": 1163.9367108345032,
-        "z": "e0329916.b170f8",
+        "x": 1752.4808864593506,
+        "y": 1197.9367108345032,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "4d0490a4.dc1d78"
+                "2eb6f04a.49f0a"
             ]
         ]
     },
     {
-        "id": "929e3be2.0040b8",
+        "id": "a8a66d.ee4ae19",
         "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=\"Failure calling AAI to save generic-vnf\" />\n",
         "comments": "",
-        "x": 1964.6476154327393,
-        "y": 1103.4923195838928,
-        "z": "e0329916.b170f8",
+        "x": 1977.6476154327393,
+        "y": 1137.4923195838928,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "4d0490a4.dc1d78",
+        "id": "2eb6f04a.49f0a",
         "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=\"generic-vnf instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1959.528413772583,
-        "y": 1164.413025379181,
-        "z": "e0329916.b170f8",
+        "x": 1972.528413772583,
+        "y": 1198.413025379181,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "e87076a5.810bc8",
+        "id": "fafcc8c3.49e96",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.0916919708252,
-        "y": 1229.0631909370422,
-        "z": "e0329916.b170f8",
+        "x": 1746.0916919708252,
+        "y": 1263.0631909370422,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "f68ce26b.06d55",
+        "id": "f142de1d.601888",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1941.0919456481934,
-        "y": 1227.063320159912,
-        "z": "e0329916.b170f8",
+        "x": 1954.0919456481934,
+        "y": 1261.063320159912,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac883442.28d84",
+        "id": "717695ed.d653b4",
         "type": "save",
         "name": "save:metadata",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  \n\tAND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n\t  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n\t  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\"\n    >\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"remote-id\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.remote_id`\" />\n    <parameter name=\"metadata.metadatum[1].metaname\" value=\"controller-service-id\" />\n    <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.serviceID`\" />\n    <parameter name=\"metadata.metadatum[2].metaname\" value=\"cvlan\" />\n    <parameter name=\"metadata.metadatum[2].metaval\" value=\"`$prop.bbs.CVLAN`\" />\n    <parameter name=\"metadata.metadatum[3].metaname\" value=\"svlan\" />\n    <parameter name=\"metadata.metadatum[3].metaval\" value=\"`$prop.bbs.SVLAN`\" />\n    <parameter name=\"metadata.metadatum[4].metaname\" value=\"expected-ont-id\" />\n    <parameter name=\"metadata.metadatum[4].metaval\" value=\"`$prop.bbs.ONTSN`\" />\n    <!--<parameter name=\"metadata.metadatum[5].metaname\" value=\"rgw-mac-address\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaval\" value=\"`$prop.bbs.mac`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1473.7825393676758,
-        "y": 1395.031925201416,
-        "z": "e0329916.b170f8",
+        "x": 1486.782470703125,
+        "y": 1434.0318603515625,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "eafd77cb.b8397",
-                "1f25a38e.70d264",
-                "7db9333e.87da9c"
+                "90f289c9.afda58",
+                "490b0a19.59868c",
+                "63ec1381.7af084"
             ]
         ]
     },
     {
-        "id": "eafd77cb.b8397",
+        "id": "90f289c9.afda58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1704.2580490112305,
-        "y": 1326.3965287208557,
-        "z": "e0329916.b170f8",
+        "x": 1717.2580490112305,
+        "y": 1360.3965287208557,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "f5714bd.89e15b8"
+                "e039528f.e88268"
             ]
         ]
     },
     {
-        "id": "1f25a38e.70d264",
+        "id": "490b0a19.59868c",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1716.2342109680176,
-        "y": 1396.412462234497,
-        "z": "e0329916.b170f8",
+        "x": 1729.2342109680176,
+        "y": 1430.412462234497,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "2a90de57.54b0d2"
+                "8c5a3cb9.2f5608"
             ]
         ]
     },
     {
-        "id": "f5714bd.89e15b8",
+        "id": "e039528f.e88268",
         "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=\"Failure calling AAI to save metadatum\" />\n",
         "comments": "",
-        "x": 1944.4008445739746,
-        "y": 1324.9680304527283,
-        "z": "e0329916.b170f8",
+        "x": 1957.4008445739746,
+        "y": 1358.9680304527283,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "2a90de57.54b0d2",
+        "id": "8c5a3cb9.2f5608",
         "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=\"metadatum instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1941.281744003296,
-        "y": 1395.8886985778809,
-        "z": "e0329916.b170f8",
+        "x": 1954.281744003296,
+        "y": 1429.8886985778809,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "7db9333e.87da9c",
+        "id": "63ec1381.7af084",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1710.8449211120605,
-        "y": 1466.5389018058777,
-        "z": "e0329916.b170f8",
+        "x": 1723.8449211120605,
+        "y": 1500.5389018058777,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "223cf7d5.348cb8",
+        "id": "78cc77f3.b1e2f8",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save metadatum success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1921.8449211120605,
-        "y": 1466.5389018058777,
-        "z": "e0329916.b170f8",
+        "x": 1934.8449211120605,
+        "y": 1500.5389018058777,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "48d2f628.580118",
+        "id": "4fe300f9.717bd",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1187.4168128967285,
-        "y": 1106.0006484985352,
-        "z": "e0329916.b170f8",
+        "x": 1200.4168128967285,
+        "y": 1140.0006484985352,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "c2ab02c3.18a528",
-                "ac883442.28d84",
-                "b153daf9.f98aa",
-                "74332c3b.90a3c4",
-                "e193ec3.bce899"
+                "5e38308f.370118",
+                "717695ed.d653b4",
+                "b8fc79ed.565",
+                "f65c3b6d.d69a38",
+                "f01db867.d36098",
+                "8fa4935d.532fd"
             ]
         ]
     },
     {
-        "id": "b153daf9.f98aa",
+        "id": "b8fc79ed.565",
         "type": "set",
         "name": "set:variables",
-        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n",
+        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n\n\n\n<!--<set>-->\n<!--<parameter name='vnf-id' value=\"123456789\"/>-->\n<!--<parameter name='vnf-name' value=\"vnf_name\"/>-->",
         "comments": "",
-        "x": 1476.4172821044922,
-        "y": 1110.333641052246,
-        "z": "e0329916.b170f8",
+        "x": 1489.4172821044922,
+        "y": 1144.333641052246,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "74332c3b.90a3c4",
+        "id": "f65c3b6d.d69a38",
         "type": "execute",
         "name": "execute:generate",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n    <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1496.7817077636719,
-        "y": 1026.0316162109375,
-        "z": "e0329916.b170f8",
+        "x": 1509.7817077636719,
+        "y": 1060.0316162109375,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "5f8abaa7.bb84f4"
+                "48ab2a4c.2a241c"
             ]
         ]
     },
     {
-        "id": "5f8abaa7.bb84f4",
+        "id": "48ab2a4c.2a241c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1732.781421661377,
-        "y": 1030.0315780639648,
-        "z": "e0329916.b170f8",
+        "x": 1745.781421661377,
+        "y": 1064.0315780639648,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "d24b114c.00fb78"
+                "fdd1ef38.730528"
             ]
         ]
     },
     {
-        "id": "d24b114c.00fb78",
+        "id": "fdd1ef38.730528",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n    <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n    <parameter name=\"regex\" value=\"-\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1919.7814769744873,
-        "y": 1029.0314865112305,
-        "z": "e0329916.b170f8",
+        "x": 1932.7814769744873,
+        "y": 1063.0314865112305,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "c28eecff.183408"
+                "2eaae9b6.ab1ec6"
             ]
         ]
     },
     {
-        "id": "bd5c3172.606e3",
+        "id": "97bc6eeb.c32ca8",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2251.781539916992,
-        "y": 1027.0315475463867,
-        "z": "e0329916.b170f8",
+        "x": 2264.781539916992,
+        "y": 1061.0315475463867,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "c28eecff.183408",
+        "id": "2eaae9b6.ab1ec6",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2086.781415939331,
-        "y": 1028.0315170288086,
-        "z": "e0329916.b170f8",
+        "x": 2099.781415939331,
+        "y": 1062.0315170288086,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
     },
     {
-        "id": "c2dbfb5a.03777",
+        "id": "4538034.6a1697c",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"`$service-result.accessE2Eservice.serviceID`\"/>\n",
         "comments": "",
-        "x": 2469.78129196167,
-        "y": 880.0314292907715,
-        "z": "e0329916.b170f8",
+        "x": 2482.78129196167,
+        "y": 914.0314292907715,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "80452a04.8e8ca8",
+        "id": "adcd38ea.8cbb8",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"HSI20190330\"/>\n\n",
         "comments": "",
-        "x": 1166.0831298828125,
-        "y": 869.333381652832,
-        "z": "e0329916.b170f8",
+        "x": 1179.0831298828125,
+        "y": 903.333381652832,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "e193ec3.bce899",
+        "id": "f01db867.d36098",
         "type": "save",
         "name": "save:relationship",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n      key=\"service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type \n         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-id`\" />\n ",
         "comments": "",
         "outputs": 1,
-        "x": 1480.25,
-        "y": 1585.0312519073486,
-        "z": "e0329916.b170f8",
+        "x": 1493.25,
+        "y": 1619.0312519073486,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "8b7cfe7c.bb05c",
-                "605adc34.dc45b4",
-                "c57b41f2.edd368"
+                "afb1797d.cb3048",
+                "eb0ddaae.dc5158",
+                "7a2e5f09.7f4db8"
             ]
         ]
     },
     {
-        "id": "8b7cfe7c.bb05c",
+        "id": "afb1797d.cb3048",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.25,
-        "y": 1538.0312519073486,
-        "z": "e0329916.b170f8",
+        "x": 1744.25,
+        "y": 1572.0312519073486,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "11122765.99c301"
+                "7b869183.1a645"
             ]
         ]
     },
     {
-        "id": "605adc34.dc45b4",
+        "id": "eb0ddaae.dc5158",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1743.226161956787,
-        "y": 1608.04718542099,
-        "z": "e0329916.b170f8",
+        "x": 1756.226161956787,
+        "y": 1642.04718542099,
+        "z": "f70766ca.3cc678",
         "wires": [
             [
-                "8cd2a407.0333e"
+                "38d0b39a.587ff4"
             ]
         ]
     },
     {
-        "id": "11122765.99c301",
+        "id": "7b869183.1a645",
         "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=\"Failure calling AAI to save metadatum\" />\n",
         "comments": "",
-        "x": 1971.3927955627441,
-        "y": 1536.6027536392212,
-        "z": "e0329916.b170f8",
+        "x": 1984.3927955627441,
+        "y": 1570.6027536392212,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "8cd2a407.0333e",
+        "id": "38d0b39a.587ff4",
         "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=\"metadatum instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1968.2736949920654,
-        "y": 1607.5234217643738,
-        "z": "e0329916.b170f8",
+        "x": 1981.2736949920654,
+        "y": 1641.5234217643738,
+        "z": "f70766ca.3cc678",
         "wires": []
     },
     {
-        "id": "c57b41f2.edd368",
+        "id": "7a2e5f09.7f4db8",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1737.83687210083,
-        "y": 1678.1736249923706,
-        "z": "e0329916.b170f8",
+        "x": 1750.83687210083,
+        "y": 1712.1736249923706,
+        "z": "f70766ca.3cc678",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8fa4935d.532fd",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='`$vnf-id`'/>\n        <parameter name='field2' value='`$vnf-name`'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 1485.75,
+        "y": 1202.75,
+        "z": "f70766ca.3cc678",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
index 6f8e291..a79e551 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "bc4c5d4f.d1f19",
+        "id": "50a67ae4.f839b4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 102.75,
-        "y": 220.99998664855957,
-        "z": "910bbedd.5fbce8",
+        "x": 112.75,
+        "y": 248.99998664855957,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "38c45b07.ed34e4"
+                "8c4d28e3.3d9228"
             ]
         ]
     },
     {
-        "id": "38c45b07.ed34e4",
+        "id": "8c4d28e3.3d9228",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,907 +22,1055 @@
         "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": 490.74988174438477,
-        "y": 220.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 500.74988174438477,
+        "y": 248.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "c3a71c48.0be57"
+                "ae1bacc1.ffae38"
             ]
         ]
     },
     {
-        "id": "c3a71c48.0be57",
+        "id": "ae1bacc1.ffae38",
         "type": "method",
         "name": "method:bbs-access-connectivity-vnf-topology-operation-delete-huawei",
         "xml": "<method rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 453.74988174438477,
-        "y": 339.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 463.74988174438477,
+        "y": 367.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1015d7d8.bba218"
+                "8f0f1a37.8524f"
             ]
         ]
     },
     {
-        "id": "1015d7d8.bba218",
+        "id": "8f0f1a37.8524f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 851.7499885559082,
-        "y": 338.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 861.7499885559082,
+        "y": 366.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "6803db15.0d8f74",
-                "681e5161.fa20d",
-                "a6b40423.ac2ca8",
-                "374f03c.b97d77c",
-                "2e181216.27ccce",
-                "188e79ba.5e9486",
-                "b4b9141a.0cfd8",
-                "653e84f8.bbdd14",
-                "d2d50667.fd62f"
+                "43644918.03e07",
+                "42fda2d0.76f41c",
+                "4e268208.631d44",
+                "69c9714c.cf11e8",
+                "11cb07e5.7a595",
+                "e5fc51e8.1b1648",
+                "4cec8b98.59d954",
+                "1ed9b62e.1ea66a",
+                "4553b0f0.66d808"
             ]
         ]
     },
     {
-        "id": "6803db15.0d8f74",
+        "id": "43644918.03e07",
         "type": "execute",
         "name": "excute:readProperties",
         "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\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293.750286102295,
-        "y": 193.1110725402832,
-        "z": "910bbedd.5fbce8",
+        "x": 1303.750286102295,
+        "y": 221.1110725402832,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "188e79ba.5e9486",
+        "id": "11cb07e5.7a595",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.7503089904785,
-        "y": 414.9999179840088,
-        "z": "910bbedd.5fbce8",
+        "x": 1307.7503089904785,
+        "y": 442.9999179840088,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "d9d4b7b.6b23c48"
+                "8c1190d8.e53ea8"
             ]
         ]
     },
     {
-        "id": "2e181216.27ccce",
+        "id": "1ed9b62e.1ea66a",
         "type": "execute",
         "name": "execute:querryTokenID",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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\n",
         "comments": "",
         "outputs": 1,
-        "x": 1288.7503089904785,
-        "y": 324.9999942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 1298.7503089904785,
+        "y": 352.9999942779541,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "4f1fa17d.4f00e8",
-                "b7d32671.97a41"
+                "2da3f536.1b688a",
+                "20548f37.043398"
             ]
         ]
     },
     {
-        "id": "b7d32671.97a41",
+        "id": "20548f37.043398",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1587.916934967041,
-        "y": 321.2499942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 1597.916934967041,
+        "y": 349.2499942779541,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "21337368.af64c4"
+                "d327513e.748c98"
             ]
         ]
     },
     {
-        "id": "4f1fa17d.4f00e8",
+        "id": "2da3f536.1b688a",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1583.916934967041,
-        "y": 215.24996376037598,
-        "z": "910bbedd.5fbce8",
+        "x": 1593.916934967041,
+        "y": 243.24996376037598,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "d9ad86f3.bd8048"
+                "c871cfbd.770c88"
             ]
         ]
     },
     {
-        "id": "5ebb3e61.f6be88",
+        "id": "945a8775.908c38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n",
         "comments": "",
-        "x": 2131.0307388305664,
-        "y": 263.6136484146118,
-        "z": "910bbedd.5fbce8",
+        "x": 2141.0307388305664,
+        "y": 291.6136484146118,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "4f940f96.eff4d",
+        "id": "214124fe.28a844",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1954.750316619873,
-        "y": 263.99995040893555,
-        "z": "910bbedd.5fbce8",
+        "x": 1964.750316619873,
+        "y": 291.99995040893555,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "5ebb3e61.f6be88"
+                "945a8775.908c38"
             ]
         ]
     },
     {
-        "id": "21337368.af64c4",
+        "id": "d327513e.748c98",
         "type": "switchNode",
         "name": "switch:token ",
         "xml": "<switch test='`$token-result.accessSession`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1783.7503356933594,
-        "y": 322.99993896484375,
-        "z": "910bbedd.5fbce8",
+        "x": 1793.7503356933594,
+        "y": 350.99993896484375,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "4f940f96.eff4d",
-                "c7c2da18.3fe03"
+                "214124fe.28a844",
+                "2fdd4ce5.71326c"
             ]
         ]
     },
     {
-        "id": "c7c2da18.3fe03",
+        "id": "2fdd4ce5.71326c",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1955.750316619873,
-        "y": 320.99995040893555,
-        "z": "910bbedd.5fbce8",
+        "x": 1965.750316619873,
+        "y": 348.99995040893555,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "626983c2.287bfc"
+                "fbc821f0.a549f"
             ]
         ]
     },
     {
-        "id": "626983c2.287bfc",
+        "id": "fbc821f0.a549f",
         "type": "set",
         "name": "set:token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
         "comments": "",
-        "x": 2130.2503089904785,
-        "y": 320.2499942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 2140.2503089904785,
+        "y": 348.2499942779541,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "8811eeaf.bc7fe",
+        "id": "5c8c6071.aaf938",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Get token rest api\" />\n    <parameter name=\"field3\" value=\"`$token-result.accessSession`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2341.7503089904785,
-        "y": 317.99993324279785,
-        "z": "910bbedd.5fbce8",
+        "x": 2351.7503089904785,
+        "y": 345.99993324279785,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "374f03c.b97d77c",
+        "id": "69c9714c.cf11e8",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />\n",
         "comments": "",
-        "x": 1259.750286102295,
-        "y": 113.00014877319336,
-        "z": "910bbedd.5fbce8",
+        "x": 1269.750286102295,
+        "y": 141.00014877319336,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "d2d50667.fd62f",
+        "id": "4553b0f0.66d808",
         "type": "execute",
         "name": "execute:deleteAccessConnectivityService",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`\" />\n    <parameter name=\"httpMethod\" value=\"get\"/>\n    <parameter name=\"contentType\" value=\"application/x-www-form-urlencoded\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.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": 1353.7506103515625,
-        "y": 562.0001220703125,
-        "z": "910bbedd.5fbce8",
+        "x": 1363.7506103515625,
+        "y": 591.0001220703125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "6a07c07d.4ffc58",
-                "3aea3fb0.9f27a8"
+                "bf6b3671.2756a",
+                "1076d0a3.80b937"
             ]
         ]
     },
     {
-        "id": "6a07c07d.4ffc58",
+        "id": "bf6b3671.2756a",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.750587463379,
-        "y": 535.000078201294,
-        "z": "910bbedd.5fbce8",
+        "x": 1664.750587463379,
+        "y": 563.000078201294,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "144af758.7f6181"
+                "7a0848b.2a313b8"
             ]
         ]
     },
     {
-        "id": "3aea3fb0.9f27a8",
+        "id": "1076d0a3.80b937",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.750560760498,
-        "y": 594.0000779628754,
-        "z": "910bbedd.5fbce8",
+        "x": 1664.750560760498,
+        "y": 622.0000779628754,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "47b72aff.6069ec"
+                "82dbdb0e.16fa7"
             ]
         ]
     },
     {
-        "id": "106fbc3e.7d35bc",
+        "id": "1630bf82.421768",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2140.7506713867188,
-        "y": 491.00001215934753,
-        "z": "910bbedd.5fbce8",
+        "x": 2150.7506713867188,
+        "y": 519.0000121593475,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "bdf75bc7.7d075"
+                "e19eb5c1.ad428"
             ]
         ]
     },
     {
-        "id": "bdf75bc7.7d075",
+        "id": "e19eb5c1.ad428",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'\" />\n",
         "comments": "",
-        "x": 2325.6596183776855,
-        "y": 490.90906524658203,
-        "z": "910bbedd.5fbce8",
+        "x": 2335.6596183776855,
+        "y": 518.909065246582,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "d9d4b7b.6b23c48",
+        "id": "8c1190d8.e53ea8",
         "type": "switchNode",
         "name": "switch:serviceID",
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'serviceID'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1572.7503356933594,
-        "y": 414.0000057220459,
-        "z": "910bbedd.5fbce8",
+        "x": 1582.7503356933594,
+        "y": 442.0000057220459,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "750b21bf.a6927"
+                "c845d3ac.90b5f"
             ]
         ]
     },
     {
-        "id": "750b21bf.a6927",
+        "id": "c845d3ac.90b5f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1745.750220298767,
-        "y": 413.00000381469727,
-        "z": "910bbedd.5fbce8",
+        "x": 1755.750220298767,
+        "y": 441.00000381469727,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1f68191d.946c67"
+                "f1b18887.5bf5d"
             ]
         ]
     },
     {
-        "id": "36a67602.b4e502",
+        "id": "ecdde1e1.45e498",
         "type": "set",
         "name": "set:serviceID",
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2316.750186920166,
-        "y": 412.6000156402588,
-        "z": "910bbedd.5fbce8",
+        "x": 2326.750186920166,
+        "y": 440.6000156402588,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "1f68191d.946c67",
+        "id": "f1b18887.5bf5d",
         "type": "switchNode",
         "name": "switch:serviceID value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927.8984375,
-        "y": 412.7776794433594,
-        "z": "910bbedd.5fbce8",
+        "x": 1937.8984375,
+        "y": 440.7776794433594,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "ea1ff2ea.50521",
-                "106fbc3e.7d35bc"
+                "f1cd57aa.dc8a3",
+                "1630bf82.421768"
             ]
         ]
     },
     {
-        "id": "ea1ff2ea.50521",
+        "id": "f1cd57aa.dc8a3",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2134.898380279541,
-        "y": 413.77768898010254,
-        "z": "910bbedd.5fbce8",
+        "x": 2144.898380279541,
+        "y": 441.77768898010254,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "36a67602.b4e502"
+                "ecdde1e1.45e498"
             ]
         ]
     },
     {
-        "id": "681e5161.fa20d",
+        "id": "42fda2d0.76f41c",
         "type": "call",
         "name": "call:validate-bbs-vnf-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1364.2499694824219,
-        "y": 47,
-        "z": "910bbedd.5fbce8",
+        "x": 1374.2499694824219,
+        "y": 75,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "47b72aff.6069ec",
+        "id": "82dbdb0e.16fa7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1831.250358581543,
-        "y": 595.000256061554,
-        "z": "910bbedd.5fbce8",
+        "x": 1841.250358581543,
+        "y": 623.000256061554,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "303e36f6.0c3352"
+                "d761f212.3ca11"
             ]
         ]
     },
     {
-        "id": "303e36f6.0c3352",
+        "id": "d761f212.3ca11",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2049.2502365112305,
-        "y": 594.0001034736633,
-        "z": "910bbedd.5fbce8",
+        "x": 2059.2502365112305,
+        "y": 622.0001034736633,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "68e091fa.27fed8",
-                "ab19b7c4.709eb"
+                "9ce0fa8e.22b3c8",
+                "fcb1db5c.d009c8"
             ]
         ]
     },
     {
-        "id": "68e091fa.27fed8",
+        "id": "9ce0fa8e.22b3c8",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2283.2502822875977,
-        "y": 595.000063419342,
-        "z": "910bbedd.5fbce8",
+        "x": 2293.2502822875977,
+        "y": 623.000063419342,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "8fc10bf.11b3578"
+                "c827fe2.329a4"
             ]
         ]
     },
     {
-        "id": "ab19b7c4.709eb",
+        "id": "fcb1db5c.d009c8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.2502822875977,
-        "y": 681.000063419342,
-        "z": "910bbedd.5fbce8",
+        "x": 2295.2502822875977,
+        "y": 709.000063419342,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "40892b06.efda94"
+                "c261effb.9c1048"
             ]
         ]
     },
     {
-        "id": "301afc46.923fdc",
+        "id": "1a069d6d.a6538b",
         "type": "record",
         "name": "log error",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"deleteAccessConnectivityService falied!\" />\n    <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n    <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n    <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2723.25044631958,
-        "y": 582.0000801086426,
-        "z": "910bbedd.5fbce8",
+        "x": 2733.25044631958,
+        "y": 610.0000801086426,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6b40423.ac2ca8",
+        "id": "4e268208.631d44",
         "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": 1257.2501220703125,
-        "y": 1178,
-        "z": "910bbedd.5fbce8",
+        "x": 1267.2501220703125,
+        "y": 1206,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "8fc10bf.11b3578",
+        "id": "c827fe2.329a4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />\n\n",
         "comments": "",
-        "x": 2483.24995803833,
-        "y": 594.9999980926514,
-        "z": "910bbedd.5fbce8",
+        "x": 2493.24995803833,
+        "y": 622.9999980926514,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "40892b06.efda94",
+        "id": "c261effb.9c1048",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2469.2499771118164,
-        "y": 680.2726716995239,
-        "z": "910bbedd.5fbce8",
+        "x": 2479.2499771118164,
+        "y": 708.2726716995239,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9ad86f3.bd8048",
+        "id": "c871cfbd.770c88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n",
         "comments": "",
-        "x": 1776.414794921875,
-        "y": 218.1193084716797,
-        "z": "910bbedd.5fbce8",
+        "x": 1786.414794921875,
+        "y": 246.1193084716797,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "144af758.7f6181",
+        "id": "7a0848b.2a313b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call deleteAccessConnectivityService\" />\n",
         "comments": "",
-        "x": 1825.022705078125,
-        "y": 533.3635730743408,
-        "z": "910bbedd.5fbce8",
+        "x": 1835.022705078125,
+        "y": 561.3635730743408,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "b6c16596.5c7c28",
+        "id": "9dd837d6.036ee",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2688.250503540039,
-        "y": 678.000147819519,
-        "z": "910bbedd.5fbce8",
+        "x": 2698.250503540039,
+        "y": 706.000147819519,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "653e84f8.bbdd14",
+        "id": "4cec8b98.59d954",
         "type": "update",
         "name": "deleteResourceAAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.accessConnectivityVNFId\">",
         "comments": "",
         "outputs": 1,
-        "x": 1277.5,
-        "y": 1009.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1287.5,
+        "y": 1037.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "b41b6e9c.1adb4",
-                "88408d5b.2bbfc"
+                "bb87a673.eda418",
+                "8b446a24.a509"
             ]
         ]
     },
     {
-        "id": "f48317c3.07c1f8",
+        "id": "c9478f65.f0c428",
         "type": "comment",
         "name": "delete resource from AAI",
         "info": "",
         "comments": "",
-        "x": 1289.5,
-        "y": 831.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1299.5,
+        "y": 859.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "1310b851.c4289",
+        "id": "4012c344.81d004",
         "type": "for",
         "name": "for relationship-list",
         "xml": "<for silentFailure='true' index='ridx' start='0' end=\"`$aai.service-instance.relationship-list.relationship_length`\" >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1897.2501983642578,
-        "y": 801.0040102005005,
-        "z": "910bbedd.5fbce8",
+        "x": 1907.250244140625,
+        "y": 832.0040283203125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "ae25bd57.d493d"
+                "63765b59.e71844"
             ]
         ]
     },
     {
-        "id": "2fcbbd67.547f72",
+        "id": "44d85dcd.180994",
         "type": "comment",
         "name": "get generic-vnf of type AccessConnectivity",
         "info": "",
         "comments": "",
-        "x": 1965.2501068115234,
-        "y": 754.0039329528809,
-        "z": "910bbedd.5fbce8",
+        "x": 1975.2501068115234,
+        "y": 782.0039329528809,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "b4b9141a.0cfd8",
+        "id": "e5fc51e8.1b1648",
         "type": "update",
         "name": "get AAI service-instance",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-instance\" \n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\"\n        pfx='aai.service-instance' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1290.25,
-        "y": 748.0040283203125,
-        "z": "910bbedd.5fbce8",
+        "x": 1300.25,
+        "y": 776.0040283203125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "cb45bd7f.6bb5c",
-                "f400169e.cf5978"
+                "b69b0c92.e4152",
+                "a389294b.9f1638"
             ]
         ]
     },
     {
-        "id": "55a732ae.2107cc",
+        "id": "862bb762.1570c8",
         "type": "comment",
         "name": "fetch relationship-list",
         "info": "",
         "comments": "",
-        "x": 1281.25,
-        "y": 635.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1291.25,
+        "y": 663.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "cb45bd7f.6bb5c",
+        "id": "b69b0c92.e4152",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1550.250244140625,
-        "y": 695.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1560.250244140625,
+        "y": 723.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7f971e3d.47d1a"
+                "e03f1216.bc1b2"
             ]
         ]
     },
     {
-        "id": "7f971e3d.47d1a",
+        "id": "e03f1216.bc1b2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1728.25,
-        "y": 699.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1738.25,
+        "y": 727.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "f400169e.cf5978",
+        "id": "a389294b.9f1638",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544.5001029968262,
-        "y": 800.7538871765137,
-        "z": "910bbedd.5fbce8",
+        "x": 1554.5001029968262,
+        "y": 828.7538871765137,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "52fa2c61.864a04"
+                "f1c18dab.afcd68"
             ]
         ]
     },
     {
-        "id": "52fa2c61.864a04",
+        "id": "f1c18dab.afcd68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1709.500072479248,
-        "y": 800.7539024353027,
-        "z": "910bbedd.5fbce8",
+        "x": 1719.500072479248,
+        "y": 828.7539024353027,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1310b851.c4289"
+                "4012c344.81d004",
+                "4ce2100a.cd1018"
             ]
         ]
     },
     {
-        "id": "ae25bd57.d493d",
+        "id": "63765b59.e71844",
         "type": "for",
         "name": "for relationship data",
         "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2104.500244140625,
-        "y": 801.7539672851562,
-        "z": "910bbedd.5fbce8",
+        "x": 2114.500244140625,
+        "y": 829.7539672851562,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "f5970165.f7806"
+                "f31414d1.f162e"
             ]
         ]
     },
     {
-        "id": "8a56e636.4f7278",
+        "id": "c8550193.b4c99",
         "type": "switchNode",
         "name": "switch vnf-id",
         "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2368.5000228881836,
-        "y": 803.7539052963257,
-        "z": "910bbedd.5fbce8",
+        "x": 2378.5000228881836,
+        "y": 831.7539052963257,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "75f76578.cb5554"
+                "d09ca3d4.f11cb8"
             ]
         ]
     },
     {
-        "id": "75f76578.cb5554",
+        "id": "d09ca3d4.f11cb8",
         "type": "other",
         "name": "generic-vnf.vnf-id",
         "xml": "<outcome value='generic-vnf.vnf-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2561.5,
-        "y": 802.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 2571.5,
+        "y": 830.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "dead2f7a.e665e8"
+                "d0762f0e.84e988"
             ]
         ]
     },
     {
-        "id": "dead2f7a.e665e8",
+        "id": "d0762f0e.84e988",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2746.4999923706055,
-        "y": 802.7539052963257,
-        "z": "910bbedd.5fbce8",
+        "x": 2756.4999923706055,
+        "y": 830.7539052963257,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "eae921f2.e87618"
+                "34276a74.16485e"
             ]
         ]
     },
     {
-        "id": "eae921f2.e87618",
+        "id": "34276a74.16485e",
         "type": "update",
         "name": "get AAI generic-vnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n        pfx='aai.generic-vnf' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2954,
-        "y": 803.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 2964,
+        "y": 831.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "b9ebb66b.17626"
+                "7e789cdf.3df4bc"
             ]
         ]
     },
     {
-        "id": "7851584b.b526c8",
+        "id": "f49b4b0b.877478",
         "type": "switchNode",
         "name": "switch vnf-type",
         "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3426.5009765625,
-        "y": 882.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 3436.5009765625,
+        "y": 910.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "a3dcce28.fb6658"
+                "f85fda00.f58188"
             ]
         ]
     },
     {
-        "id": "a3dcce28.fb6658",
+        "id": "f85fda00.f58188",
         "type": "other",
         "name": "AccessConnectivity",
         "xml": "<outcome value='AccessConnectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3618.500648498535,
-        "y": 871.7539482116699,
-        "z": "910bbedd.5fbce8",
+        "x": 3628.500648498535,
+        "y": 899.7539482116699,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "bea7fa49.6293f"
+                "861f7d6b.55d1a"
             ]
         ]
     },
     {
-        "id": "bea7fa49.6293f",
+        "id": "861f7d6b.55d1a",
         "type": "set",
         "name": "set AccessConnectivity vnf-id",
         "xml": "<set>\n<parameter name='prop.bbs.accessConnectivityVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
         "comments": "",
-        "x": 3862.500160217285,
-        "y": 869.7538728713989,
-        "z": "910bbedd.5fbce8",
+        "x": 3872.500160217285,
+        "y": 897.7538728713989,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "88408d5b.2bbfc",
+        "id": "8b446a24.a509",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1495.5,
-        "y": 978.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1505.5,
+        "y": 1006.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "574ff2aa.24627c"
+                "25362798.cabad"
             ]
         ]
     },
     {
-        "id": "b41b6e9c.1adb4",
+        "id": "bb87a673.eda418",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1499.5,
-        "y": 1041.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1509.5,
+        "y": 1069.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "574ff2aa.24627c"
+                "25362798.cabad"
             ]
         ]
     },
     {
-        "id": "574ff2aa.24627c",
+        "id": "25362798.cabad",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1720.5,
-        "y": 1008.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1730.5,
+        "y": 1036.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "f5970165.f7806",
+        "id": "f31414d1.f162e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2254.75,
-        "y": 837.2539043426514,
-        "z": "910bbedd.5fbce8",
+        "x": 2264.75,
+        "y": 865.2539043426514,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "8a56e636.4f7278"
+                "c8550193.b4c99"
             ]
         ]
     },
     {
-        "id": "7ba155f0.72fa54",
+        "id": "8697252.ff47458",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3241.5000381469727,
-        "y": 878.2539186477661,
-        "z": "910bbedd.5fbce8",
+        "x": 3251.5000381469727,
+        "y": 906.2539186477661,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7851584b.b526c8"
+                "f49b4b0b.877478"
             ]
         ]
     },
     {
-        "id": "b9ebb66b.17626",
+        "id": "7e789cdf.3df4bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3144.5,
-        "y": 802.0039043426514,
-        "z": "910bbedd.5fbce8",
+        "x": 3154.5,
+        "y": 830.0039043426514,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7ba155f0.72fa54"
+                "8697252.ff47458"
+            ]
+        ]
+    },
+    {
+        "id": "4ce2100a.cd1018",
+        "type": "for",
+        "name": "for metadata",
+        "xml": "<for silentFailure='true' index='rix' start='0' end=\"`$aai.service-instance.metadata.metadatum_length`\" >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1891.75,
+        "y": 985.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "9a48ff0.faf94"
+            ]
+        ]
+    },
+    {
+        "id": "e9902840.bdfac8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2665,
+        "y": 1002.5,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "98e36478.8c4bd"
+            ]
+        ]
+    },
+    {
+        "id": "98e36478.8c4bd",
+        "type": "update",
+        "name": "deleteResourceAAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n        resource=\"service-instance\"\n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\n\t\t\tmetadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2908,
+        "y": 994.5,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c33a67af.a46208",
+        "type": "other",
+        "name": "remote-id",
+        "xml": "<outcome value='remote-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2339.24951171875,
+        "y": 935.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "ce821d55.1eb7d8",
+        "type": "other",
+        "name": "cvlan",
+        "xml": "<outcome value='cvlan'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.24951171875,
+        "y": 1031.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "9a48ff0.faf94",
+        "type": "switchNode",
+        "name": "switch meatname",
+        "xml": "<switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2081.25,
+        "y": 991.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "7fedf5ad.6ecc04",
+                "c33a67af.a46208",
+                "ce821d55.1eb7d8",
+                "28fb3bcc.e84bdc",
+                "7f75cdba.08b70c"
+            ]
+        ]
+    },
+    {
+        "id": "7fedf5ad.6ecc04",
+        "type": "other",
+        "name": "controller-service-id",
+        "xml": "<outcome value='controller-service-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2339.24951171875,
+        "y": 985.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "7f75cdba.08b70c",
+        "type": "other",
+        "name": "expected-ont-id",
+        "xml": "<outcome value='expected-ont-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.75,
+        "y": 1117.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "28fb3bcc.e84bdc",
+        "type": "other",
+        "name": "svlan",
+        "xml": "<outcome value='svlan'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2352.75,
+        "y": 1076.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
index 3623c26..271c3ef 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "30e08a8.30d50f6",
+        "id": "2827b574.5d0a5a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 109.75,
-        "y": 57.75,
-        "z": "f67d7469.c15c48",
+        "x": 88.75,
+        "y": 77,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "48f4fbce.5d31ac"
+                "140d5ce7.fff6d3"
             ]
         ]
     },
     {
-        "id": "48f4fbce.5d31ac",
+        "id": "140d5ce7.fff6d3",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,206 +22,250 @@
         "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": 417.74964904785156,
-        "y": 57.75002193450928,
-        "z": "f67d7469.c15c48",
+        "x": 396.74964904785156,
+        "y": 77.00002193450928,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "74687d07.30906c"
+                "a22a267b.703cc"
             ]
         ]
     },
     {
-        "id": "74687d07.30906c",
+        "id": "a22a267b.703cc",
         "type": "method",
         "name": "method:bbs-internet-profile-vnf-topology-operation-change-huawei",
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 415.74964904785156,
-        "y": 253.75006198883057,
-        "z": "f67d7469.c15c48",
+        "x": 394.74964904785156,
+        "y": 273.00006198883057,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "4da1c203.90ca44"
+                "ff51862c.680cf"
             ]
         ]
     },
     {
-        "id": "4da1c203.90ca44",
+        "id": "ff51862c.680cf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 822.7498626708984,
-        "y": 254.75006198883057,
-        "z": "f67d7469.c15c48",
+        "x": 801.7498626708984,
+        "y": 274.00006198883057,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "dd2b33a2.9b6cb8",
-                "562f3ae4.b70bec",
-                "39abed71.23fa8a"
+                "4bd5e314.3dca5c",
+                "eb68bb85.4ef888",
+                "21691e47.3dfbe2",
+                "5fb0bbe8.44e5cc",
+                "1dfe4746.2621f9"
             ]
         ]
     },
     {
-        "id": "562f3ae4.b70bec",
+        "id": "1dfe4746.2621f9",
         "type": "execute",
         "name": "execute:ChangeInternetProfileInstance",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1149.75,
-        "y": 255.75,
-        "z": "f67d7469.c15c48",
+        "x": 1119.75,
+        "y": 272,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "218b60aa.c94c1",
-                "4970adb.e3682d4"
+                "8f54d9cf.14791",
+                "cb1b12c0.cbc068"
             ]
         ]
     },
     {
-        "id": "4970adb.e3682d4",
+        "id": "cb1b12c0.cbc068",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1451.0829811096191,
-        "y": 255.75,
-        "z": "f67d7469.c15c48",
+        "x": 1430.0829811096191,
+        "y": 275,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "651aa8da.9f2b6"
+                "64b06154.bbf13"
             ]
         ]
     },
     {
-        "id": "218b60aa.c94c1",
+        "id": "8f54d9cf.14791",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1460.082893371582,
-        "y": 330.75000190734863,
-        "z": "f67d7469.c15c48",
+        "x": 1439.082893371582,
+        "y": 350.00000190734863,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "ac4ee16c.6acf"
+                "da2a9799.3fd878"
             ]
         ]
     },
     {
-        "id": "ac4ee16c.6acf",
-        "type": "switchNode",
-        "name": "switch:service-result",
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1695.0990142822266,
-        "y": 329.78929710388184,
-        "z": "f67d7469.c15c48",
-        "wires": [
-            [
-                "7fde3fda.e84e4",
-                "b0522dad.def458"
-            ]
-        ]
-    },
-    {
-        "id": "651aa8da.9f2b6",
+        "id": "64b06154.bbf13",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call ChangeInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 1960.0165939331055,
-        "y": 256.03954792022705,
-        "z": "f67d7469.c15c48",
+        "x": 1939.0165939331055,
+        "y": 275.28954792022705,
+        "z": "db4a8a9e.7821b8",
         "wires": []
     },
     {
-        "id": "7fde3fda.e84e4",
+        "id": "eb68bb85.4ef888",
+        "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": 1051.598876953125,
+        "y": 608.039306640625,
+        "z": "db4a8a9e.7821b8",
+        "wires": []
+    },
+    {
+        "id": "4bd5e314.3dca5c",
+        "type": "call",
+        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1210.765869140625,
+        "y": 191.03915405273438,
+        "z": "db4a8a9e.7821b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "21691e47.3dfbe2",
+        "type": "call",
+        "name": "call bbs-internet-profile-vnf-topology-operation-delete-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1208.75,
+        "y": 406.75,
+        "z": "db4a8a9e.7821b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5fb0bbe8.44e5cc",
+        "type": "call",
+        "name": "call bbs-internet-profile-vnf-topology-operation-create-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1208,
+        "y": 491.75,
+        "z": "db4a8a9e.7821b8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "da2a9799.3fd878",
+        "type": "switchNode",
+        "name": "switch:service-result",
+        "xml": "<switch test=\"`$service-result.status`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1641.75,
+        "y": 345.75,
+        "z": "db4a8a9e.7821b8",
+        "wires": [
+            [
+                "648e2996.26021",
+                "d5ee3d66.d58ce"
+            ]
+        ]
+    },
+    {
+        "id": "648e2996.26021",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1921.0993537902832,
-        "y": 330.78939056396484,
-        "z": "f67d7469.c15c48",
+        "x": 1867.7503395080566,
+        "y": 346.750093460083,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "26ffbe03.508d62"
+                "357ad26f.f6abce"
             ]
         ]
     },
     {
-        "id": "b0522dad.def458",
+        "id": "d5ee3d66.d58ce",
         "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
+        "name": "ok",
+        "xml": "<outcome value='ok'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1931.0990600585938,
-        "y": 416.78925704956055,
-        "z": "f67d7469.c15c48",
+        "x": 1876.7501068115234,
+        "y": 432.7499485015869,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             [
-                "5ce83dfd.6c2514"
+                "88d9f41b.15a318"
             ]
         ]
     },
     {
-        "id": "26ffbe03.508d62",
+        "id": "357ad26f.f6abce",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error ChangeInternetProfileInstance return: '+$service-result.status`\" />\n\n",
         "comments": "",
-        "x": 2107.599021911621,
-        "y": 330.78922748565674,
-        "z": "f67d7469.c15c48",
+        "x": 2054.2500076293945,
+        "y": 346.7499303817749,
+        "z": "db4a8a9e.7821b8",
         "wires": []
     },
     {
-        "id": "5ce83dfd.6c2514",
+        "id": "88d9f41b.15a318",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2089.2656898498535,
-        "y": 417.7892322540283,
-        "z": "f67d7469.c15c48",
+        "x": 2151.9166107177734,
+        "y": 429.7499485015869,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             []
         ]
     },
     {
-        "id": "39abed71.23fa8a",
-        "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": 1065.5989570617676,
-        "y": 337.7893257141113,
-        "z": "f67d7469.c15c48",
-        "wires": []
-    },
-    {
-        "id": "dd2b33a2.9b6cb8",
-        "type": "call",
-        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",
+        "id": "19293418.3b3464",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='my status`'/>\n        <parameter name='field2' value='status ok'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1251.765869140625,
-        "y": 169.78915786743164,
-        "z": "f67d7469.c15c48",
+        "x": 2155.6509857177734,
+        "y": 519.4607028961182,
+        "z": "db4a8a9e.7821b8",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
index 3bb1781..e0e2393 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "e24bd1dc.e94098",
+        "id": "d9de4964.2ddfb8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 93.75,
-        "y": 67,
-        "z": "ad46b000.c8324",
+        "x": 96.75,
+        "y": 48.75,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "4ea3eab3.ac826c"
+                "1a984b6b.c92bdd"
             ]
         ]
     },
     {
-        "id": "4ea3eab3.ac826c",
+        "id": "1a984b6b.c92bdd",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,601 +22,615 @@
         "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": 453.74964904785156,
-        "y": 68.00002193450928,
-        "z": "ad46b000.c8324",
+        "x": 456.74964904785156,
+        "y": 49.75002193450928,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "5c5c94c9.de2b2c"
+                "f48e46fa.493c48"
             ]
         ]
     },
     {
-        "id": "5c5c94c9.de2b2c",
+        "id": "f48e46fa.493c48",
         "type": "method",
         "name": "method:bbs-internet-profile-vnf-topology-operation-create-huawei",
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 448.7496643066406,
-        "y": 285.0000915527344,
-        "z": "ad46b000.c8324",
+        "x": 451.7496643066406,
+        "y": 266.7500915527344,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "f9739e65.c96bc8"
+                "c552944.716a168"
             ]
         ]
     },
     {
-        "id": "f9739e65.c96bc8",
+        "id": "c552944.716a168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 875.7498626708984,
-        "y": 287.0000991821289,
-        "z": "ad46b000.c8324",
+        "x": 878.7498626708984,
+        "y": 268.7500991821289,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "4406703d.473cb",
-                "24ad8f04.047a9",
-                "e22f8867.ca2c88",
-                "e451aa9.94334d8"
+                "93a57f35.ce30e",
+                "7cd9936c.a74f0c",
+                "28d2a60f.198f62",
+                "2a0a058a.d362aa"
             ]
         ]
     },
     {
-        "id": "4406703d.473cb",
+        "id": "93a57f35.ce30e",
         "type": "call",
         "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1391.7501525878906,
-        "y": 200.00001907348633,
-        "z": "ad46b000.c8324",
+        "x": 1394.7501525878906,
+        "y": 181.75001907348633,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e451aa9.94334d8",
+        "id": "2a0a058a.d362aa",
         "type": "execute",
         "name": "execute:CreateInternetProfileInstance",
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    \n    \n    \n    \n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1281.4007873535156,
-        "y": 285.9608345031738,
-        "z": "ad46b000.c8324",
+        "x": 1284.4007568359375,
+        "y": 286.7108459472656,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "8b4a24c2.b740e",
-                "ef3863e0.509128"
+                "4ac07c83.2f81c4",
+                "2e139f54.9e08a"
             ]
         ]
     },
     {
-        "id": "ef3863e0.509128",
+        "id": "2e139f54.9e08a",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1582.7337684631348,
-        "y": 285.9608345031738,
-        "z": "ad46b000.c8324",
+        "x": 1585.7337684631348,
+        "y": 267.7108345031738,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "7fe5ce9e.59b238"
+                "6994c9f.9e564b8"
             ]
         ]
     },
     {
-        "id": "8b4a24c2.b740e",
+        "id": "4ac07c83.2f81c4",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1591.7336807250977,
-        "y": 360.96083641052246,
-        "z": "ad46b000.c8324",
+        "x": 1594.7336807250977,
+        "y": 342.71083641052246,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "aa1c3229.429f2"
+                "b6053705.eb38f8"
             ]
         ]
     },
     {
-        "id": "aa1c3229.429f2",
-        "type": "switchNode",
-        "name": "switch:service-result",
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1826.7498016357422,
-        "y": 360.00013160705566,
-        "z": "ad46b000.c8324",
-        "wires": [
-            [
-                "c0c77be6.d8a9",
-                "6e05de0f.e6dcb8"
-            ]
-        ]
-    },
-    {
-        "id": "7fe5ce9e.59b238",
+        "id": "6994c9f.9e564b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call CreateInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 2095.000898361206,
-        "y": 286.250337600708,
-        "z": "ad46b000.c8324",
+        "x": 2098.000898361206,
+        "y": 268.000337600708,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "c0c77be6.d8a9",
-        "type": "outcome",
-        "name": "Other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2052.750141143799,
-        "y": 361.0002250671387,
-        "z": "ad46b000.c8324",
-        "wires": [
-            [
-                "d97a5f32.793c18"
-            ]
-        ]
-    },
-    {
-        "id": "6e05de0f.e6dcb8",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2062.7498474121094,
-        "y": 447.0000915527344,
-        "z": "ad46b000.c8324",
-        "wires": [
-            [
-                "637db1ee.358f3"
-            ]
-        ]
-    },
-    {
-        "id": "d97a5f32.793c18",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
-        "comments": "",
-        "x": 2239.2498092651367,
-        "y": 361.00006198883057,
-        "z": "ad46b000.c8324",
-        "wires": []
-    },
-    {
-        "id": "637db1ee.358f3",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2220.916477203369,
-        "y": 448.00006675720215,
-        "z": "ad46b000.c8324",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "24ad8f04.047a9",
+        "id": "7cd9936c.a74f0c",
         "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": 1186.2499237060547,
-        "y": 1085.000192642212,
-        "z": "ad46b000.c8324",
+        "x": 1189.2499237060547,
+        "y": 1066.750192642212,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "d8e72813.387f28",
+        "id": "4774618e.1748c8",
         "type": "save",
         "name": "save:generic-vnf",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name=  \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name=  \"vnf-type\" value = \"InternetProfile\"/>\n<parameter name=  \"service-id\" value = \"`$vnf-topology-operation-input.service-information.service-id`\"/>\n<parameter name=  \"prov-status\" value = \"ACTIVE\"/>\n<parameter name=  \"orchestration-status\" value = \"Active\"/>\n<parameter name=  \"is-closed-loop-disabled\" value = \"false\" />\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=  \"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1464.78125,
-        "y": 751.0311889648438,
-        "z": "ad46b000.c8324",
+        "x": 1467.78125,
+        "y": 732.7811889648438,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "333581cd.5fc33e",
-                "72a79e15.e23ae",
-                "8820e403.3378d8"
+                "a2030550.6968d8",
+                "a2e61682.0496d",
+                "c2e89ee1.fd39a"
             ]
         ]
     },
     {
-        "id": "333581cd.5fc33e",
+        "id": "a2030550.6968d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1701.0030918121338,
-        "y": 622.9199714660645,
-        "z": "ad46b000.c8324",
+        "x": 1704.0030918121338,
+        "y": 604.6699714660645,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "3908c055.5bdf4"
+                "a8f2f0b4.613d58"
             ]
         ]
     },
     {
-        "id": "72a79e15.e23ae",
+        "id": "a2e61682.0496d",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1711.978910446167,
-        "y": 682.9358277320862,
-        "z": "ad46b000.c8324",
+        "x": 1714.978910446167,
+        "y": 664.6858277320862,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "d8258ad6.c3d598"
+                "c52ea4aa.3cc458"
             ]
         ]
     },
     {
-        "id": "3908c055.5bdf4",
+        "id": "a8f2f0b4.613d58",
         "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=\"Failure calling AAI to save generic-vnf\" />\n",
         "comments": "",
-        "x": 1937.1456394195557,
-        "y": 622.4914364814758,
-        "z": "ad46b000.c8324",
+        "x": 1940.1456394195557,
+        "y": 604.2414364814758,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "d8258ad6.c3d598",
+        "id": "c52ea4aa.3cc458",
         "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=\"generic-vnf instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1932.0264377593994,
-        "y": 683.4121422767639,
-        "z": "ad46b000.c8324",
+        "x": 1935.0264377593994,
+        "y": 665.1621422767639,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "8820e403.3378d8",
+        "id": "c2e89ee1.fd39a",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.5897159576416,
-        "y": 748.0623078346252,
-        "z": "ad46b000.c8324",
+        "x": 1708.5897159576416,
+        "y": 729.8123078346252,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "58b69da0.e8a154",
+        "id": "30875ff1.5bdfd8",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1913.5899696350098,
-        "y": 746.0624370574951,
-        "z": "ad46b000.c8324",
+        "x": 1916.5899696350098,
+        "y": 727.8124370574951,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d09cdb3b.55b35",
+        "id": "9f601e99.56d0d8",
         "type": "save",
         "name": "save:metadata",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  \n\tAND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n\t  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n\t  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"service-type\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.service_type`\" />\n    <parameter name=\"metadata.metadatum[1].metaname\" value=\"up-speed\" />\n    <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.up_speed`\" />\n    <parameter name=\"metadata.metadatum[2].metaname\" value=\"down-speed\" />\n    <parameter name=\"metadata.metadatum[2].metaval\" value=\"`$prop.bbs.down_speed`\" />\n    <!--<parameter name=\"metadata.metadatum[3].metaname\" value=\"cvlan\" />-->\n    <!--<parameter name=\"metadata.metadatum[3].metaval\" value=\"`$prop.bbs.c_vlan`\" />-->\n    <!--<parameter name=\"metadata.metadatum[4].metaname\" value=\"svlan\" />-->\n    <!--<parameter name=\"metadata.metadatum[4].metaval\" value=\"`$prop.bbs.s_vlan`\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaname\" value=\"expected-ont-id\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaval\" value=\"`$prop.bbs.ont_sn`\" />-->\n    <!--<parameter name=\"metadata.metadatum[6].metaname\" value=\"rgw-mac-address\" />-->\n    <!--<parameter name=\"metadata.metadatum[6].metaval\" value=\"`$prop.bbs.mac`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 1463.2805881500244,
-        "y": 903.0309810638428,
-        "z": "ad46b000.c8324",
+        "x": 1466.2806396484375,
+        "y": 884.781005859375,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "47ea2ed4.dab158",
-                "9b5c45a7.24ac",
-                "6e196242.6f111c"
+                "75d1f186.5e1628",
+                "1ef6650b.7bc7e3",
+                "fd18d32d.89767"
             ]
         ]
     },
     {
-        "id": "47ea2ed4.dab158",
+        "id": "75d1f186.5e1628",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1693.756097793579,
-        "y": 834.3955845832825,
-        "z": "ad46b000.c8324",
+        "x": 1696.756097793579,
+        "y": 816.1455845832825,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "9c97c54a.182df"
+                "65dca94f.73cf2"
             ]
         ]
     },
     {
-        "id": "9b5c45a7.24ac",
+        "id": "1ef6650b.7bc7e3",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1705.7322597503662,
-        "y": 904.4115180969238,
-        "z": "ad46b000.c8324",
+        "x": 1708.7322597503662,
+        "y": 886.1615180969238,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "b3de2c8b.bfd47"
+                "ce07defc.f7b8a8"
             ]
         ]
     },
     {
-        "id": "9c97c54a.182df",
+        "id": "65dca94f.73cf2",
         "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=\"Failure calling AAI to save metadatum\" />\n",
         "comments": "",
-        "x": 1933.8988933563232,
-        "y": 832.967086315155,
-        "z": "ad46b000.c8324",
+        "x": 1936.8988933563232,
+        "y": 814.717086315155,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "b3de2c8b.bfd47",
+        "id": "ce07defc.f7b8a8",
         "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=\"metadatum instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1930.7797927856445,
-        "y": 903.8877544403076,
-        "z": "ad46b000.c8324",
+        "x": 1933.7797927856445,
+        "y": 885.6377544403076,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "6e196242.6f111c",
+        "id": "fd18d32d.89767",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.3429698944092,
-        "y": 974.5379576683044,
-        "z": "ad46b000.c8324",
+        "x": 1703.3429698944092,
+        "y": 956.2879576683044,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7263158e.3880f4",
+        "id": "b224e896.894f78",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save metadatum success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 1911.3429698944092,
-        "y": 974.5379576683044,
-        "z": "ad46b000.c8324",
+        "x": 1914.3429698944092,
+        "y": 956.2879576683044,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e22f8867.ca2c88",
+        "id": "28d2a60f.198f62",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1159.914836883545,
-        "y": 624.9997653961182,
-        "z": "ad46b000.c8324",
+        "x": 1162.914836883545,
+        "y": 606.7497653961182,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "d8e72813.387f28",
-                "d09cdb3b.55b35",
-                "336f1685.eaa8ba",
-                "869f359a.e187d8",
-                "ad68b782.700918"
+                "4774618e.1748c8",
+                "9f601e99.56d0d8",
+                "ba5a1797.70727",
+                "7803fefc.d4c7c8",
+                "8aee37b2.5ea6b"
             ]
         ]
     },
     {
-        "id": "336f1685.eaa8ba",
+        "id": "ba5a1797.70727",
         "type": "set",
         "name": "set:variables",
-        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n",
+        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n\n<!--<set>-->\n<!--<parameter name='vnf-id' value=\"123456789\"/>-->\n<!--<parameter name='vnf-name' value=\"vnf_name\"/>-->",
         "comments": "",
-        "x": 1447.9151859283447,
-        "y": 621.332763671875,
-        "z": "ad46b000.c8324",
+        "x": 1450.9151859283447,
+        "y": 603.082763671875,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "869f359a.e187d8",
+        "id": "7803fefc.d4c7c8",
         "type": "execute",
         "name": "execute:generate",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n    <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1469.2793998718262,
-        "y": 547.030613899231,
-        "z": "ad46b000.c8324",
+        "x": 1472.2793998718262,
+        "y": 528.780613899231,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "945f0b47.7a271"
+                "f2e54c60.7f91a8"
             ]
         ]
     },
     {
-        "id": "945f0b47.7a271",
+        "id": "f2e54c60.7f91a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1698.2793426513672,
-        "y": 548.0305881500244,
-        "z": "ad46b000.c8324",
+        "x": 1701.2793426513672,
+        "y": 529.7805881500244,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "ba59e650.603da8"
+                "fcc3c7f0.ad45a8"
             ]
         ]
     },
     {
-        "id": "ba59e650.603da8",
+        "id": "fcc3c7f0.ad45a8",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n    <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n    <parameter name=\"regex\" value=\"-\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1889.2793998718262,
-        "y": 546.0305881500244,
-        "z": "ad46b000.c8324",
+        "x": 1892.2793998718262,
+        "y": 527.7805881500244,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "983150fa.b57c18"
+                "b59ad4ce.202cb8"
             ]
         ]
     },
     {
-        "id": "7b3b5961.4f30b8",
+        "id": "b9cb7d9c.55a978",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2221.279462814331,
-        "y": 544.0306491851807,
-        "z": "ad46b000.c8324",
+        "x": 2224.279462814331,
+        "y": 525.7806491851807,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "983150fa.b57c18",
+        "id": "b59ad4ce.202cb8",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2056.27933883667,
-        "y": 545.0306186676025,
-        "z": "ad46b000.c8324",
+        "x": 2059.27933883667,
+        "y": 526.7806186676025,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ad68b782.700918",
+        "id": "8aee37b2.5ea6b",
         "type": "save",
         "name": "save:relationship",
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n      key=\"service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type \n         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1408.75,
-        "y": 1123,
-        "z": "ad46b000.c8324",
+        "x": 1411.75,
+        "y": 1104.75,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "95e71e63.b5a5e",
-                "2d716580.c38172",
-                "e09c00e3.de6a5"
+                "4e76192d.d1829",
+                "abf77744.d2107",
+                "ca875a30.55c0f8"
             ]
         ]
     },
     {
-        "id": "95e71e63.b5a5e",
+        "id": "4e76192d.d1829",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1639.2255096435547,
-        "y": 1054.3646035194397,
-        "z": "ad46b000.c8324",
+        "x": 1642.2255096435547,
+        "y": 1036.1146035194397,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "aaa91f6b.20f22"
+                "f08d83a5.7df08"
             ]
         ]
     },
     {
-        "id": "2d716580.c38172",
+        "id": "abf77744.d2107",
         "type": "failure",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1651.2016716003418,
-        "y": 1124.380537033081,
-        "z": "ad46b000.c8324",
+        "x": 1654.2016716003418,
+        "y": 1106.130537033081,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             [
-                "bffe8727.325998"
+                "6675ba9e.68afe4"
             ]
         ]
     },
     {
-        "id": "aaa91f6b.20f22",
+        "id": "f08d83a5.7df08",
         "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=\"Failure calling AAI to save metadatum\" />\n",
         "comments": "",
-        "x": 1879.3683052062988,
-        "y": 1052.9361052513123,
-        "z": "ad46b000.c8324",
+        "x": 1882.3683052062988,
+        "y": 1034.6861052513123,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "bffe8727.325998",
+        "id": "6675ba9e.68afe4",
         "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=\"metadatum instance does not exist in AAI\" />\n",
         "comments": "",
-        "x": 1876.2492046356201,
-        "y": 1123.8567733764648,
-        "z": "ad46b000.c8324",
+        "x": 1879.2492046356201,
+        "y": 1105.6067733764648,
+        "z": "e692aafc.7d6fa8",
         "wires": []
     },
     {
-        "id": "e09c00e3.de6a5",
+        "id": "ca875a30.55c0f8",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1645.8123817443848,
-        "y": 1194.5069766044617,
-        "z": "ad46b000.c8324",
+        "x": 1648.8123817443848,
+        "y": 1176.2569766044617,
+        "z": "e692aafc.7d6fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b6053705.eb38f8",
+        "type": "switchNode",
+        "name": "switch:service-result",
+        "xml": "<switch test=\"`$service-result.status`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1790.5,
+        "y": 336.75,
+        "z": "e692aafc.7d6fa8",
+        "wires": [
+            [
+                "f6c8a32c.d2ddd",
+                "c64a8b4f.023918"
+            ]
+        ]
+    },
+    {
+        "id": "f6c8a32c.d2ddd",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2016.5003395080566,
+        "y": 337.750093460083,
+        "z": "e692aafc.7d6fa8",
+        "wires": [
+            [
+                "b9d680ed.ff6d8"
+            ]
+        ]
+    },
+    {
+        "id": "c64a8b4f.023918",
+        "type": "outcome",
+        "name": "ok",
+        "xml": "<outcome value='ok'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2025.5001068115234,
+        "y": 423.7499485015869,
+        "z": "e692aafc.7d6fa8",
+        "wires": [
+            [
+                "db92c6c9.2636c"
+            ]
+        ]
+    },
+    {
+        "id": "b9d680ed.ff6d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.status`\" />\n\n",
+        "comments": "",
+        "x": 2203.0000076293945,
+        "y": 337.7499303817749,
+        "z": "e692aafc.7d6fa8",
+        "wires": []
+    },
+    {
+        "id": "db92c6c9.2636c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2300.6666107177734,
+        "y": 420.7499485015869,
+        "z": "e692aafc.7d6fa8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aad8dfdd.efd4d",
+        "type": "record",
+        "name": "log file",
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='my status`'/>\n        <parameter name='field2' value='status ok'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",
+        "comments": "",
+        "outputs": 1,
+        "x": 2447.40087890625,
+        "y": 479.460693359375,
+        "z": "e692aafc.7d6fa8",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
index 93ffdb3..6133b02 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "a77f6699.47796",
+        "id": "107dd3ad.6ad91c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 106.75,
-        "y": 79.77389526367188,
-        "z": "e5a6ac34.a7198",
+        "x": 122.75,
+        "y": 72.75,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "c640c202.91b41"
+                "83222bba.63a2c8"
             ]
         ]
     },
     {
-        "id": "c640c202.91b41",
+        "id": "83222bba.63a2c8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,466 +22,733 @@
         "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": 414.74964904785156,
-        "y": 79.77391719818115,
-        "z": "e5a6ac34.a7198",
+        "x": 392.74964904785156,
+        "y": 73.75002193450928,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "4e95369f.bf41e"
+                "97bb6ddd.1d4fd"
             ]
         ]
     },
     {
-        "id": "4e95369f.bf41e",
+        "id": "97bb6ddd.1d4fd",
         "type": "method",
         "name": "method:bbs-internet-profile-vnf-topology-operation-delete-huawei",
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.7496337890625,
-        "y": 275.77399349212646,
-        "z": "e5a6ac34.a7198",
+        "x": 390.7496337890625,
+        "y": 269.7500982284546,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "a33839b0.90a02"
+                "eb7b740e.3178f"
             ]
         ]
     },
     {
-        "id": "a33839b0.90a02",
+        "id": "eb7b740e.3178f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 819.7498626708984,
-        "y": 276.77395725250244,
-        "z": "e5a6ac34.a7198",
+        "x": 797.7498626708984,
+        "y": 270.75006198883057,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "2ed02a5c.5d72ce",
-                "c8fbb930.846a4",
-                "3956ad31.45a35a",
-                "bf1fcd53.ddfe",
-                "1fd3f69.1d31e89"
+                "2aed678d.ccad18",
+                "a82b827c.c45a18",
+                "38b2d21b.25735e",
+                "6ae86a23.f13794",
+                "d358382c.fffa98"
             ]
         ]
     },
     {
-        "id": "1fd3f69.1d31e89",
+        "id": "52f37237.872894",
         "type": "execute",
         "name": "execute:DeleteInternetProfileInstance",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1208.4009246826172,
-        "y": 280.7347803115845,
-        "z": "e5a6ac34.a7198",
+        "x": 1635.40087890625,
+        "y": 273.71087646484375,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "4123db34.0e7424",
-                "888adbdc.266ba8"
+                "57e00cd.1172574",
+                "7cf7dc05.83fe54"
             ]
         ]
     },
     {
-        "id": "888adbdc.266ba8",
+        "id": "7cf7dc05.83fe54",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1509.7339057922363,
-        "y": 280.7347803115845,
-        "z": "e5a6ac34.a7198",
+        "x": 1940.73388671875,
+        "y": 271.71087646484375,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "6237fdd6.7dcb44"
+                "8bc7302d.af26b8"
             ]
         ]
     },
     {
-        "id": "4123db34.0e7424",
+        "id": "57e00cd.1172574",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1518.7338180541992,
-        "y": 355.7347822189331,
-        "z": "e5a6ac34.a7198",
+        "x": 1675.7337646484375,
+        "y": 358.71087646484375,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "497cc63b.30848"
+                "9f9c92c8.4c1788"
             ]
         ]
     },
     {
-        "id": "497cc63b.30848",
-        "type": "switchNode",
-        "name": "switch:service-result",
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1753.7499389648438,
-        "y": 354.7740774154663,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "448428e5.a62b48",
-                "7cffa4c4.69e0d4"
-            ]
-        ]
-    },
-    {
-        "id": "6237fdd6.7dcb44",
+        "id": "8bc7302d.af26b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call DeleteInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 2018.6675186157227,
-        "y": 281.0243282318115,
-        "z": "e5a6ac34.a7198",
+        "x": 2184.66748046875,
+        "y": 282.00042724609375,
+        "z": "82f9347f.003f68",
         "wires": []
     },
     {
-        "id": "448428e5.a62b48",
+        "id": "2aed678d.ccad18",
+        "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": 1125.1387634277344,
+        "y": 787.6391134262085,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "a82b827c.c45a18",
+        "type": "call",
+        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1298.4169082641602,
+        "y": 190.75005531311035,
+        "z": "82f9347f.003f68",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3b653e8f.9983c2",
+        "type": "comment",
+        "name": "fetch relationship-list",
+        "info": "",
+        "comments": "",
+        "x": 1105.9205322265625,
+        "y": 63.976104736328125,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "e22b854a.815078",
+        "type": "switchNode",
+        "name": "switch vnf-id",
+        "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2117.6151123046875,
+        "y": 518.392822265625,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "e2f988d5.7bc23"
+            ]
+        ]
+    },
+    {
+        "id": "e2f988d5.7bc23",
+        "type": "other",
+        "name": "generic-vnf.vnf-id",
+        "xml": "<outcome value='generic-vnf.vnf-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2290.837333679199,
+        "y": 518.5038838386536,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "9ee9136f.479f08"
+            ]
+        ]
+    },
+    {
+        "id": "9ee9136f.479f08",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2512.0594520568848,
+        "y": 518.2816786766052,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "9b1e6a18.f7cc4"
+            ]
+        ]
+    },
+    {
+        "id": "9b1e6a18.f7cc4",
+        "type": "update",
+        "name": "get AAI generic-vnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n        pfx='aai.generic-vnf' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2723.22607421875,
+        "y": 519.2817077636719,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "4f841b67.60eb14"
+            ]
+        ]
+    },
+    {
+        "id": "97288862.73562",
+        "type": "switchNode",
+        "name": "switch vnf-type",
+        "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3249.504741668701,
+        "y": 517.5038967132568,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "97ef98e.9440868"
+            ]
+        ]
+    },
+    {
+        "id": "97ef98e.9440868",
+        "type": "other",
+        "name": "InternetProfile",
+        "xml": "<outcome value='InternetProfile'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3443.504497528076,
+        "y": 511.50392627716064,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "44e5b717.3abe78"
+            ]
+        ]
+    },
+    {
+        "id": "44e5b717.3abe78",
+        "type": "set",
+        "name": "set InternetProfile vnf-id",
+        "xml": "<set>\n<parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
+        "comments": "",
+        "x": 3687.504009246826,
+        "y": 509.50385093688965,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "4daed2f.ab45aac",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1318.9482955932617,
+        "y": 620.6428203582764,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "cda60208.a98e38"
+            ]
+        ]
+    },
+    {
+        "id": "29e461c3.021796",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1326.9482955932617,
+        "y": 680.6428203582764,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "cda60208.a98e38"
+            ]
+        ]
+    },
+    {
+        "id": "cda60208.a98e38",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1534.9482955932617,
+        "y": 655.6428203582764,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "3dd62fcb.d4bf38",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1921.75390625,
+        "y": 517.5594482421875,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "e22b854a.815078"
+            ]
+        ]
+    },
+    {
+        "id": "6ade0cdb.12e274",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3066.5038871765137,
+        "y": 518.0038967132568,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "97288862.73562"
+            ]
+        ]
+    },
+    {
+        "id": "4f841b67.60eb14",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2896.9482421875,
+        "y": 518.6427917480469,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "6ade0cdb.12e274"
+            ]
+        ]
+    },
+    {
+        "id": "38b2d21b.25735e",
+        "type": "update",
+        "name": "deleteResourceAAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId\">",
+        "comments": "",
+        "outputs": 1,
+        "x": 1128.9112243652344,
+        "y": 620.6890277862549,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "4daed2f.ab45aac",
+                "29e461c3.021796"
+            ]
+        ]
+    },
+    {
+        "id": "b66e07b8.1ddac8",
+        "type": "comment",
+        "name": "delete AAI resource",
+        "info": "",
+        "comments": "",
+        "x": 1126.6890716552734,
+        "y": 567.355712890625,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "6ae86a23.f13794",
+        "type": "update",
+        "name": "get AAI service-instance",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-instance\" \n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\"\n        pfx='aai.service-instance' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1078,
+        "y": 438.75,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "7af9dcae.b039bc",
+                "240386a1.30810a"
+            ]
+        ]
+    },
+    {
+        "id": "d3f2b322.8b29a",
+        "type": "comment",
+        "name": "fetch relationship-list",
+        "info": "",
+        "comments": "",
+        "x": 1063.000015258789,
+        "y": 382.7498474121094,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "7af9dcae.b039bc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1330.0002326965332,
+        "y": 389.74989223480225,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "f374f3a8.4abf78"
+            ]
+        ]
+    },
+    {
+        "id": "f374f3a8.4abf78",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1521.000015258789,
+        "y": 389.7498779296875,
+        "z": "82f9347f.003f68",
+        "wires": []
+    },
+    {
+        "id": "240386a1.30810a",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1266.2501220703125,
+        "y": 487.4998474121094,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "e718117f.fb2dc"
+            ]
+        ]
+    },
+    {
+        "id": "e718117f.fb2dc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1409.2501220703125,
+        "y": 496.4998474121094,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "7333ae69.c02df8",
+                "1ab6b41a.45b75c"
+            ]
+        ]
+    },
+    {
+        "id": "7333ae69.c02df8",
+        "type": "for",
+        "name": "for metadata",
+        "xml": "<for silentFailure='true' index='rix' start='0' end=\"`$aai.service-instance.metadata.metadatum_length`\" >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1584.75,
+        "y": 598.75,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "6e5a59d8.ef6978"
+            ]
+        ]
+    },
+    {
+        "id": "ce9e2279.5491f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2218,
+        "y": 623,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "8ef73844.3e4718"
+            ]
+        ]
+    },
+    {
+        "id": "8ef73844.3e4718",
+        "type": "update",
+        "name": "deleteResourceAAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n        resource=\"service-instance\"\n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\n\t\t\tmetadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2445,
+        "y": 620,
+        "z": "82f9347f.003f68",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "852919c3.1568f8",
+        "type": "other",
+        "name": "service-type",
+        "xml": "<outcome value='service-type'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972.4996337890625,
+        "y": 567.5000610351562,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "ce9e2279.5491f"
+            ]
+        ]
+    },
+    {
+        "id": "d6328d5b.a9cb68",
+        "type": "other",
+        "name": "down-speed",
+        "xml": "<outcome value='down-speed'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1979.4996337890625,
+        "y": 663.5000610351562,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "ce9e2279.5491f"
+            ]
+        ]
+    },
+    {
+        "id": "6e5a59d8.ef6978",
+        "type": "switchNode",
+        "name": "switch vnf-type",
+        "xml": "<switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1780.5,
+        "y": 620.5,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "4c7c8000.3258b",
+                "852919c3.1568f8",
+                "d6328d5b.a9cb68"
+            ]
+        ]
+    },
+    {
+        "id": "4c7c8000.3258b",
+        "type": "other",
+        "name": "up-speed",
+        "xml": "<outcome value='up-speed'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972.4996337890625,
+        "y": 617.5000610351562,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "ce9e2279.5491f"
+            ]
+        ]
+    },
+    {
+        "id": "1ab6b41a.45b75c",
+        "type": "for",
+        "name": "for relationship-list",
+        "xml": "<for silentFailure='true' index='ridx' start='0' end=\"`$aai.service-instance.relationship-list.relationship_length`\" >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1580,
+        "y": 463.75,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "cc722b6d.f8805"
+            ]
+        ]
+    },
+    {
+        "id": "cc722b6d.f8805",
+        "type": "for",
+        "name": "for relationship data",
+        "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 1733.25,
+        "y": 520.4999389648438,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "3dd62fcb.d4bf38"
+            ]
+        ]
+    },
+    {
+        "id": "9f9c92c8.4c1788",
+        "type": "switchNode",
+        "name": "switch:service-result",
+        "xml": "<switch test=\"`$service-result.status`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1855.25,
+        "y": 355.7261047363281,
+        "z": "82f9347f.003f68",
+        "wires": [
+            [
+                "9c274296.3d0d1",
+                "5de8bdae.d03adc"
+            ]
+        ]
+    },
+    {
+        "id": "9c274296.3d0d1",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1979.7502784729004,
-        "y": 355.7741708755493,
-        "z": "e5a6ac34.a7198",
+        "x": 2061.2503662109375,
+        "y": 358.7261962890625,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "eba25570.9a106"
+                "79e39401.d28ac4"
             ]
         ]
     },
     {
-        "id": "7cffa4c4.69e0d4",
+        "id": "5de8bdae.d03adc",
         "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
+        "name": "ok",
+        "xml": "<outcome value='ok'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1989.749984741211,
-        "y": 441.774037361145,
-        "z": "e5a6ac34.a7198",
+        "x": 2073.2501220703125,
+        "y": 447.7260437011719,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "4fc581b8.3b36a"
+                "4dce1751.41215"
             ]
         ]
     },
     {
-        "id": "eba25570.9a106",
+        "id": "79e39401.d28ac4",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.status`\" />\n\n",
         "comments": "",
-        "x": 2166.2499465942383,
-        "y": 355.7740077972412,
-        "z": "e5a6ac34.a7198",
+        "x": 2209.75,
+        "y": 355.7260437011719,
+        "z": "82f9347f.003f68",
         "wires": []
     },
     {
-        "id": "4fc581b8.3b36a",
+        "id": "4dce1751.41215",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2147.9166145324707,
-        "y": 442.7740125656128,
-        "z": "e5a6ac34.a7198",
+        "x": 2223.4166107177734,
+        "y": 447.72605323791504,
+        "z": "82f9347f.003f68",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ed02a5c.5d72ce",
-        "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": 1147.1387634277344,
-        "y": 793.6630086898804,
-        "z": "e5a6ac34.a7198",
-        "wires": []
-    },
-    {
-        "id": "c8fbb930.846a4",
-        "type": "call",
-        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1320.4169082641602,
-        "y": 196.77395057678223,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dea36b4d.64e4",
-        "type": "comment",
-        "name": "fetch relationship-list",
-        "info": "",
-        "comments": "",
-        "x": 1127.9205322265625,
-        "y": 70,
-        "z": "e5a6ac34.a7198",
-        "wires": []
-    },
-    {
-        "id": "bf1fcd53.ddfe",
-        "type": "for",
-        "name": "for relationship data",
-        "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1160.393009185791,
-        "y": 455.75003242492676,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "5f6aa36e.f418f4"
-            ]
-        ]
-    },
-    {
-        "id": "362b4d43.71efaa",
+        "id": "d358382c.fffa98",
         "type": "switchNode",
-        "name": "switch vnf-id",
-        "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
+        "name": "switch svc-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1508.6150512695312,
-        "y": 455.41671800613403,
-        "z": "e5a6ac34.a7198",
+        "x": 1071.75,
+        "y": 273.7261047363281,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "dca82cdd.160458"
+                "2d932b23.299604"
             ]
         ]
     },
     {
-        "id": "dca82cdd.160458",
-        "type": "other",
-        "name": "generic-vnf.vnf-id",
-        "xml": "<outcome value='generic-vnf.vnf-id'>\n",
+        "id": "2d932b23.299604",
+        "type": "outcome",
+        "name": "delete",
+        "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1681.837272644043,
-        "y": 455.5277795791626,
-        "z": "e5a6ac34.a7198",
+        "x": 1240.25,
+        "y": 277.7261047363281,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "48c7c532.f812c4"
+                "bcac2398.eadaa"
             ]
         ]
     },
     {
-        "id": "48c7c532.f812c4",
+        "id": "bcac2398.eadaa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1861.0594940185547,
-        "y": 523.3055810928345,
-        "z": "e5a6ac34.a7198",
+        "x": 1400.25,
+        "y": 276.2261047363281,
+        "z": "82f9347f.003f68",
         "wires": [
             [
-                "dbcb4df4.6dfa68"
+                "52f37237.872894"
             ]
         ]
-    },
-    {
-        "id": "dbcb4df4.6dfa68",
-        "type": "update",
-        "name": "get AAI generic-vnf",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n        pfx='aai.generic-vnf' local-only='false' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 2072.2261810302734,
-        "y": 524.3056182861328,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "f82b8813.df9498"
-            ]
-        ]
-    },
-    {
-        "id": "2eceba1e.5f3b96",
-        "type": "switchNode",
-        "name": "switch vnf-type",
-        "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2643.50479888916,
-        "y": 530.5278158187866,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "49b85927.406f78"
-            ]
-        ]
-    },
-    {
-        "id": "49b85927.406f78",
-        "type": "other",
-        "name": "InternetProfile",
-        "xml": "<outcome value='InternetProfile'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2837.504554748535,
-        "y": 524.5278453826904,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "301145e6.198712"
-            ]
-        ]
-    },
-    {
-        "id": "301145e6.198712",
-        "type": "set",
-        "name": "set InternetProfile vnf-id",
-        "xml": "<set>\n<parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
-        "comments": "",
-        "x": 3081.504066467285,
-        "y": 522.5277700424194,
-        "z": "e5a6ac34.a7198",
-        "wires": []
-    },
-    {
-        "id": "36ca2449.b1df6c",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1340.9482955932617,
-        "y": 626.6667156219482,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "aa8632c1.a4018"
-            ]
-        ]
-    },
-    {
-        "id": "f6034493.649d",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1348.9482955932617,
-        "y": 686.6667156219482,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "aa8632c1.a4018"
-            ]
-        ]
-    },
-    {
-        "id": "aa8632c1.a4018",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 1556.9482955932617,
-        "y": 661.6667156219482,
-        "z": "e5a6ac34.a7198",
-        "wires": []
-    },
-    {
-        "id": "5f6aa36e.f418f4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1343.7538604736328,
-        "y": 455.5833511352539,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "362b4d43.71efaa"
-            ]
-        ]
-    },
-    {
-        "id": "f33b322.9852f5",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2460.5039443969727,
-        "y": 531.0278158187866,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "2eceba1e.5f3b96"
-            ]
-        ]
-    },
-    {
-        "id": "f82b8813.df9498",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2257.9483070373535,
-        "y": 523.6667051315308,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "f33b322.9852f5"
-            ]
-        ]
-    },
-    {
-        "id": "3956ad31.45a35a",
-        "type": "update",
-        "name": "deleteResourceAAI",
-        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 1150.9112243652344,
-        "y": 626.7129230499268,
-        "z": "e5a6ac34.a7198",
-        "wires": [
-            [
-                "36ca2449.b1df6c",
-                "f6034493.649d"
-            ]
-        ]
-    },
-    {
-        "id": "95856666.28972",
-        "type": "comment",
-        "name": "delete AAI resource",
-        "info": "",
-        "comments": "",
-        "x": 1148.6890716552734,
-        "y": 573.3796081542969,
-        "z": "e5a6ac34.a7198",
-        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
index 3f30d50..2ba5835 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
@@ -1,276 +1,288 @@
-<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='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>
-        <block atomic="true">
-            <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' ></call>
-            <set>
-                <parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />
-                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
-                <parameter name='prop.bbs.HsiPackage' value='50M' />
-                <parameter name='prop.bbs.HsiType' value='IPoE' />
-            </set>
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
-                <parameter name='contextPrefix' value='prop' />
-            </execute>
-            <for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >
-                <block>
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'remote_id'`">
-                        <outcome value='true'>
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
-                                <outcome value=''>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
-                                    </return>
-                                </outcome>
-                                <outcome value='Other'>
-                                    <set>
-                                        <parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ONTSN'`">
-                        <outcome value='true'>
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
-                                <outcome value=''>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
-                                    </return>
-                                </outcome>
-                                <outcome value='Other'>
-                                    <set>
-                                        <parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'CVLAN'`">
-                        <outcome value='true'>
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
-                                <outcome value=''>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
-                                    </return>
-                                </outcome>
-                                <outcome value='Other'>
-                                    <set>
-                                        <parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </outcome>
-                    </switch>
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'SVLAN'`">
-                        <outcome value='true'>
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
-                                <outcome value=''>
-                                    <return status='failure'>
-                                        <parameter name='ack-final' value='Y'/>
-                                        <parameter name="error-code" value="500" />
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
-                                    </return>
-                                </outcome>
-                                <outcome value='Other'>
-                                    <set>
-                                        <parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>
-                <parameter name="restapiUrl" value="`'http://159.138.58.209:30335/rest/plat/smapp/v1/oauth/token'`"/>
-                <parameter name="format" value="json"/>
-                <parameter name="httpMethod" value="put"/>
-                <parameter name="responsePrefix" value="token-result"/>
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                <parameter name="trustStorePassword" value="adminadmin"/>
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                <parameter name="keyStorePassword" value="adminadmin"/>
-                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>-->
-                <outcome value='success'>
-                    <switch test='`$token-result.accessSession`'>
-                        <outcome value='Other'>
-                            <set>
-                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
-                            </set>
-                        </outcome>
-                        <outcome value=''>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
-                            </return>
-                        </outcome>
-                    </switch>
-                </outcome>
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error failed to call queryTokenID" />
-                    </return>
-                </outcome>
-            </execute>
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`" />
-                <parameter name="restapiUrl" value="`'http://159.138.58.209:30335/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />
-                <parameter name="contentType" value="application/json"/>
-                <parameter name="httpMethod" value="post"/>
-                <parameter name="responsePrefix" value="service-result"/>
-                <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                <parameter name="trustStorePassword" value="adminadmin"/>
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                <parameter name="keyStorePassword" value="adminadmin"/>
-                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />-->
-                <outcome value='failure'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error failed to call  createAccessConnectivityService" />
-                    </return>
-                </outcome>
-                <outcome value='success'>
-                    <switch test="`$service-result.errors.error[0].error-message`">
-                        <outcome value='Other'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
-                            </return>
-                        </outcome>
-                        <outcome value=''>
-                            <block>
-                                <set>
-                                    <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/>
-                                </set>
-                            </block>
-                        </outcome>
-                    </switch>
-                </outcome>
-            </execute>
-            <block>
-                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
-                    <parameter name="ctx-destination" value="prop.random-data"/>
-                    <outcome value='success'>
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                            <parameter name="ctx_memory_result_key" value="prop.random-data-list"/>
-                            <parameter name="original_string" value="`$prop.random-data`"/>
-                            <parameter name="regex" value="-"/>
-                            <outcome value='success'></outcome>
-                        </execute>
-                    </outcome>
-                </execute>
-                <set>
-                    <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>
-                    <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>
-                </set>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >
-                    <parameter name= "vnf-id" value = "`$vnf-id`"/>
-                    <parameter name=  "vnf-name" value = "`$vnf-name`"/>
-                    <parameter name=  "vnf-type" value = "AccessConnectivity"/>
-                    <parameter name=  "service-id" value = "`$vnf-topology-operation-input.service-information.service-id`"/>
-                    <parameter name=  "prov-status" value = "ACTIVE"/>
-                    <parameter name=  "orchestration-status" value = "Active"/>
-                    <parameter name=  "is-closed-loop-disabled" value = "false" />
-                    <parameter name=  "model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>
-                    <parameter name=  "model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
-                    <parameter name=  "model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
-                    <outcome value='failure'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="Failure calling AAI to save generic-vnf" />
-                        </return>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="generic-vnf instance does not exist in AAI" />
-                        </return>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </save>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
- key="service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  
-	AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-	  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
-	  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id"  force="true" pfx="tmp.AnAI-data"
-    >
-                    <parameter name="metadata.metadatum[0].metaname" value="remote-id" />
-                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" />
-                    <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />
-                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />
-                    <parameter name="metadata.metadatum[2].metaname" value="cvlan" />
-                    <parameter name="metadata.metadatum[2].metaval" value="`$prop.bbs.CVLAN`" />
-                    <parameter name="metadata.metadatum[3].metaname" value="svlan" />
-                    <parameter name="metadata.metadatum[3].metaval" value="`$prop.bbs.SVLAN`" />
-                    <parameter name="metadata.metadatum[4].metaname" value="expected-ont-id" />
-                    <parameter name="metadata.metadatum[4].metaval" value="`$prop.bbs.ONTSN`" />
-                    <!--<parameter name="metadata.metadatum[5].metaname" value="rgw-mac-address" />-->
-                    <!--<parameter name="metadata.metadatum[5].metaval" value="`$prop.bbs.mac`" />-->
-                    <outcome value='failure'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
-                        </return>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
-                        </return>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </save>
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
-      key="service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
-         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type 
-         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data">
-                    <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" />
-                    <outcome value='failure'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
-                        </return>
-                    </outcome>
-                    <outcome value='not-found'>
-                        <return status='failure'>
-                            <parameter name='ack-final' value='Y'/>
-                            <parameter name="error-code" value="500" />
-                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
-                        </return>
-                    </outcome>
-                    <outcome value='success'></outcome>
-                </save>
-            </block>
-            <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
+    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='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' ></call>
+            <set>
+                <parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />
+                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
+                <parameter name='prop.bbs.HsiPackage' value='50M' />
+                <parameter name='prop.bbs.HsiType' value='IPoE' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >
+                <block>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'remote_id'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ONTSN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'CVLAN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'SVLAN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>
+                <parameter name="format" value="json"/>
+                <parameter name="httpMethod" value="put"/>
+                <parameter name="responsePrefix" value="token-result"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>-->
+                <outcome value='success'>
+                    <switch test='`$token-result.accessSession`'>
+                        <outcome value='Other'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
+                            </set>
+                        </outcome>
+                        <outcome value=''>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error failed to call queryTokenID" />
+                    </return>
+                </outcome>
+            </execute>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`" />
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />
+                <parameter name="contentType" value="application/json"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name="responsePrefix" value="service-result"/>
+                <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />-->
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error failed to call  createAccessConnectivityService" />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <switch test="`$service-result.errors.error[0].error-message`">
+                        <outcome value='Other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
+                            </return>
+                        </outcome>
+                        <outcome value=''>
+                            <block>
+                                <set>
+                                    <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+            <block>
+                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
+                    <parameter name="ctx-destination" value="prop.random-data"/>
+                    <outcome value='success'>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="ctx_memory_result_key" value="prop.random-data-list"/>
+                            <parameter name="original_string" value="`$prop.random-data`"/>
+                            <parameter name="regex" value="-"/>
+                            <outcome value='success'></outcome>
+                        </execute>
+                    </outcome>
+                </execute>
+                <set>
+                    <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>
+                    <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>
+                    <!--<set>-->
+                    <!--<parameter name='vnf-id' value="123456789"/>-->
+                    <!--<parameter name='vnf-name' value="vnf_name"/>-->
+                </set>
+                <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>
+                    <parameter name='logger' value='message-log'/>
+                    <parameter name='field1' value='`$vnf-id`'/>
+                    <parameter name='field2' value='`$vnf-name`'/>
+                    <!--<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">-->
+                    <!--   <parameter name="file" value="/root/logx.txt" />-->
+                    <!--   <parameter name="field1" value="deleteAccessConnectivityService success!" />-->
+                    <!--       <parameter name="field2" value='`$topology.networks.network[0].network-types`' />-->
+                </record>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >
+                    <parameter name= "vnf-id" value = "`$vnf-id`"/>
+                    <parameter name=  "vnf-name" value = "`$vnf-name`"/>
+                    <parameter name=  "vnf-type" value = "AccessConnectivity"/>
+                    <parameter name=  "service-id" value = "`$vnf-topology-operation-input.service-information.service-id`"/>
+                    <parameter name=  "prov-status" value = "ACTIVE"/>
+                    <parameter name=  "orchestration-status" value = "Active"/>
+                    <parameter name=  "is-closed-loop-disabled" value = "false" />
+                    <parameter name=  "model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>
+                    <parameter name=  "model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
+                    <parameter name=  "model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save generic-vnf" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="generic-vnf instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
+ key="service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  
+	AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+	  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+	  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id"  force="true" pfx="tmp.AnAI-data"
+    >
+                    <parameter name="metadata.metadatum[0].metaname" value="remote-id" />
+                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" />
+                    <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />
+                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />
+                    <parameter name="metadata.metadatum[2].metaname" value="cvlan" />
+                    <parameter name="metadata.metadatum[2].metaval" value="`$prop.bbs.CVLAN`" />
+                    <parameter name="metadata.metadatum[3].metaname" value="svlan" />
+                    <parameter name="metadata.metadatum[3].metaval" value="`$prop.bbs.SVLAN`" />
+                    <parameter name="metadata.metadatum[4].metaname" value="expected-ont-id" />
+                    <parameter name="metadata.metadatum[4].metaval" value="`$prop.bbs.ONTSN`" />
+                    <!--<parameter name="metadata.metadatum[5].metaname" value="rgw-mac-address" />-->
+                    <!--<parameter name="metadata.metadatum[5].metaval" value="`$prop.bbs.mac`" />-->
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
+      key="service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type 
+         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" />
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+            </block>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
index 9d50fee..3b98365 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
@@ -142,6 +142,60 @@
                                 </block>
                             </for>
                         </for>
+                        <for silentFailure='true' index='rix' start='0' end="`$aai.service-instance.metadata.metadatum_length`" >
+                            <switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>
+                                <outcome value='remote-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='controller-service-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='cvlan'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='svlan'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='expected-ont-id'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
                     </block>
                 </outcome>
             </get-resource>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
index 9df1b38..4aa36b9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
@@ -18,20 +18,22 @@
                     </return>
                 </outcome>
                 <outcome value='success'>
-                    <switch test="`$service-result.errors.error[0].error-message`">
+                    <switch test="`$service-result.status`">
                         <outcome value='Other'>
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance return: '+$service-result.status`" />
                             </return>
                         </outcome>
-                        <outcome value=''>
+                        <outcome value='ok'>
                             <block></block>
                         </outcome>
                     </switch>
                 </outcome>
             </execute>
+            <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'></call>
+            <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'></call>
             <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_bbs-internet-profile-vnf-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
index 27048ab..fb07393 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
@@ -10,6 +10,7 @@
                 <parameter name="contentType" value="application/json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="service-result"/>
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`" />-->
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
@@ -18,15 +19,15 @@
                     </return>
                 </outcome>
                 <outcome value='success'>
-                    <switch test="`$service-result.errors.error[0].error-message`">
+                    <switch test="`$service-result.status`">
                         <outcome value='Other'>
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance return: '+$service-result.status`" />
                             </return>
                         </outcome>
-                        <outcome value=''>
+                        <outcome value='ok'>
                             <block></block>
                         </outcome>
                     </switch>
@@ -47,6 +48,9 @@
                 <set>
                     <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>
                     <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>
+                    <!--<set>-->
+                    <!--<parameter name='vnf-id' value="123456789"/>-->
+                    <!--<parameter name='vnf-name' value="vnf_name"/>-->
                 </set>
                 <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >
                     <parameter name= "vnf-id" value = "`$vnf-id`"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
index 4b2e5fb..cebb55f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
@@ -4,60 +4,119 @@
     <method rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>
         <block atomic="true">
             <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' ></call>
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
-                <parameter name="contentType" value="application/json"/>
-                <parameter name="httpMethod" value="post"/>
-                <parameter name="responsePrefix" value="service-result"/>
+            <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value='delete'>
+                    <block atomic='true'>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
+                            <parameter name="contentType" value="application/json"/>
+                            <parameter name="httpMethod" value="post"/>
+                            <parameter name="responsePrefix" value="service-result"/>
+                            <outcome value='failure'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />
+                                </return>
+                            </outcome>
+                            <outcome value='success'>
+                                <switch test="`$service-result.status`">
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.status`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='ok'>
+                                        <block></block>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                        </execute>
+                    </block>
+                </outcome>
+            </switch>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="service-instance" 
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id"
+        pfx='aai.service-instance' local-only='false' >
                 <outcome value='failure'>
                     <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
                     </return>
                 </outcome>
                 <outcome value='success'>
-                    <switch test="`$service-result.errors.error[0].error-message`">
-                        <outcome value='Other'>
-                            <return status='failure'>
-                                <parameter name='ack-final' value='Y'/>
-                                <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
-                            </return>
-                        </outcome>
-                        <outcome value=''>
-                            <block></block>
-                        </outcome>
-                    </switch>
-                </outcome>
-            </execute>
-            <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >
-                <block atomic='true'>
-                    <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>
-                        <outcome value='generic-vnf.vnf-id'>
-                            <block atomic='true'>
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+                    <block atomic='true'>
+                        <for silentFailure='true' index='ridx' start='0' end="`$aai.service-instance.relationship-list.relationship_length`" >
+                            <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >
+                                <block atomic='true'>
+                                    <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>
+                                        <outcome value='generic-vnf.vnf-id'>
+                                            <block atomic='true'>
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value"
         pfx='aai.generic-vnf' local-only='false' >
-                                    <outcome value='success'>
-                                        <block atomic='true'>
-                                            <switch test='`$aai.generic-vnf.vnf-type`'>
-                                                <outcome value='InternetProfile'>
-                                                    <set>
-                                                        <parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />
-                                                    </set>
-                                                </outcome>
-                                            </switch>
-                                        </block>
-                                    </outcome>
-                                </get-resource>
-                            </block>
-                        </outcome>
-                    </switch>
-                </block>
-            </for>
+                                                    <outcome value='success'>
+                                                        <block atomic='true'>
+                                                            <switch test='`$aai.generic-vnf.vnf-type`'>
+                                                                <outcome value='InternetProfile'>
+                                                                    <set>
+                                                                        <parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />
+                                                                    </set>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </for>
+                        </for>
+                        <for silentFailure='true' index='rix' start='0' end="`$aai.service-instance.metadata.metadatum_length`" >
+                            <switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>
+                                <outcome value='service-type'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='up-speed'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                                <outcome value='down-speed'>
+                                    <block atomic='true'>
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+        resource="service-instance"
+		key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND
+			service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND
+			service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND
+			metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>
+                                    </block>
+                                </outcome>
+                            </switch>
+                        </for>
+                    </block>
+                </outcome>
+            </get-resource>
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 		resource="generic-vnf" 
 		key="generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId">