From b2be9a3cac226464c70a07f2f54763c4b15fced6 Mon Sep 17 00:00:00 2001
From: Rahul_cool <rahul.tamrkar@huawei.com>
Date: Mon, 30 Mar 2020 12:10:01 +0530
Subject: Moved bbs logic from network-topoly-operation to vnf

Issue-ID: SDNC-1021
Signed-off-by: Rahul_cool <rahul.tamrkar@huawei.com>
Change-Id: I720bd21ab355d4d3cad3448d814d9ae5a4da82f3
(cherry picked from commit d456643032f4748e60f19f1bab6b58184595f4ad [formerly a5e6280beda10b6cc031229dfbe59fcda2ead6f9])

Former-commit-id: dd745293c03a55318df2d58a886b77ba9352a5b4
---
 ...ivity-vnf-topology-operation-create-huawei.json | 1217 +++++++++++++++
 ...ivity-vnf-topology-operation-delete-huawei.json |  929 ++++++++++++
 ...ofile-vnf-topology-operation-change-huawei.json |  229 +++
 ...ofile-vnf-topology-operation-common-huawei.json |  868 +++++++++++
 ...ofile-vnf-topology-operation-create-huawei.json |  624 ++++++++
 ...ofile-vnf-topology-operation-delete-huawei.json |  487 ++++++
 ...URCE-API_validate-bbs-vnf-input-parameters.json |  504 +++++++
 ...ENERIC-RESOURCE-API_vnf-topology-operation.json | 1557 ++++++++++++++------
 ...tivity-vnf-topology-operation-create-huawei.xml |  276 ++++
 ...tivity-vnf-topology-operation-delete-huawei.xml |  171 +++
 ...rofile-vnf-topology-operation-change-huawei.xml |   42 +
 ...rofile-vnf-topology-operation-common-huawei.xml |   76 +
 ...rofile-vnf-topology-operation-create-huawei.xml |  146 ++
 ...rofile-vnf-topology-operation-delete-huawei.xml |   84 ++
 ...OURCE-API_validate-bbs-vnf-input-parameters.xml |  118 ++
 ...GENERIC-RESOURCE-API_vnf-topology-operation.xml |   76 +
 16 files changed, 6933 insertions(+), 471 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml

(limited to 'platform-logic/generic-resource-api/src')

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
new file mode 100644
index 00000000..9a631975
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
@@ -0,0 +1,1217 @@
+[
+    {
+        "id": "1d6261af.026296",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 106.75,
+        "y": 146.00012969970703,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "4f356558.c09824"
+            ]
+        ]
+    },
+    {
+        "id": "4f356558.c09824",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 399.74940490722656,
+        "y": 146.0000295639038,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "f6fdf774.8bb96"
+            ]
+        ]
+    },
+    {
+        "id": "f6fdf774.8bb96",
+        "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",
+        "wires": [
+            [
+                "f3bcfb95.a6758"
+            ]
+        ]
+    },
+    {
+        "id": "f3bcfb95.a6758",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 804.7496185302734,
+        "y": 343.0000696182251,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "3a2b8179.f5c316",
+                "f43916c0.05b38",
+                "5819ae74.c281a",
+                "f4291e2e.795f3",
+                "bdcb838b.2c793",
+                "2efe0fba.b3123",
+                "48d2f628.580118",
+                "f603acaf.f2ab88"
+            ]
+        ]
+    },
+    {
+        "id": "3a2b8179.f5c316",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f43916c0.05b38",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f603acaf.f2ab88",
+        "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'`\" />-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 1295.4008178710938,
+        "y": 792.9608383178711,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "60f74c55.fe6e34",
+                "d4535369.b036"
+            ]
+        ]
+    },
+    {
+        "id": "60f74c55.fe6e34",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1640.733585357666,
+        "y": 882.9607381820679,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "15628a38.6513e6"
+            ]
+        ]
+    },
+    {
+        "id": "d4535369.b036",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1632.64306640625,
+        "y": 791.1426010131836,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "3377addc.d013aa"
+            ]
+        ]
+    },
+    {
+        "id": "2efe0fba.b3123",
+        "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'`\"/>-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 1230.97216796875,
+        "y": 594.5557861328125,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "f9c0e434.ab18e",
+                "ecb05dd5.09d378"
+            ]
+        ]
+    },
+    {
+        "id": "ecb05dd5.09d378",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1518.9169921875,
+        "y": 594.2502002716064,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "f290b563.afea"
+            ]
+        ]
+    },
+    {
+        "id": "f9c0e434.ab18e",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1517.1900024414062,
+        "y": 667.6138753890991,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "50dc0542.4371cc"
+            ]
+        ]
+    },
+    {
+        "id": "369cde33.b9c072",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1422e405.e818ac",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1921.7502174377441,
+        "y": 663.0004110336304,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "369cde33.b9c072"
+            ]
+        ]
+    },
+    {
+        "id": "f290b563.afea",
+        "type": "switchNode",
+        "name": "switch:token ",
+        "xml": "<switch test='`$token-result.accessSession`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1732.7500495910645,
+        "y": 593.0001859664917,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "1422e405.e818ac",
+                "e2811aac.af4e88"
+            ]
+        ]
+    },
+    {
+        "id": "e2811aac.af4e88",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1919.750057220459,
+        "y": 592.0001831054688,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "83e041e2.11968"
+            ]
+        ]
+    },
+    {
+        "id": "83e041e2.11968",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5819ae74.c281a",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "424a1338.c6c804",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2c82d829.e0ab68",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "15628a38.6513e6",
+        "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",
+        "wires": [
+            [
+                "f5141e0a.b112f8",
+                "f195f6a2.69ce68"
+            ]
+        ]
+    },
+    {
+        "id": "f5141e0a.b112f8",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2096.750011444092,
+        "y": 804.0002164840698,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "8275b3aa.8d1378"
+            ]
+        ]
+    },
+    {
+        "id": "f195f6a2.69ce68",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2097.7496337890625,
+        "y": 880.0000152587891,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "917abc23.c0d878"
+            ]
+        ]
+    },
+    {
+        "id": "ffd1d599.c71c18",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bdcb838b.2c793",
+        "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",
+        "wires": [
+            [
+                "a466675f.e223b"
+            ]
+        ]
+    },
+    {
+        "id": "6ab8eedc.cb66a8",
+        "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",
+        "wires": [
+            [
+                "fb671302.f08a28"
+            ]
+        ]
+    },
+    {
+        "id": "fb671302.f08a28",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2004.2501678466797,
+        "y": 136.0001974105835,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "5ca67ab9.1ce66c"
+            ]
+        ]
+    },
+    {
+        "id": "2257c990.31ddd6",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "a466675f.e223b",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1515.2504196166992,
+        "y": 336.00021171569824,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "6ab8eedc.cb66a8",
+                "ad025760.15512",
+                "931e8201.e0a528",
+                "1021a2a7.9d963d"
+            ]
+        ]
+    },
+    {
+        "id": "ad025760.15512",
+        "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",
+        "wires": [
+            [
+                "f93e9a17.ed77c"
+            ]
+        ]
+    },
+    {
+        "id": "f93e9a17.ed77c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2003.1019458770752,
+        "y": 197.00029182434082,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "4c4d0595.c8d74c"
+            ]
+        ]
+    },
+    {
+        "id": "9de6cf9d.95e438",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "931e8201.e0a528",
+        "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",
+        "wires": [
+            [
+                "45aee947.1f79f"
+            ]
+        ]
+    },
+    {
+        "id": "45aee947.1f79f",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2003.1019744873047,
+        "y": 257.00028896331787,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "f12f75d1.378e7"
+            ]
+        ]
+    },
+    {
+        "id": "b328ff7b.de2178",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1021a2a7.9d963d",
+        "type": "switchNode",
+        "name": "switch:SVLAN",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'SVLAN'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1798.102123260498,
+        "y": 333.222544670105,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "a0cd6bfe.37df4"
+            ]
+        ]
+    },
+    {
+        "id": "a0cd6bfe.37df4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2006.1020078659058,
+        "y": 332.22254276275635,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "b2009bd.404af68"
+            ]
+        ]
+    },
+    {
+        "id": "fd36dd78.cdefd",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "5ca67ab9.1ce66c",
+        "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",
+        "wires": [
+            [
+                "9dd975e7.7bf628",
+                "9c64fed9.d1167"
+            ]
+        ]
+    },
+    {
+        "id": "9c64fed9.d1167",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2537.2501678466797,
+        "y": 134.00022792816162,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "2257c990.31ddd6"
+            ]
+        ]
+    },
+    {
+        "id": "9dd975e7.7bf628",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2535.250576019287,
+        "y": 65.00020694732666,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "e7c90529.4dc4f8"
+            ]
+        ]
+    },
+    {
+        "id": "4c4d0595.c8d74c",
+        "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",
+        "wires": [
+            [
+                "9dd975e7.7bf628",
+                "923642af.93bc88"
+            ]
+        ]
+    },
+    {
+        "id": "923642af.93bc88",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2539.2501678466797,
+        "y": 197.00022792816162,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "9de6cf9d.95e438"
+            ]
+        ]
+    },
+    {
+        "id": "f12f75d1.378e7",
+        "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",
+        "wires": [
+            [
+                "9dd975e7.7bf628",
+                "f56650c5.51ce2"
+            ]
+        ]
+    },
+    {
+        "id": "f56650c5.51ce2",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2540.2501678466797,
+        "y": 257.0002279281616,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "b328ff7b.de2178"
+            ]
+        ]
+    },
+    {
+        "id": "b2009bd.404af68",
+        "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",
+        "wires": [
+            [
+                "9dd975e7.7bf628",
+                "b2fcbca3.42bad"
+            ]
+        ]
+    },
+    {
+        "id": "b2fcbca3.42bad",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2543.2501678466797,
+        "y": 333.0002279281616,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "fd36dd78.cdefd"
+            ]
+        ]
+    },
+    {
+        "id": "f4291e2e.795f3",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "917abc23.c0d878",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2255.9162635803223,
+        "y": 880.9999904632568,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "c2dbfb5a.03777"
+            ]
+        ]
+    },
+    {
+        "id": "8275b3aa.8d1378",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e7c90529.4dc4f8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "50dc0542.4371cc",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "3377addc.d013aa",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c2ab02c3.18a528",
+        "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",
+        "wires": [
+            [
+                "7b50f775.bd98f8",
+                "57259626.7849c",
+                "e87076a5.810bc8"
+            ]
+        ]
+    },
+    {
+        "id": "7b50f775.bd98f8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1728.5050678253174,
+        "y": 1103.9208545684814,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "929e3be2.0040b8"
+            ]
+        ]
+    },
+    {
+        "id": "57259626.7849c",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1739.4808864593506,
+        "y": 1163.9367108345032,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "4d0490a4.dc1d78"
+            ]
+        ]
+    },
+    {
+        "id": "929e3be2.0040b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4d0490a4.dc1d78",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e87076a5.810bc8",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1733.0916919708252,
+        "y": 1229.0631909370422,
+        "z": "e0329916.b170f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f68ce26b.06d55",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ac883442.28d84",
+        "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",
+        "wires": [
+            [
+                "eafd77cb.b8397",
+                "1f25a38e.70d264",
+                "7db9333e.87da9c"
+            ]
+        ]
+    },
+    {
+        "id": "eafd77cb.b8397",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1704.2580490112305,
+        "y": 1326.3965287208557,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "f5714bd.89e15b8"
+            ]
+        ]
+    },
+    {
+        "id": "1f25a38e.70d264",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1716.2342109680176,
+        "y": 1396.412462234497,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "2a90de57.54b0d2"
+            ]
+        ]
+    },
+    {
+        "id": "f5714bd.89e15b8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "2a90de57.54b0d2",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7db9333e.87da9c",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1710.8449211120605,
+        "y": 1466.5389018058777,
+        "z": "e0329916.b170f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "223cf7d5.348cb8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "48d2f628.580118",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1187.4168128967285,
+        "y": 1106.0006484985352,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "c2ab02c3.18a528",
+                "ac883442.28d84",
+                "b153daf9.f98aa",
+                "74332c3b.90a3c4",
+                "e193ec3.bce899"
+            ]
+        ]
+    },
+    {
+        "id": "b153daf9.f98aa",
+        "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",
+        "comments": "",
+        "x": 1476.4172821044922,
+        "y": 1110.333641052246,
+        "z": "e0329916.b170f8",
+        "wires": []
+    },
+    {
+        "id": "74332c3b.90a3c4",
+        "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",
+        "wires": [
+            [
+                "5f8abaa7.bb84f4"
+            ]
+        ]
+    },
+    {
+        "id": "5f8abaa7.bb84f4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1732.781421661377,
+        "y": 1030.0315780639648,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "d24b114c.00fb78"
+            ]
+        ]
+    },
+    {
+        "id": "d24b114c.00fb78",
+        "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",
+        "wires": [
+            [
+                "c28eecff.183408"
+            ]
+        ]
+    },
+    {
+        "id": "bd5c3172.606e3",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c28eecff.183408",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2086.781415939331,
+        "y": 1028.0315170288086,
+        "z": "e0329916.b170f8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c2dbfb5a.03777",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "80452a04.8e8ca8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e193ec3.bce899",
+        "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",
+        "wires": [
+            [
+                "8b7cfe7c.bb05c",
+                "605adc34.dc45b4",
+                "c57b41f2.edd368"
+            ]
+        ]
+    },
+    {
+        "id": "8b7cfe7c.bb05c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1731.25,
+        "y": 1538.0312519073486,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "11122765.99c301"
+            ]
+        ]
+    },
+    {
+        "id": "605adc34.dc45b4",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1743.226161956787,
+        "y": 1608.04718542099,
+        "z": "e0329916.b170f8",
+        "wires": [
+            [
+                "8cd2a407.0333e"
+            ]
+        ]
+    },
+    {
+        "id": "11122765.99c301",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8cd2a407.0333e",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "c57b41f2.edd368",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1737.83687210083,
+        "y": 1678.1736249923706,
+        "z": "e0329916.b170f8",
+        "wires": [
+            []
+        ]
+    }
+]
\ 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-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
new file mode 100644
index 00000000..6f8e2913
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
@@ -0,0 +1,929 @@
+[
+    {
+        "id": "bc4c5d4f.d1f19",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 102.75,
+        "y": 220.99998664855957,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "38c45b07.ed34e4"
+            ]
+        ]
+    },
+    {
+        "id": "38c45b07.ed34e4",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 490.74988174438477,
+        "y": 220.99999141693115,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "c3a71c48.0be57"
+            ]
+        ]
+    },
+    {
+        "id": "c3a71c48.0be57",
+        "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",
+        "wires": [
+            [
+                "1015d7d8.bba218"
+            ]
+        ]
+    },
+    {
+        "id": "1015d7d8.bba218",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 851.7499885559082,
+        "y": 338.99999141693115,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "6803db15.0d8f74",
+                "681e5161.fa20d",
+                "a6b40423.ac2ca8",
+                "374f03c.b97d77c",
+                "2e181216.27ccce",
+                "188e79ba.5e9486",
+                "b4b9141a.0cfd8",
+                "653e84f8.bbdd14",
+                "d2d50667.fd62f"
+            ]
+        ]
+    },
+    {
+        "id": "6803db15.0d8f74",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "188e79ba.5e9486",
+        "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",
+        "wires": [
+            [
+                "d9d4b7b.6b23c48"
+            ]
+        ]
+    },
+    {
+        "id": "2e181216.27ccce",
+        "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",
+        "wires": [
+            [
+                "4f1fa17d.4f00e8",
+                "b7d32671.97a41"
+            ]
+        ]
+    },
+    {
+        "id": "b7d32671.97a41",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1587.916934967041,
+        "y": 321.2499942779541,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "21337368.af64c4"
+            ]
+        ]
+    },
+    {
+        "id": "4f1fa17d.4f00e8",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1583.916934967041,
+        "y": 215.24996376037598,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "d9ad86f3.bd8048"
+            ]
+        ]
+    },
+    {
+        "id": "5ebb3e61.f6be88",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "4f940f96.eff4d",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1954.750316619873,
+        "y": 263.99995040893555,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "5ebb3e61.f6be88"
+            ]
+        ]
+    },
+    {
+        "id": "21337368.af64c4",
+        "type": "switchNode",
+        "name": "switch:token ",
+        "xml": "<switch test='`$token-result.accessSession`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1783.7503356933594,
+        "y": 322.99993896484375,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "4f940f96.eff4d",
+                "c7c2da18.3fe03"
+            ]
+        ]
+    },
+    {
+        "id": "c7c2da18.3fe03",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1955.750316619873,
+        "y": 320.99995040893555,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "626983c2.287bfc"
+            ]
+        ]
+    },
+    {
+        "id": "626983c2.287bfc",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8811eeaf.bc7fe",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "374f03c.b97d77c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d2d50667.fd62f",
+        "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",
+        "wires": [
+            [
+                "6a07c07d.4ffc58",
+                "3aea3fb0.9f27a8"
+            ]
+        ]
+    },
+    {
+        "id": "6a07c07d.4ffc58",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1654.750587463379,
+        "y": 535.000078201294,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "144af758.7f6181"
+            ]
+        ]
+    },
+    {
+        "id": "3aea3fb0.9f27a8",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1654.750560760498,
+        "y": 594.0000779628754,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "47b72aff.6069ec"
+            ]
+        ]
+    },
+    {
+        "id": "106fbc3e.7d35bc",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2140.7506713867188,
+        "y": 491.00001215934753,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "bdf75bc7.7d075"
+            ]
+        ]
+    },
+    {
+        "id": "bdf75bc7.7d075",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d9d4b7b.6b23c48",
+        "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",
+        "wires": [
+            [
+                "750b21bf.a6927"
+            ]
+        ]
+    },
+    {
+        "id": "750b21bf.a6927",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1745.750220298767,
+        "y": 413.00000381469727,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "1f68191d.946c67"
+            ]
+        ]
+    },
+    {
+        "id": "36a67602.b4e502",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "1f68191d.946c67",
+        "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",
+        "wires": [
+            [
+                "ea1ff2ea.50521",
+                "106fbc3e.7d35bc"
+            ]
+        ]
+    },
+    {
+        "id": "ea1ff2ea.50521",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2134.898380279541,
+        "y": 413.77768898010254,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "36a67602.b4e502"
+            ]
+        ]
+    },
+    {
+        "id": "681e5161.fa20d",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "47b72aff.6069ec",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1831.250358581543,
+        "y": 595.000256061554,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "303e36f6.0c3352"
+            ]
+        ]
+    },
+    {
+        "id": "303e36f6.0c3352",
+        "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",
+        "wires": [
+            [
+                "68e091fa.27fed8",
+                "ab19b7c4.709eb"
+            ]
+        ]
+    },
+    {
+        "id": "68e091fa.27fed8",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2283.2502822875977,
+        "y": 595.000063419342,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "8fc10bf.11b3578"
+            ]
+        ]
+    },
+    {
+        "id": "ab19b7c4.709eb",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2285.2502822875977,
+        "y": 681.000063419342,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "40892b06.efda94"
+            ]
+        ]
+    },
+    {
+        "id": "301afc46.923fdc",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a6b40423.ac2ca8",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8fc10bf.11b3578",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "40892b06.efda94",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2469.2499771118164,
+        "y": 680.2726716995239,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d9ad86f3.bd8048",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "144af758.7f6181",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b6c16596.5c7c28",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "653e84f8.bbdd14",
+        "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",
+        "wires": [
+            [
+                "b41b6e9c.1adb4",
+                "88408d5b.2bbfc"
+            ]
+        ]
+    },
+    {
+        "id": "f48317c3.07c1f8",
+        "type": "comment",
+        "name": "delete resource from AAI",
+        "info": "",
+        "comments": "",
+        "x": 1289.5,
+        "y": 831.00390625,
+        "z": "910bbedd.5fbce8",
+        "wires": []
+    },
+    {
+        "id": "1310b851.c4289",
+        "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",
+        "wires": [
+            [
+                "ae25bd57.d493d"
+            ]
+        ]
+    },
+    {
+        "id": "2fcbbd67.547f72",
+        "type": "comment",
+        "name": "get generic-vnf of type AccessConnectivity",
+        "info": "",
+        "comments": "",
+        "x": 1965.2501068115234,
+        "y": 754.0039329528809,
+        "z": "910bbedd.5fbce8",
+        "wires": []
+    },
+    {
+        "id": "b4b9141a.0cfd8",
+        "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",
+        "wires": [
+            [
+                "cb45bd7f.6bb5c",
+                "f400169e.cf5978"
+            ]
+        ]
+    },
+    {
+        "id": "55a732ae.2107cc",
+        "type": "comment",
+        "name": "fetch relationship-list",
+        "info": "",
+        "comments": "",
+        "x": 1281.25,
+        "y": 635.00390625,
+        "z": "910bbedd.5fbce8",
+        "wires": []
+    },
+    {
+        "id": "cb45bd7f.6bb5c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1550.250244140625,
+        "y": 695.00390625,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "7f971e3d.47d1a"
+            ]
+        ]
+    },
+    {
+        "id": "7f971e3d.47d1a",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f400169e.cf5978",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1544.5001029968262,
+        "y": 800.7538871765137,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "52fa2c61.864a04"
+            ]
+        ]
+    },
+    {
+        "id": "52fa2c61.864a04",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1709.500072479248,
+        "y": 800.7539024353027,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "1310b851.c4289"
+            ]
+        ]
+    },
+    {
+        "id": "ae25bd57.d493d",
+        "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",
+        "wires": [
+            [
+                "f5970165.f7806"
+            ]
+        ]
+    },
+    {
+        "id": "8a56e636.4f7278",
+        "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",
+        "wires": [
+            [
+                "75f76578.cb5554"
+            ]
+        ]
+    },
+    {
+        "id": "75f76578.cb5554",
+        "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",
+        "wires": [
+            [
+                "dead2f7a.e665e8"
+            ]
+        ]
+    },
+    {
+        "id": "dead2f7a.e665e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2746.4999923706055,
+        "y": 802.7539052963257,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "eae921f2.e87618"
+            ]
+        ]
+    },
+    {
+        "id": "eae921f2.e87618",
+        "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",
+        "wires": [
+            [
+                "b9ebb66b.17626"
+            ]
+        ]
+    },
+    {
+        "id": "7851584b.b526c8",
+        "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",
+        "wires": [
+            [
+                "a3dcce28.fb6658"
+            ]
+        ]
+    },
+    {
+        "id": "a3dcce28.fb6658",
+        "type": "other",
+        "name": "AccessConnectivity",
+        "xml": "<outcome value='AccessConnectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3618.500648498535,
+        "y": 871.7539482116699,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "bea7fa49.6293f"
+            ]
+        ]
+    },
+    {
+        "id": "bea7fa49.6293f",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "88408d5b.2bbfc",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1495.5,
+        "y": 978.00390625,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "574ff2aa.24627c"
+            ]
+        ]
+    },
+    {
+        "id": "b41b6e9c.1adb4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1499.5,
+        "y": 1041.00390625,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "574ff2aa.24627c"
+            ]
+        ]
+    },
+    {
+        "id": "574ff2aa.24627c",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "f5970165.f7806",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2254.75,
+        "y": 837.2539043426514,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "8a56e636.4f7278"
+            ]
+        ]
+    },
+    {
+        "id": "7ba155f0.72fa54",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 3241.5000381469727,
+        "y": 878.2539186477661,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "7851584b.b526c8"
+            ]
+        ]
+    },
+    {
+        "id": "b9ebb66b.17626",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3144.5,
+        "y": 802.0039043426514,
+        "z": "910bbedd.5fbce8",
+        "wires": [
+            [
+                "7ba155f0.72fa54"
+            ]
+        ]
+    }
+]
\ No newline at end of file
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
new file mode 100644
index 00000000..3623c26c
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
@@ -0,0 +1,229 @@
+[
+    {
+        "id": "30e08a8.30d50f6",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 109.75,
+        "y": 57.75,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "48f4fbce.5d31ac"
+            ]
+        ]
+    },
+    {
+        "id": "48f4fbce.5d31ac",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 417.74964904785156,
+        "y": 57.75002193450928,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "74687d07.30906c"
+            ]
+        ]
+    },
+    {
+        "id": "74687d07.30906c",
+        "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",
+        "wires": [
+            [
+                "4da1c203.90ca44"
+            ]
+        ]
+    },
+    {
+        "id": "4da1c203.90ca44",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 822.7498626708984,
+        "y": 254.75006198883057,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "dd2b33a2.9b6cb8",
+                "562f3ae4.b70bec",
+                "39abed71.23fa8a"
+            ]
+        ]
+    },
+    {
+        "id": "562f3ae4.b70bec",
+        "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",
+        "wires": [
+            [
+                "218b60aa.c94c1",
+                "4970adb.e3682d4"
+            ]
+        ]
+    },
+    {
+        "id": "4970adb.e3682d4",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1451.0829811096191,
+        "y": 255.75,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "651aa8da.9f2b6"
+            ]
+        ]
+    },
+    {
+        "id": "218b60aa.c94c1",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1460.082893371582,
+        "y": 330.75000190734863,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "ac4ee16c.6acf"
+            ]
+        ]
+    },
+    {
+        "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",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "7fde3fda.e84e4",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1921.0993537902832,
+        "y": 330.78939056396484,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "26ffbe03.508d62"
+            ]
+        ]
+    },
+    {
+        "id": "b0522dad.def458",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1931.0990600585938,
+        "y": 416.78925704956055,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            [
+                "5ce83dfd.6c2514"
+            ]
+        ]
+    },
+    {
+        "id": "26ffbe03.508d62",
+        "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",
+        "comments": "",
+        "x": 2107.599021911621,
+        "y": 330.78922748565674,
+        "z": "f67d7469.c15c48",
+        "wires": []
+    },
+    {
+        "id": "5ce83dfd.6c2514",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2089.2656898498535,
+        "y": 417.7892322540283,
+        "z": "f67d7469.c15c48",
+        "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",
+        "comments": "",
+        "outputs": 1,
+        "x": 1251.765869140625,
+        "y": 169.78915786743164,
+        "z": "f67d7469.c15c48",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.json
new file mode 100644
index 00000000..dcf8206e
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.json
@@ -0,0 +1,868 @@
+[
+    {
+        "id": "67df3d21.efd52c",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 138.75,
+        "y": 228,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "2ebeb71d.ed1c1"
+            ]
+        ]
+    },
+    {
+        "id": "2ebeb71d.ed1c1",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 446.74964904785156,
+        "y": 228.00002193450928,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "94a06a6f.35a568"
+            ]
+        ]
+    },
+    {
+        "id": "94a06a6f.35a568",
+        "type": "method",
+        "name": "method:bbs-internet-profile-vnf-topology-operation-common-huawei",
+        "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 444.7496643066406,
+        "y": 448.0000991821289,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "75f89282.fedb0c"
+            ]
+        ]
+    },
+    {
+        "id": "75f89282.fedb0c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 868.7498626708984,
+        "y": 447.0000991821289,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "99e7da72.db1e4",
+                "625f4f39.37a74",
+                "92b8e97a.66da98",
+                "9defbc52.1558e"
+            ]
+        ]
+    },
+    {
+        "id": "99e7da72.db1e4",
+        "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": 1334.7500305175781,
+        "y": 126.00000953674316,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "625f4f39.37a74",
+        "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='http://172.30.0.121:5000' />\n<parameter name='prop.bbs.service_id' value='`$vnf-topology-operation-input.service-information.service-id`' />\n\n",
+        "comments": "",
+        "x": 1225.75048828125,
+        "y": 230.00021362304688,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "92b8e97a.66da98",
+        "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": 1251.75,
+        "y": 342.1111755371094,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9defbc52.1558e",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1268.2503662109375,
+        "y": 441.00017261505127,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "d9916717.6c0928"
+            ]
+        ]
+    },
+    {
+        "id": "43e1a36a.020cc4",
+        "type": "switchNode",
+        "name": "switch:ip_remote_id",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ip_remote_id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1865.2504272460938,
+        "y": 222.00020694732666,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "feb6a45b.9f6ab8"
+            ]
+        ]
+    },
+    {
+        "id": "feb6a45b.9f6ab8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2069.250347137451,
+        "y": 222.00017833709717,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "8e6ec8bf.f02418"
+            ]
+        ]
+    },
+    {
+        "id": "6b72c16.41b5e4",
+        "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": 2788.2507095336914,
+        "y": 215.60026264190674,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "d9916717.6c0928",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1514.2504081726074,
+        "y": 440.0001811981201,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "5d790984.d35b88",
+                "8bf2454f.a9b818",
+                "8e868e34.75361"
+            ]
+        ]
+    },
+    {
+        "id": "da1256ff.ec1a5",
+        "type": "switchNode",
+        "name": "switch:ont_sn",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ont_sn'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1865.102222442627,
+        "y": 283.0002088546753,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "8a0658c9.4fa7e8"
+            ]
+        ]
+    },
+    {
+        "id": "8a0658c9.4fa7e8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2068.1021251678467,
+        "y": 283.0002727508545,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "7a196104.73a3e"
+            ]
+        ]
+    },
+    {
+        "id": "313000b0.dced88",
+        "type": "set",
+        "name": "set:ont_sn",
+        "xml": "<set>\n<parameter name='prop.bbs.ont_sn' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2789.10302734375,
+        "y": 277.600341796875,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "23d73890.309c9",
+        "type": "switchNode",
+        "name": "switch:c_vlan",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'c_vlan'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1860.1024780273438,
+        "y": 642.0003833770752,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "57f5d6e8.701478"
+            ]
+        ]
+    },
+    {
+        "id": "57f5d6e8.701478",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2063.102336883545,
+        "y": 642.000394821167,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "69198446.7afba4"
+            ]
+        ]
+    },
+    {
+        "id": "fe02e63f.fd3cf8",
+        "type": "set",
+        "name": "set:c_vlan",
+        "xml": "<set>\n<parameter name='prop.bbs.c_vlan' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2782.10302734375,
+        "y": 638.6004438400269,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "35e41015.577b5",
+        "type": "switchNode",
+        "name": "switch:s_vlan",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 's_vlan'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1855.1024856567383,
+        "y": 585.2226104736328,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "d65ac585.f57af"
+            ]
+        ]
+    },
+    {
+        "id": "d65ac585.f57af",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2064.102370262146,
+        "y": 584.2226085662842,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "cde96f59.1bc7e"
+            ]
+        ]
+    },
+    {
+        "id": "9e5b76ed.075d6",
+        "type": "set",
+        "name": "set:s_vlan",
+        "xml": "<set>\n<parameter name='prop.bbs.s_vlan' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2784.10294342041,
+        "y": 578.8226985931396,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "8e6ec8bf.f02418",
+        "type": "switchNode",
+        "name": "switch:ip_remote_id value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2280.250347137451,
+        "y": 221.0002088546753,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "bd2d0a93.d2954",
+                "6702291f.3e68d"
+            ]
+        ]
+    },
+    {
+        "id": "6702291f.3e68d",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2581.2507553100586,
+        "y": 215.00030040740967,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "6b72c16.41b5e4"
+            ]
+        ]
+    },
+    {
+        "id": "7a196104.73a3e",
+        "type": "switchNode",
+        "name": "switch:ont_sn value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2280.250347137451,
+        "y": 283.0002088546753,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "bd2d0a93.d2954",
+                "820d55ce.f53d28"
+            ]
+        ]
+    },
+    {
+        "id": "820d55ce.f53d28",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2583.2507553100586,
+        "y": 278.00030040740967,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "313000b0.dced88"
+            ]
+        ]
+    },
+    {
+        "id": "69198446.7afba4",
+        "type": "switchNode",
+        "name": "switch:c_vlan value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2278.25053024292,
+        "y": 643.0003337860107,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "bd2d0a93.d2954",
+                "1ccde8ad.0e0527"
+            ]
+        ]
+    },
+    {
+        "id": "1ccde8ad.0e0527",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2582.2511291503906,
+        "y": 640.0004281997681,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "fe02e63f.fd3cf8"
+            ]
+        ]
+    },
+    {
+        "id": "cde96f59.1bc7e",
+        "type": "switchNode",
+        "name": "switch:s_vlan value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2277.25053024292,
+        "y": 584.0002937316895,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "bd2d0a93.d2954",
+                "b8522c30.4126e8"
+            ]
+        ]
+    },
+    {
+        "id": "b8522c30.4126e8",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2580.2509384155273,
+        "y": 580.0003852844238,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "9e5b76ed.075d6"
+            ]
+        ]
+    },
+    {
+        "id": "bd2d0a93.d2954",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2593.250732421875,
+        "y": 58.00020980834961,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "18ce4572.147d2b"
+            ]
+        ]
+    },
+    {
+        "id": "5d790984.d35b88",
+        "type": "switchNode",
+        "name": "switch:ip_service_type",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ip_service_type'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1862.0836181640625,
+        "y": 339.0001220703125,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "ce147d98.5f84c"
+            ]
+        ]
+    },
+    {
+        "id": "ce147d98.5f84c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2071.0834951400757,
+        "y": 342.0001049041748,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "21e94c0f.145f44"
+            ]
+        ]
+    },
+    {
+        "id": "33d7723a.ee1fa6",
+        "type": "set",
+        "name": "set:service_type",
+        "xml": "<set>\n<parameter name='prop.bbs.service_type' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2791.08406829834,
+        "y": 336.6001949310303,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "21e94c0f.145f44",
+        "type": "switchNode",
+        "name": "switch:ip_service_type value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2284.231689453125,
+        "y": 341.7778015136719,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "db0b77cc.92443",
+                "bd2d0a93.d2954"
+            ]
+        ]
+    },
+    {
+        "id": "db0b77cc.92443",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2587.232063293457,
+        "y": 337.77788162231445,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "33d7723a.ee1fa6"
+            ]
+        ]
+    },
+    {
+        "id": "bea2e68a.ff671",
+        "type": "switchNode",
+        "name": "switch:ip_rg_mac_addr",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ip_rg_mac_addr'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1860.083610534668,
+        "y": 403.00010871887207,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "79e05e1e.0db3c8"
+            ]
+        ]
+    },
+    {
+        "id": "79e05e1e.0db3c8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2069.0834951400757,
+        "y": 402.00010681152344,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "e8d83511.4fd1f8"
+            ]
+        ]
+    },
+    {
+        "id": "737bb926.32ad1",
+        "type": "set",
+        "name": "set:mac",
+        "xml": "<set>\n<parameter name='prop.bbs.mac' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2781.083984375,
+        "y": 396.6002502441406,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "e8d83511.4fd1f8",
+        "type": "switchNode",
+        "name": "switch:ip_rg_mac_addr value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2283.231689453125,
+        "y": 398.7778015136719,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "28ac52.b22063ae",
+                "bd2d0a93.d2954"
+            ]
+        ]
+    },
+    {
+        "id": "28ac52.b22063ae",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2585.232063293457,
+        "y": 397.7778835296631,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "737bb926.32ad1"
+            ]
+        ]
+    },
+    {
+        "id": "8e868e34.75361",
+        "type": "switchNode",
+        "name": "switch:ip_downstream_speed",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ip_downstream_speed'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1860.083740234375,
+        "y": 525.000244140625,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "a5513cb7.46604"
+            ]
+        ]
+    },
+    {
+        "id": "a5513cb7.46604",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2068.083655357361,
+        "y": 524.0002117156982,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "ce77b2a5.59b7c8"
+            ]
+        ]
+    },
+    {
+        "id": "e932d63c.6abfc",
+        "type": "set",
+        "name": "set:down_speed",
+        "xml": "<set>\n<parameter name='prop.bbs.down_speed' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2790.084228515625,
+        "y": 518.600341796875,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "ce77b2a5.59b7c8",
+        "type": "switchNode",
+        "name": "switch:ip_downstream_speed value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2281.2318153381348,
+        "y": 523.7778968811035,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "e9732fa8.b097d8",
+                "bd2d0a93.d2954"
+            ]
+        ]
+    },
+    {
+        "id": "e9732fa8.b097d8",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2584.232223510742,
+        "y": 519.7779884338379,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "e932d63c.6abfc"
+            ]
+        ]
+    },
+    {
+        "id": "aa2f258b.8f49d",
+        "type": "switchNode",
+        "name": "switch:service_id",
+        "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_id'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1870.0834617614746,
+        "y": 164.0000114440918,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "5c92aba9.11519c"
+            ]
+        ]
+    },
+    {
+        "id": "5c92aba9.11519c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2074.083381652832,
+        "y": 163.9999828338623,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "b45f03de.27adc8"
+            ]
+        ]
+    },
+    {
+        "id": "dca56b10.1387f",
+        "type": "set",
+        "name": "set:service_id",
+        "xml": "<set>\n<parameter name='prop.bbs.service_id' value='`$network-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2793.0837440490723,
+        "y": 157.60006713867188,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "b45f03de.27adc8",
+        "type": "switchNode",
+        "name": "switch:service_id value",
+        "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2273.08349609375,
+        "y": 164.00001525878906,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "50573a9f.221564"
+            ]
+        ]
+    },
+    {
+        "id": "50573a9f.221564",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2586.083740234375,
+        "y": 157.00010681152344,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "dca56b10.1387f"
+            ]
+        ]
+    },
+    {
+        "id": "8bf2454f.a9b818",
+        "type": "switchNode",
+        "name": "switch:ip_upstream_speed",
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ip_upstream_speed'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1859.0839309692383,
+        "y": 464.0001907348633,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "ccee47e.f21eb38"
+            ]
+        ]
+    },
+    {
+        "id": "ccee47e.f21eb38",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2068.083815574646,
+        "y": 463.00018882751465,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "1f6e7d1f.1936f3"
+            ]
+        ]
+    },
+    {
+        "id": "18996180.b69b87",
+        "type": "set",
+        "name": "set:up_speed",
+        "xml": "<set>\n<parameter name='prop.bbs.up_speed' value='`$vnf-input-parameters.param[$idx].value`' />\n",
+        "comments": "",
+        "x": 2788.08438873291,
+        "y": 457.6002788543701,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "1f6e7d1f.1936f3",
+        "type": "switchNode",
+        "name": "switch:ip_upstream_speed value",
+        "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2281.23197555542,
+        "y": 462.7778739929199,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "476af5a3.a15174",
+                "bd2d0a93.d2954"
+            ]
+        ]
+    },
+    {
+        "id": "476af5a3.a15174",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2584.2323837280273,
+        "y": 458.7779655456543,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            [
+                "18996180.b69b87"
+            ]
+        ]
+    },
+    {
+        "id": "18ce4572.147d2b",
+        "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": 2780.083251953125,
+        "y": 57,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": []
+    },
+    {
+        "id": "e378e40c.60fa88",
+        "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=\"bbs-internet-profile-common\" />\n    <parameter name=\"field2\" value=\"`$prop.bbs.service_id`\" />\n    <parameter name=\"field3\" value=\"`$prop.bbs.remote_id`\" />\n    <parameter name=\"field4\" value=\"`$prop.bbs.ont_sn`\" />\n    <parameter name=\"field5\" value=\"`$prop.bbs.service_type`\" />\n    <parameter name=\"field6\" value=\"`$prop.bbs.mac`\" />\n    <parameter name=\"field7\" value=\"`$prop.bbs.up_speed`\" />\n    <parameter name=\"field8\" value=\"`$prop.bbs.down_speed`\" />\n    <parameter name=\"field9\" value=\"`$prop.bbs.s_vlan`\" />\n    <parameter name=\"field10\" value=\"`$prop.bbs.c_vlan`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1202.972095489502,
+        "y": 547.5555591583252,
+        "z": "cbd0c9d9.5a7c9",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
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
new file mode 100644
index 00000000..3bb17819
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
@@ -0,0 +1,624 @@
+[
+    {
+        "id": "e24bd1dc.e94098",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 93.75,
+        "y": 67,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "4ea3eab3.ac826c"
+            ]
+        ]
+    },
+    {
+        "id": "4ea3eab3.ac826c",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 453.74964904785156,
+        "y": 68.00002193450928,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "5c5c94c9.de2b2c"
+            ]
+        ]
+    },
+    {
+        "id": "5c5c94c9.de2b2c",
+        "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",
+        "wires": [
+            [
+                "f9739e65.c96bc8"
+            ]
+        ]
+    },
+    {
+        "id": "f9739e65.c96bc8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 875.7498626708984,
+        "y": 287.0000991821289,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "4406703d.473cb",
+                "24ad8f04.047a9",
+                "e22f8867.ca2c88",
+                "e451aa9.94334d8"
+            ]
+        ]
+    },
+    {
+        "id": "4406703d.473cb",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e451aa9.94334d8",
+        "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\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1281.4007873535156,
+        "y": 285.9608345031738,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "8b4a24c2.b740e",
+                "ef3863e0.509128"
+            ]
+        ]
+    },
+    {
+        "id": "ef3863e0.509128",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1582.7337684631348,
+        "y": 285.9608345031738,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "7fe5ce9e.59b238"
+            ]
+        ]
+    },
+    {
+        "id": "8b4a24c2.b740e",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1591.7336807250977,
+        "y": 360.96083641052246,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "aa1c3229.429f2"
+            ]
+        ]
+    },
+    {
+        "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",
+        "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",
+        "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",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d8e72813.387f28",
+        "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",
+        "wires": [
+            [
+                "333581cd.5fc33e",
+                "72a79e15.e23ae",
+                "8820e403.3378d8"
+            ]
+        ]
+    },
+    {
+        "id": "333581cd.5fc33e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1701.0030918121338,
+        "y": 622.9199714660645,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "3908c055.5bdf4"
+            ]
+        ]
+    },
+    {
+        "id": "72a79e15.e23ae",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1711.978910446167,
+        "y": 682.9358277320862,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "d8258ad6.c3d598"
+            ]
+        ]
+    },
+    {
+        "id": "3908c055.5bdf4",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "d8258ad6.c3d598",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "8820e403.3378d8",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1705.5897159576416,
+        "y": 748.0623078346252,
+        "z": "ad46b000.c8324",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "58b69da0.e8a154",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d09cdb3b.55b35",
+        "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",
+        "wires": [
+            [
+                "47ea2ed4.dab158",
+                "9b5c45a7.24ac",
+                "6e196242.6f111c"
+            ]
+        ]
+    },
+    {
+        "id": "47ea2ed4.dab158",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1693.756097793579,
+        "y": 834.3955845832825,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "9c97c54a.182df"
+            ]
+        ]
+    },
+    {
+        "id": "9b5c45a7.24ac",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1705.7322597503662,
+        "y": 904.4115180969238,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "b3de2c8b.bfd47"
+            ]
+        ]
+    },
+    {
+        "id": "9c97c54a.182df",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "b3de2c8b.bfd47",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "6e196242.6f111c",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1700.3429698944092,
+        "y": 974.5379576683044,
+        "z": "ad46b000.c8324",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7263158e.3880f4",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e22f8867.ca2c88",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1159.914836883545,
+        "y": 624.9997653961182,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "d8e72813.387f28",
+                "d09cdb3b.55b35",
+                "336f1685.eaa8ba",
+                "869f359a.e187d8",
+                "ad68b782.700918"
+            ]
+        ]
+    },
+    {
+        "id": "336f1685.eaa8ba",
+        "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",
+        "comments": "",
+        "x": 1447.9151859283447,
+        "y": 621.332763671875,
+        "z": "ad46b000.c8324",
+        "wires": []
+    },
+    {
+        "id": "869f359a.e187d8",
+        "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",
+        "wires": [
+            [
+                "945f0b47.7a271"
+            ]
+        ]
+    },
+    {
+        "id": "945f0b47.7a271",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1698.2793426513672,
+        "y": 548.0305881500244,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "ba59e650.603da8"
+            ]
+        ]
+    },
+    {
+        "id": "ba59e650.603da8",
+        "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",
+        "wires": [
+            [
+                "983150fa.b57c18"
+            ]
+        ]
+    },
+    {
+        "id": "7b3b5961.4f30b8",
+        "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",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "983150fa.b57c18",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2056.27933883667,
+        "y": 545.0306186676025,
+        "z": "ad46b000.c8324",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad68b782.700918",
+        "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",
+        "wires": [
+            [
+                "95e71e63.b5a5e",
+                "2d716580.c38172",
+                "e09c00e3.de6a5"
+            ]
+        ]
+    },
+    {
+        "id": "95e71e63.b5a5e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1639.2255096435547,
+        "y": 1054.3646035194397,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "aaa91f6b.20f22"
+            ]
+        ]
+    },
+    {
+        "id": "2d716580.c38172",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1651.2016716003418,
+        "y": 1124.380537033081,
+        "z": "ad46b000.c8324",
+        "wires": [
+            [
+                "bffe8727.325998"
+            ]
+        ]
+    },
+    {
+        "id": "aaa91f6b.20f22",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "bffe8727.325998",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "e09c00e3.de6a5",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1645.8123817443848,
+        "y": 1194.5069766044617,
+        "z": "ad46b000.c8324",
+        "wires": [
+            []
+        ]
+    }
+]
\ No newline at end of file
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
new file mode 100644
index 00000000..93ffdb3f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
@@ -0,0 +1,487 @@
+[
+    {
+        "id": "a77f6699.47796",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 106.75,
+        "y": 79.77389526367188,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "c640c202.91b41"
+            ]
+        ]
+    },
+    {
+        "id": "c640c202.91b41",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 414.74964904785156,
+        "y": 79.77391719818115,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "4e95369f.bf41e"
+            ]
+        ]
+    },
+    {
+        "id": "4e95369f.bf41e",
+        "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",
+        "wires": [
+            [
+                "a33839b0.90a02"
+            ]
+        ]
+    },
+    {
+        "id": "a33839b0.90a02",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 819.7498626708984,
+        "y": 276.77395725250244,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "2ed02a5c.5d72ce",
+                "c8fbb930.846a4",
+                "3956ad31.45a35a",
+                "bf1fcd53.ddfe",
+                "1fd3f69.1d31e89"
+            ]
+        ]
+    },
+    {
+        "id": "1fd3f69.1d31e89",
+        "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",
+        "wires": [
+            [
+                "4123db34.0e7424",
+                "888adbdc.266ba8"
+            ]
+        ]
+    },
+    {
+        "id": "888adbdc.266ba8",
+        "type": "outcome",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1509.7339057922363,
+        "y": 280.7347803115845,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "6237fdd6.7dcb44"
+            ]
+        ]
+    },
+    {
+        "id": "4123db34.0e7424",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1518.7338180541992,
+        "y": 355.7347822189331,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "497cc63b.30848"
+            ]
+        ]
+    },
+    {
+        "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",
+        "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",
+        "wires": []
+    },
+    {
+        "id": "448428e5.a62b48",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1979.7502784729004,
+        "y": 355.7741708755493,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "eba25570.9a106"
+            ]
+        ]
+    },
+    {
+        "id": "7cffa4c4.69e0d4",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1989.749984741211,
+        "y": 441.774037361145,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "4fc581b8.3b36a"
+            ]
+        ]
+    },
+    {
+        "id": "eba25570.9a106",
+        "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",
+        "comments": "",
+        "x": 2166.2499465942383,
+        "y": 355.7740077972412,
+        "z": "e5a6ac34.a7198",
+        "wires": []
+    },
+    {
+        "id": "4fc581b8.3b36a",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2147.9166145324707,
+        "y": 442.7740125656128,
+        "z": "e5a6ac34.a7198",
+        "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",
+        "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": 1508.6150512695312,
+        "y": 455.41671800613403,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "dca82cdd.160458"
+            ]
+        ]
+    },
+    {
+        "id": "dca82cdd.160458",
+        "type": "other",
+        "name": "generic-vnf.vnf-id",
+        "xml": "<outcome value='generic-vnf.vnf-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1681.837272644043,
+        "y": 455.5277795791626,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "48c7c532.f812c4"
+            ]
+        ]
+    },
+    {
+        "id": "48c7c532.f812c4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1861.0594940185547,
+        "y": 523.3055810928345,
+        "z": "e5a6ac34.a7198",
+        "wires": [
+            [
+                "dbcb4df4.6dfa68"
+            ]
+        ]
+    },
+    {
+        "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/json/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.json
new file mode 100644
index 00000000..07e9652f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.json
@@ -0,0 +1,504 @@
+[
+    {
+        "id": "a9992098.98ab18",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 96.75,
+        "y": 57.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "b815cf12.b0f358"
+            ]
+        ]
+    },
+    {
+        "id": "b815cf12.b0f358",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 366.75,
+        "y": 57.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "515a8ca6.2d48c4"
+            ]
+        ]
+    },
+    {
+        "id": "515a8ca6.2d48c4",
+        "type": "method",
+        "name": "method:validate-bbs-vnf-input-parameters",
+        "xml": "<method rpc='validate-bbs-vnf-input-parameters' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 758.7498779296875,
+        "y": 57.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "1160ee5b.11a072"
+            ]
+        ]
+    },
+    {
+        "id": "1160ee5b.11a072",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 469.75,
+        "y": 144.75001525878906,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "904a6abf.9f47c"
+            ]
+        ]
+    },
+    {
+        "id": "904a6abf.9f47c",
+        "type": "switchNode",
+        "name": "switch:svc-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 454.75000762939453,
+        "y": 238.75000762939453,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "73e23753.5f31b",
+                "c63a6845.3e4b2",
+                "b73b7c67.cf381",
+                "ef9a66d0.5d5de8",
+                "df3235d7.2ecca"
+            ]
+        ]
+    },
+    {
+        "id": "73e23753.5f31b",
+        "type": "outcome",
+        "name": "create",
+        "xml": "<outcome value='create'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 676.75,
+        "y": 238.75003051757812,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "d43534da.befd08"
+            ]
+        ]
+    },
+    {
+        "id": "c63a6845.3e4b2",
+        "type": "outcome",
+        "name": "delete",
+        "xml": "<outcome value='delete'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 675.75,
+        "y": 302.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "e1ebb976.fa7488"
+            ]
+        ]
+    },
+    {
+        "id": "b73b7c67.cf381",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 662.7500343322754,
+        "y": 607.7500343322754,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "3d3b926c.d6df1e"
+            ]
+        ]
+    },
+    {
+        "id": "d43534da.befd08",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 903.0833358764648,
+        "y": 237.75002670288086,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "5c667f46.96bd7"
+            ]
+        ]
+    },
+    {
+        "id": "e1ebb976.fa7488",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 903.0833358764648,
+        "y": 301.75000858306885,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "3137b2c2.32238e"
+            ]
+        ]
+    },
+    {
+        "id": "5c667f46.96bd7",
+        "type": "switchNode",
+        "name": "switch:request-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1115.083339691162,
+        "y": 236.75000762939453,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "8981d1ec.3bb948",
+                "cc2e3282.1d98",
+                "38546e0a.6a6f3a"
+            ]
+        ]
+    },
+    {
+        "id": "8981d1ec.3bb948",
+        "type": "outcome",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1405.0833740234375,
+        "y": 444.7500162124634,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "933f521f.c00278"
+            ]
+        ]
+    },
+    {
+        "id": "cc2e3282.1d98",
+        "type": "outcome",
+        "name": "CreateAccessConnectivityInstance",
+        "xml": "<outcome value='CreateAccessConnectivityInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1438.7500915527344,
+        "y": 153.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "cce51a56.4dfcb8"
+            ]
+        ]
+    },
+    {
+        "id": "38546e0a.6a6f3a",
+        "type": "outcome",
+        "name": "CreateInternetProfileInstance",
+        "xml": "<outcome value='CreateInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1445.7500457763672,
+        "y": 218.75000953674316,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "533ce592.219cbc"
+            ]
+        ]
+    },
+    {
+        "id": "af14d38f.89a018",
+        "type": "outcome",
+        "name": "DeleteAccessConnectivityInstance",
+        "xml": "<outcome value='DeleteAccessConnectivityInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1458.7500457763672,
+        "y": 300.75001335144043,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "13165c7f.2eb154"
+            ]
+        ]
+    },
+    {
+        "id": "782019cd.4ecf2",
+        "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=\"svc-action is null\" />\n\n",
+        "comments": "",
+        "x": 882.4167060852051,
+        "y": 670.7500228881836,
+        "z": "629b4dd0.5a65b4",
+        "wires": []
+    },
+    {
+        "id": "933f521f.c00278",
+        "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 invalid request-action\" />\n\n",
+        "comments": "",
+        "x": 1757.416748046875,
+        "y": 440.7500305175781,
+        "z": "629b4dd0.5a65b4",
+        "wires": []
+    },
+    {
+        "id": "533ce592.219cbc",
+        "type": "switchNode",
+        "name": "switch：param_length",
+        "xml": "<switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1759.7500534057617,
+        "y": 217.75000953674316,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "333a72da.6e4976"
+            ]
+        ]
+    },
+    {
+        "id": "cce51a56.4dfcb8",
+        "type": "switchNode",
+        "name": "switch：param_length",
+        "xml": "<switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1753.7500457763672,
+        "y": 148.75000476837158,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "333a72da.6e4976"
+            ]
+        ]
+    },
+    {
+        "id": "333a72da.6e4976",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2091.7500610351562,
+        "y": 232.75000953674316,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "d1cc2dc6.b055c8"
+            ]
+        ]
+    },
+    {
+        "id": "d1cc2dc6.b055c8",
+        "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 invalid request-action\" />\n\n",
+        "comments": "",
+        "x": 2273.75,
+        "y": 237.75,
+        "z": "629b4dd0.5a65b4",
+        "wires": []
+    },
+    {
+        "id": "ef9a66d0.5d5de8",
+        "type": "outcome",
+        "name": "null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 660.7500190734863,
+        "y": 670.7500228881836,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "782019cd.4ecf2"
+            ]
+        ]
+    },
+    {
+        "id": "3d3b926c.d6df1e",
+        "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=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
+        "comments": "",
+        "x": 884.7500190734863,
+        "y": 608.7500228881836,
+        "z": "629b4dd0.5a65b4",
+        "wires": []
+    },
+    {
+        "id": "e4ebecc9.a43058",
+        "type": "outcome",
+        "name": "DeleteInternetProfileInstance",
+        "xml": "<outcome value='DeleteInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1447.7500457763672,
+        "y": 368.75001525878906,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "da26b180.cc3608"
+            ]
+        ]
+    },
+    {
+        "id": "df3235d7.2ecca",
+        "type": "outcome",
+        "name": "update",
+        "xml": "<outcome value='update'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 679.7500190734863,
+        "y": 503.750018119812,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "935b3789.af6a8"
+            ]
+        ]
+    },
+    {
+        "id": "935b3789.af6a8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 896.7500228881836,
+        "y": 503.7500171661377,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "c30b2086.9a6bb8"
+            ]
+        ]
+    },
+    {
+        "id": "9dbf4a15.2892a8",
+        "type": "outcome",
+        "name": "ChangeInternetProfileInstance",
+        "xml": "<outcome value='ChangeInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1451.4167938232422,
+        "y": 503.7500190734863,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "ab50873c.7273f"
+            ]
+        ]
+    },
+    {
+        "id": "c30b2086.9a6bb8",
+        "type": "switchNode",
+        "name": "switch:request-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1110.7500305175781,
+        "y": 503.7500171661377,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "9dbf4a15.2892a8",
+                "8981d1ec.3bb948"
+            ]
+        ]
+    },
+    {
+        "id": "3137b2c2.32238e",
+        "type": "switchNode",
+        "name": "switch:request-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1114.0833435058594,
+        "y": 300.75000858306885,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "8981d1ec.3bb948",
+                "af14d38f.89a018",
+                "e4ebecc9.a43058"
+            ]
+        ]
+    },
+    {
+        "id": "ab50873c.7273f",
+        "type": "switchNode",
+        "name": "switch：param_length",
+        "xml": "<switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1758.4167175292969,
+        "y": 501.7500190734863,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "333a72da.6e4976"
+            ]
+        ]
+    },
+    {
+        "id": "da26b180.cc3608",
+        "type": "switchNode",
+        "name": "switch：param_length",
+        "xml": "<switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1771.7500495910645,
+        "y": 367.7500157356262,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "333a72da.6e4976"
+            ]
+        ]
+    },
+    {
+        "id": "13165c7f.2eb154",
+        "type": "switchNode",
+        "name": "switch：param_length",
+        "xml": "<switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1763.7500495910645,
+        "y": 300.7500114440918,
+        "z": "629b4dd0.5a65b4",
+        "wires": [
+            [
+                "333a72da.6e4976"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
index 862af35e..e10de62f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vnf-topology-operation.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "8fdeb7a9.28b73",
+        "id": "6970cbfb.c1907c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 133.33334350585938,
-        "y": 198.65174865722656,
-        "z": "4222f00.ce0af9",
+        "x": 122.75,
+        "y": 181.98507690429688,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "ac89694.ba92398"
+                "99e58991.186a5"
             ]
         ]
     },
     {
-        "id": "ac89694.ba92398",
+        "id": "99e58991.186a5",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1435 +22,2050 @@
         "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": 216.61904907226562,
-        "y": 259.8898468017578,
-        "z": "4222f00.ce0af9",
+        "x": 206.03570556640625,
+        "y": 243.22317504882812,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "4ed3dee7.bee43"
+                "2fd42108.8384a6"
             ]
         ]
     },
     {
-        "id": "4ed3dee7.bee43",
+        "id": "2fd42108.8384a6",
         "type": "method",
         "name": "method vnf-topology-operation",
         "xml": "<method rpc='vnf-topology-operation' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 208.76197052001953,
-        "y": 322.65174293518066,
-        "z": "4222f00.ce0af9",
+        "x": 198.17862701416016,
+        "y": 305.985071182251,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "323edb9d.64f90c"
+                "c0fe93ff.46afe8"
             ]
         ]
     },
     {
-        "id": "f6611062.32edc8",
+        "id": "6dce1d8e.e0f0dc",
         "type": "comment",
         "name": "vnf-topology-operation",
         "info": "",
         "comments": "",
-        "x": 533.249641418457,
-        "y": 41.66667175292969,
-        "z": "4222f00.ce0af9",
+        "x": 522.6662979125977,
+        "y": 25,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "323edb9d.64f90c",
+        "id": "c0fe93ff.46afe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 232.50010681152344,
-        "y": 652.345269203186,
-        "z": "4222f00.ce0af9",
+        "x": 221.91676330566406,
+        "y": 635.6785974502563,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "bb8e5eb.0d904a",
-                "a9e4287a.aac75",
-                "f6d8c8e4.810ef8"
+                "10cbb1dc.2702c6",
+                "54fd59c9.529288",
+                "5d438b9c.3a31f4"
             ]
         ]
     },
     {
-        "id": "bb8e5eb.0d904a",
+        "id": "10cbb1dc.2702c6",
         "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": 525.0000610351562,
-        "y": 807.5093021392822,
-        "z": "4222f00.ce0af9",
+        "x": 514.4167175292969,
+        "y": 790.8426303863525,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "a9e4287a.aac75",
+        "id": "54fd59c9.529288",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 527.9047775268555,
-        "y": 650.5565128326416,
-        "z": "4222f00.ce0af9",
+        "x": 517.3214340209961,
+        "y": 633.8898410797119,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "94449c01.485b08",
-                "ab1de4a6.ec9de8",
-                "22cb5ee7.7cac7a",
-                "1bb1a526.b8fb8b",
-                "d38893a3.06ce68",
-                "7c2e0e4c.dbf17",
-                "80230dcd.458b9"
+                "306534c7.4b7964",
+                "fac214a0.d9f068",
+                "8af1e144.1ebf78",
+                "75b6f00a.5c8fd",
+                "4c5cf395.49e5f4",
+                "755c8b59.1d2dc4",
+                "71f10773.d1b468",
+                "ed83e2f.1faa02"
             ]
         ]
     },
     {
-        "id": "94449c01.485b08",
+        "id": "306534c7.4b7964",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 862.7143249511719,
-        "y": 478.1756229400635,
-        "z": "4222f00.ce0af9",
+        "x": 852.1309814453125,
+        "y": 461.5089511871338,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "30e9386b.1bf9e"
+                "8097b3a1.623438"
             ]
         ]
     },
     {
-        "id": "ab1de4a6.ec9de8",
+        "id": "fac214a0.d9f068",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 938.7621431350708,
-        "y": 1247.3663778305054,
-        "z": "4222f00.ce0af9",
+        "x": 928.1787996292114,
+        "y": 1230.6997060775757,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "e1715245.60eaa"
+                "ebbf23ca.a1c418"
             ]
         ]
     },
     {
-        "id": "1bb1a526.b8fb8b",
+        "id": "75b6f00a.5c8fd",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 922.4763793945312,
-        "y": 1935.5566053390503,
-        "z": "4222f00.ce0af9",
+        "x": 892.89306640625,
+        "y": 2323.889892578125,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "6484b763.09f248"
+                "cd64d64b.85d62"
             ]
         ]
     },
     {
-        "id": "6484b763.09f248",
+        "id": "cd64d64b.85d62",
         "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=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 1155.6668090820312,
-        "y": 1935.5566663742065,
-        "z": "4222f00.ce0af9",
+        "x": 1116.08349609375,
+        "y": 2322.889892578125,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "f6d8c8e4.810ef8",
+        "id": "5d438b9c.3a31f4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:validate-vnf-input",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 633.7500305175781,
-        "y": 403.0328006744385,
-        "z": "4222f00.ce0af9",
+        "x": 623.1666870117188,
+        "y": 386.3661289215088,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "429c50f6.4998d",
+        "id": "b63e8b29.e7f0a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1758.52392578125,
-        "y": 1224.4137573242188,
-        "z": "4222f00.ce0af9",
+        "x": 1747.9405822753906,
+        "y": 1207.747085571289,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e1715245.60eaa",
+        "id": "ebbf23ca.a1c418",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-unassign",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1304.52392578125,
-        "y": 1268.7471923828125,
-        "z": "4222f00.ce0af9",
+        "x": 1293.9405822753906,
+        "y": 1252.0805206298828,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "22cb5ee7.7cac7a",
+        "id": "8af1e144.1ebf78",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 907.8572235107422,
-        "y": 986.7470874786377,
-        "z": "4222f00.ce0af9",
+        "x": 897.2738800048828,
+        "y": 970.080415725708,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "cdaea7ef.202f1"
+                "ec8e6332.b6c05"
             ]
         ]
     },
     {
-        "id": "5f7fbdef.90e2d4",
+        "id": "7890bbbe.2a813c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1710.33349609375,
-        "y": 885.6517333984375,
-        "z": "4222f00.ce0af9",
+        "x": 1699.7501525878906,
+        "y": 868.9850616455078,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d38893a3.06ce68",
+        "id": "4c5cf395.49e5f4",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 870.6666564941406,
-        "y": 648.3183860778809,
-        "z": "4222f00.ce0af9",
+        "x": 860.0833129882812,
+        "y": 631.6517143249512,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "b35b44fe.c5e848"
+                "3e54bc75.144ee4"
             ]
         ]
     },
     {
-        "id": "7c2e0e4c.dbf17",
+        "id": "755c8b59.1d2dc4",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 940.3335733413696,
-        "y": 1379.7380447387695,
-        "z": "4222f00.ce0af9",
+        "x": 929.7502298355103,
+        "y": 1363.0713729858398,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "fe327fc4.4bce4"
+                "8f08f8ba.193ed8"
             ]
         ]
     },
     {
-        "id": "80230dcd.458b9",
+        "id": "71f10773.d1b468",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 933.3335723876953,
-        "y": 1690.7380547523499,
-        "z": "4222f00.ce0af9",
+        "x": 919.750244140625,
+        "y": 1796.0714111328125,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "b29c169a.b9c29"
+                "9c586f2f.e33028"
             ]
         ]
     },
     {
-        "id": "dcb80299.88d2d8",
+        "id": "303d5d1e.01d29a",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1112.3334274291992,
-        "y": 703.7380628585815,
-        "z": "4222f00.ce0af9",
+        "x": 1101.7500839233398,
+        "y": 687.0713911056519,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "e5663cdc.f3bed8",
-                "7304998c.6c78d8",
-                "8d2f7cd0.1216b",
-                "e5c3291c.26157",
-                "6ed7f901.e4837",
-                "f1eb2324.c790d",
-                "793759a8.9ea39"
+                "c4010eac.92b6d",
+                "8097bbf5.dccfc8",
+                "6b700dfa.5b7894",
+                "4877cf68.9cf618",
+                "d97c0f9f.42635",
+                "2be7f987.98f3ce",
+                "85c7833e.301688"
             ]
         ]
     },
     {
-        "id": "7304998c.6c78d8",
+        "id": "8097bbf5.dccfc8",
         "type": "outcome",
         "name": "ActivateSiteInstance",
         "xml": "<outcome value='ActivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1372.809669494629,
-        "y": 626.2173137664795,
-        "z": "4222f00.ce0af9",
+        "x": 1362.2263259887695,
+        "y": 609.5506420135498,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "fe22d944.1fc73"
+                "2090147c.7f3ebc"
             ]
         ]
     },
     {
-        "id": "e5663cdc.f3bed8",
+        "id": "c4010eac.92b6d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1342.3810424804688,
-        "y": 888.2620239257812,
-        "z": "4222f00.ce0af9",
+        "x": 1331.7976989746094,
+        "y": 871.5953521728516,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "5f7fbdef.90e2d4"
+                "7890bbbe.2a813c"
             ]
         ]
     },
     {
-        "id": "b35b44fe.c5e848",
+        "id": "3e54bc75.144ee4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1051.3334274291992,
-        "y": 648.7380628585815,
-        "z": "4222f00.ce0af9",
+        "x": 1040.7500839233398,
+        "y": 632.0713911056519,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "dcb80299.88d2d8"
+                "303d5d1e.01d29a"
             ]
         ]
     },
     {
-        "id": "fe22d944.1fc73",
+        "id": "2090147c.7f3ebc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1739.3334732055664,
-        "y": 628.7380962371826,
-        "z": "4222f00.ce0af9",
+        "x": 1728.750129699707,
+        "y": 612.0714244842529,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ca1873d2.9915c8",
+        "id": "a872eb97.73437",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1170.3335418701172,
-        "y": 1019.7380542755127,
-        "z": "4222f00.ce0af9",
+        "x": 1159.7501983642578,
+        "y": 1003.071382522583,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "c7150aee.048ae",
-                "a855fae3.c07",
-                "149bd874.b6e848",
-                "f2c6835b.e4dce8",
-                "23e0c188.77d676",
-                "7fbdfe6d.74e92"
+                "d3169c17.8c1318",
+                "495a662d.78b068",
+                "6dfb7278.159c44",
+                "25872c81.98ab74",
+                "897395af.927c48",
+                "ebf879bd.b608f8"
             ]
         ]
     },
     {
-        "id": "a855fae3.c07",
+        "id": "495a662d.78b068",
         "type": "outcome",
         "name": "DeactivateSiteInstance",
         "xml": "<outcome value='DeactivateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1413.8097381591797,
-        "y": 971.2173027992249,
-        "z": "4222f00.ce0af9",
+        "x": 1403.2263946533203,
+        "y": 954.5506310462952,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "b98150d7.417838"
+                "2f898baf.553cbc"
             ]
         ]
     },
     {
-        "id": "c7150aee.048ae",
+        "id": "d3169c17.8c1318",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1395.3810424804688,
-        "y": 1223.2620239257812,
-        "z": "4222f00.ce0af9",
+        "x": 1384.7976989746094,
+        "y": 1206.5953521728516,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "429c50f6.4998d"
+                "b63e8b29.e7f0a8"
             ]
         ]
     },
     {
-        "id": "cdaea7ef.202f1",
+        "id": "ec8e6332.b6c05",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1109.3335418701172,
-        "y": 964.7380542755127,
-        "z": "4222f00.ce0af9",
+        "x": 1098.7501983642578,
+        "y": 948.071382522583,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "ca1873d2.9915c8"
+                "a872eb97.73437"
             ]
         ]
     },
     {
-        "id": "b98150d7.417838",
+        "id": "2f898baf.553cbc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1783.3335418701172,
-        "y": 968.738085269928,
-        "z": "4222f00.ce0af9",
+        "x": 1772.7501983642578,
+        "y": 952.0714135169983,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3b42cf5.a45af",
+        "id": "e542c925.100cb",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1138.6669692993164,
-        "y": 1466.324354171753,
-        "z": "4222f00.ce0af9",
+        "x": 1128.083625793457,
+        "y": 1449.6576824188232,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "6adc7d8f.7076d4",
-                "b51aa3b1.e2b098",
-                "b80b7710.1796",
-                "7ffb66a7.7d6c7",
-                "68aa167c.112dc",
-                "3353033f.efa8dc",
-                "a5d6fe4e.3bf49"
+                "4cf2e62b.d1fd08",
+                "9b7a0b77.8dcfd",
+                "bc0dfdf.db024",
+                "822ca78e.7c6b1",
+                "bc324ef7.aba63",
+                "594d2772.c82a7",
+                "2476b7aa.1b79f8",
+                "84311768.7532f",
+                "3fe1f22d.2ed6be"
             ]
         ]
     },
     {
-        "id": "b51aa3b1.e2b098",
+        "id": "9b7a0b77.8dcfd",
         "type": "outcome",
         "name": "CreateSiteInstance",
         "xml": "<outcome value='CreateSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1394.1434602737427,
-        "y": 1318.8036885261536,
-        "z": "4222f00.ce0af9",
+        "x": 1389.56005859375,
+        "y": 1366.136962890625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "ca881a35.a5529"
+                "3600755e.c820da"
             ]
         ]
     },
     {
-        "id": "6adc7d8f.7076d4",
+        "id": "4cf2e62b.d1fd08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1367.714485168457,
-        "y": 1586.8482398986816,
-        "z": "4222f00.ce0af9",
+        "x": 1363.1310834884644,
+        "y": 1634.181514263153,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "a995e733.6624d"
+                "d3577745.7a3668"
             ]
         ]
     },
     {
-        "id": "fe327fc4.4bce4",
+        "id": "8f08f8ba.193ed8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1122.6670579910278,
-        "y": 1377.3244123458862,
-        "z": "4222f00.ce0af9",
+        "x": 1112.0837144851685,
+        "y": 1360.6577405929565,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "e3b42cf5.a45af"
+                "e542c925.100cb"
             ]
         ]
     },
     {
-        "id": "ca881a35.a5529",
+        "id": "3600755e.c820da",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1770.6671648025513,
-        "y": 1317.3244471549988,
-        "z": "4222f00.ce0af9",
+        "x": 1766.0837631225586,
+        "y": 1364.6577215194702,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a995e733.6624d",
+        "id": "d3577745.7a3668",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1508.0000610351562,
-        "y": 1587.9046630859375,
-        "z": "4222f00.ce0af9",
+        "x": 1503.4166593551636,
+        "y": 1635.237937450409,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3304e593.ae05a2",
+        "id": "cf368a61.e211c8",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1179.3335723876953,
-        "y": 1743.2380547523499,
-        "z": "4222f00.ce0af9",
+        "x": 1165.750244140625,
+        "y": 1848.5714111328125,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "f68499ae.c551c",
-                "61c977c4.a99308",
-                "3a60ff9d.338988",
-                "6cb20a0.dcd7c78",
-                "c9636adc.daf0f8",
-                "c849034b.de7bb",
-                "36a6c0b5.0c1d9"
+                "579fcf13.f7d6f8",
+                "192b14c7.a9450b",
+                "7268797a.eb65d",
+                "9e7e4bfc.278db8",
+                "1b2e943b.d70b5c",
+                "c0d1dfda.9d8bf8",
+                "61af328b.a8ad5c",
+                "2446e491.707454",
+                "b0d73803.27cd6"
             ]
         ]
     },
     {
-        "id": "61c977c4.a99308",
+        "id": "192b14c7.a9450b",
         "type": "outcome",
         "name": "DeleteSiteInstance",
         "xml": "<outcome value='DeleteSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1419.8097915649414,
-        "y": 1688.7172985076904,
-        "z": "4222f00.ce0af9",
+        "x": 1406.226463317871,
+        "y": 1794.050654888153,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "7e6766e4.d1d63"
+                "c183a045.30b8"
             ]
         ]
     },
     {
-        "id": "f68499ae.c551c",
+        "id": "579fcf13.f7d6f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1389.7146606445312,
-        "y": 1965.7623291015625,
-        "z": "4222f00.ce0af9",
+        "x": 1376.131332397461,
+        "y": 2071.095685482025,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "7e606597.d9e3f4"
+                "8b1483fa.aa37f8"
             ]
         ]
     },
     {
-        "id": "b29c169a.b9c29",
+        "id": "9c586f2f.e33028",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1118.3335723876953,
-        "y": 1688.2380547523499,
-        "z": "4222f00.ce0af9",
+        "x": 1104.750244140625,
+        "y": 1793.5714111328125,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "3304e593.ae05a2"
+                "cf368a61.e211c8"
             ]
         ]
     },
     {
-        "id": "7e6766e4.d1d63",
+        "id": "c183a045.30b8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:site-vnf-topology-operation-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1792.333595275879,
-        "y": 1686.2380504608154,
-        "z": "4222f00.ce0af9",
+        "x": 1778.7502670288086,
+        "y": 1791.571406841278,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e606597.d9e3f4",
+        "id": "8b1483fa.aa37f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1525.0001831054688,
-        "y": 1958.4853515625,
-        "z": "4222f00.ce0af9",
+        "x": 1511.4168548583984,
+        "y": 2063.8187079429626,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d2f7cd0.1216b",
+        "id": "6b700dfa.5b7894",
         "type": "outcome",
         "name": "ActivateSDWANDeviceInstance",
         "xml": "<outcome value='ActivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1404.000099182129,
-        "y": 677.2381267547607,
-        "z": "4222f00.ce0af9",
+        "x": 1393.4167556762695,
+        "y": 660.571455001831,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "38a8e37a.8a0dfc"
+                "dde383e2.14d1b"
             ]
         ]
     },
     {
-        "id": "38a8e37a.8a0dfc",
+        "id": "dde383e2.14d1b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1843.523780822754,
-        "y": 675.7588787078857,
-        "z": "4222f00.ce0af9",
+        "x": 1832.9404373168945,
+        "y": 659.092206954956,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "149bd874.b6e848",
+        "id": "6dfb7278.159c44",
         "type": "outcome",
         "name": "DeactivateSDWANDeviceInstance",
         "xml": "<outcome value='DeactivateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1454.9999771118164,
-        "y": 1019.2380814552307,
-        "z": "4222f00.ce0af9",
+        "x": 1444.416633605957,
+        "y": 1002.571409702301,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "5a563206.aad004"
+                "818a25dd.c0d2d8"
             ]
         ]
     },
     {
-        "id": "5a563206.aad004",
+        "id": "818a25dd.c0d2d8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1911.5236740112305,
-        "y": 1018.7589168548584,
-        "z": "4222f00.ce0af9",
+        "x": 1900.940330505371,
+        "y": 1002.0922451019287,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a9b518c.93c52e",
+        "id": "d78c63b7.25544",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1840.9999771118164,
-        "y": 716.2380657196045,
-        "z": "4222f00.ce0af9",
+        "x": 1830.416633605957,
+        "y": 699.5713939666748,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e5c3291c.26157",
+        "id": "4877cf68.9cf618",
         "type": "outcome",
         "name": "ActivateSDWANPortInstance",
         "xml": "<outcome value='ActivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1397.4762954711914,
-        "y": 723.7172832489014,
-        "z": "4222f00.ce0af9",
+        "x": 1386.892951965332,
+        "y": 707.0506114959717,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "3a9b518c.93c52e"
+                "d78c63b7.25544"
             ]
         ]
     },
     {
-        "id": "f2c6835b.e4dce8",
+        "id": "25872c81.98ab74",
         "type": "outcome",
         "name": "DeactivateSDWANPortInstance",
         "xml": "<outcome value='DeactivateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1447.0000228881836,
-        "y": 1057.5713968276978,
-        "z": "4222f00.ce0af9",
+        "x": 1436.4166793823242,
+        "y": 1040.904725074768,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "9cd1da68.7c00b8"
+                "70d01de8.15b83c"
             ]
         ]
     },
     {
-        "id": "9cd1da68.7c00b8",
+        "id": "70d01de8.15b83c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1921.5236740112305,
-        "y": 1074.0921988487244,
-        "z": "4222f00.ce0af9",
+        "x": 1910.940330505371,
+        "y": 1057.4255270957947,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b80b7710.1796",
+        "id": "bc0dfdf.db024",
         "type": "outcome",
         "name": "CreateSDWANPortInstance",
         "xml": "<outcome value='CreateSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1444.00035572052,
-        "y": 1407.571522951126,
-        "z": "4222f00.ce0af9",
+        "x": 1439.4169540405273,
+        "y": 1454.9047973155975,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "683a64bd.1411b4"
+                "8c93f3dc.323148"
             ]
         ]
     },
     {
-        "id": "683a64bd.1411b4",
+        "id": "8c93f3dc.323148",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1900.5239763259888,
-        "y": 1412.0923023223877,
-        "z": "4222f00.ce0af9",
+        "x": 1895.940574645996,
+        "y": 1459.4255766868591,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a60ff9d.338988",
+        "id": "7268797a.eb65d",
         "type": "outcome",
         "name": "DeleteSDWANPortInstance",
         "xml": "<outcome value='DeleteSDWANPortInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1455.6668090820312,
-        "y": 1799.571443080902,
-        "z": "4222f00.ce0af9",
+        "x": 1442.083480834961,
+        "y": 1904.9047994613647,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "f08cabbe.1566c"
+                "d08fa2da.56d74"
             ]
         ]
     },
     {
-        "id": "f08cabbe.1566c",
+        "id": "d08fa2da.56d74",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-wanport-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1882.190528869629,
-        "y": 1799.0922985076904,
-        "z": "4222f00.ce0af9",
+        "x": 1868.6072006225586,
+        "y": 1904.425654888153,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6cb20a0.dcd7c78",
+        "id": "9e7e4bfc.278db8",
         "type": "outcome",
         "name": "DeleteSDWANDeviceInstance",
         "xml": "<outcome value='DeleteSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1464.3649597167969,
-        "y": 1739.7693495750427,
-        "z": "4222f00.ce0af9",
+        "x": 1450.7816314697266,
+        "y": 1845.1027059555054,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "353aaf17.4c28b8"
+                "23bb007c.f32be8"
             ]
         ]
     },
     {
-        "id": "353aaf17.4c28b8",
+        "id": "23bb007c.f32be8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1896.8885650634766,
-        "y": 1739.290062904358,
-        "z": "4222f00.ce0af9",
+        "x": 1883.3052368164062,
+        "y": 1844.6234192848206,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ffb66a7.7d6c7",
+        "id": "822ca78e.7c6b1",
         "type": "outcome",
         "name": "CreateSDWANDeviceInstance",
         "xml": "<outcome value='CreateSDWANDeviceInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1459.3647050857544,
-        "y": 1363.7694864273071,
-        "z": "4222f00.ce0af9",
+        "x": 1454.7813034057617,
+        "y": 1411.1027607917786,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "be3e977e.2c5d4"
+                "2136a8d7.1d7db8"
             ]
         ]
     },
     {
-        "id": "be3e977e.2c5d4",
+        "id": "2136a8d7.1d7db8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sdwan-vnf-topology-operation-device-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1915.8883714675903,
-        "y": 1362.2903003692627,
-        "z": "4222f00.ce0af9",
+        "x": 1911.3049697875977,
+        "y": 1409.6235747337341,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6ed7f901.e4837",
+        "id": "d97c0f9f.42635",
         "type": "outcome",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1406.6295166015625,
-        "y": 764.4818115234375,
-        "z": "4222f00.ce0af9",
+        "x": 1396.0461730957031,
+        "y": 747.8151397705078,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "3bf7e2c.06ec69e"
+                "820fc280.2984a8"
             ]
         ]
     },
     {
-        "id": "f1eb2324.c790d",
+        "id": "2be7f987.98f3ce",
         "type": "outcome",
         "name": "ActivateSDWANSiteInstance",
         "xml": "<outcome value='ActivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1410.6295166015625,
-        "y": 807.1482543945312,
-        "z": "4222f00.ce0af9",
+        "x": 1400.0461730957031,
+        "y": 790.4815826416016,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "3bf7e2c.06ec69e"
+                "820fc280.2984a8"
             ]
         ]
     },
     {
-        "id": "3bf7e2c.06ec69e",
+        "id": "820fc280.2984a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1681.629508972168,
-        "y": 785.1483061313629,
-        "z": "4222f00.ce0af9",
+        "x": 1671.0461654663086,
+        "y": 768.4816343784332,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "8153499b.6e1098"
+                "9ce0f57b.73394"
             ]
         ]
     },
     {
-        "id": "8153499b.6e1098",
+        "id": "9ce0f57b.73394",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2059.6293563842773,
-        "y": 782.481965303421,
-        "z": "4222f00.ce0af9",
+        "x": 2049.046012878418,
+        "y": 765.8152935504913,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "68ae2f99.4d69e",
+        "id": "5aa2ff69.f1c198",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2107.6665573120117,
-        "y": 1129.6047658920288,
-        "z": "4222f00.ce0af9",
+        "x": 2097.0832138061523,
+        "y": 1112.9380941390991,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2a02ee62.b6456a",
+        "id": "fe515738.186868",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1710.666648864746,
-        "y": 1131.271110534668,
-        "z": "4222f00.ce0af9",
+        "x": 1700.0833053588867,
+        "y": 1114.6044387817383,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "68ae2f99.4d69e"
+                "5aa2ff69.f1c198"
             ]
         ]
     },
     {
-        "id": "7fbdfe6d.74e92",
+        "id": "ebf879bd.b608f8",
         "type": "outcome",
         "name": "DeactivateSDWANSiteInstance",
         "xml": "<outcome value='DeactivateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1452.666633605957,
-        "y": 1153.2710752487183,
-        "z": "4222f00.ce0af9",
+        "x": 1442.0832901000977,
+        "y": 1136.6044034957886,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "2a02ee62.b6456a"
+                "fe515738.186868"
             ]
         ]
     },
     {
-        "id": "23e0c188.77d676",
+        "id": "897395af.927c48",
         "type": "outcome",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1446.666603088379,
-        "y": 1110.604627609253,
-        "z": "4222f00.ce0af9",
+        "x": 1436.0832595825195,
+        "y": 1093.9379558563232,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "2a02ee62.b6456a"
+                "fe515738.186868"
             ]
         ]
     },
     {
-        "id": "68aa167c.112dc",
+        "id": "bc324ef7.aba63",
         "type": "outcome",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1440.1850357055664,
-        "y": 1462.2595958709717,
-        "z": "4222f00.ce0af9",
+        "x": 1435.6016340255737,
+        "y": 1509.5928702354431,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "8a987eaf.1c41f8"
+                "2ea0216b.051dee"
             ]
         ]
     },
     {
-        "id": "3353033f.efa8dc",
+        "id": "594d2772.c82a7",
         "type": "outcome",
         "name": "CreateSDWANSiteInstance",
         "xml": "<outcome value='CreateSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1432.1850128173828,
-        "y": 1503.9259843826294,
-        "z": "4222f00.ce0af9",
+        "x": 1427.6016111373901,
+        "y": 1551.2592587471008,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "8a987eaf.1c41f8"
+                "2ea0216b.051dee"
             ]
         ]
     },
     {
-        "id": "8a987eaf.1c41f8",
+        "id": "2ea0216b.051dee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1690.1850280761719,
-        "y": 1481.926019668579,
-        "z": "4222f00.ce0af9",
+        "x": 1685.6016263961792,
+        "y": 1529.2592940330505,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "ba617d6f.b174d"
+                "fe1aa149.c654b"
             ]
         ]
     },
     {
-        "id": "ba617d6f.b174d",
+        "id": "fe1aa149.c654b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.1848754882812,
-        "y": 1479.2596788406372,
-        "z": "4222f00.ce0af9",
+        "x": 2063.6014738082886,
+        "y": 1526.5929532051086,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "c9636adc.daf0f8",
+        "id": "1b2e943b.d70b5c",
         "type": "outcome",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1446.6667251586914,
-        "y": 1846.6047496795654,
-        "z": "4222f00.ce0af9",
+        "x": 1433.083396911621,
+        "y": 1951.938106060028,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "74eb4885.217568"
+                "8ae554b4.b818a"
             ]
         ]
     },
     {
-        "id": "c849034b.de7bb",
+        "id": "c0d1dfda.9d8bf8",
         "type": "outcome",
         "name": "DeleteSDWANSiteInstance",
         "xml": "<outcome value='DeleteSDWANSiteInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1446.6667251586914,
-        "y": 1887.2713146209717,
-        "z": "4222f00.ce0af9",
+        "x": 1433.083396911621,
+        "y": 1992.6046710014343,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "74eb4885.217568"
+                "8ae554b4.b818a"
             ]
         ]
     },
     {
-        "id": "74eb4885.217568",
+        "id": "8ae554b4.b818a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1696.6667175292969,
-        "y": 1866.2711734771729,
-        "z": "4222f00.ce0af9",
+        "x": 1683.0833892822266,
+        "y": 1971.6045298576355,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "1d78c22.9c0523e"
+                "de065509.487fa8"
             ]
         ]
     },
     {
-        "id": "1d78c22.9c0523e",
+        "id": "de065509.487fa8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:vnf-topology-operation-vpn-site-resource-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2074.6665649414062,
-        "y": 1863.604832649231,
-        "z": "4222f00.ce0af9",
+        "x": 2061.083236694336,
+        "y": 1968.9381890296936,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b721b98.8de544",
+        "id": "f1013e22.c6f5a8",
         "type": "set",
         "name": "set skip-mdsal-update to Y",
         "xml": "<set>\n<parameter name='skip-mdsal-update' value='Y' />\n",
         "comments": "",
-        "x": 2223.365234375,
-        "y": 369.1587677001953,
-        "z": "4222f00.ce0af9",
+        "x": 2212.7818908691406,
+        "y": 352.4920959472656,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "19c05886.3013f7",
+        "id": "b136a2e3.d45108",
         "type": "set",
         "name": "set ack-final to 'N'",
         "xml": "<set>\n<parameter name='ack-final' value='N' />\n",
         "comments": "",
-        "x": 2195.1749267578125,
-        "y": 433.5067901611328,
-        "z": "4222f00.ce0af9",
+        "x": 2184.591583251953,
+        "y": 416.8401184082031,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "babbb832.10e11",
+        "id": "d256cf36.0c3f28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1986.7144775390625,
-        "y": 372.0792999267578,
-        "z": "4222f00.ce0af9",
+        "x": 1976.1311340332031,
+        "y": 355.4126281738281,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "4b721b98.8de544",
-                "19c05886.3013f7"
+                "f1013e22.c6f5a8",
+                "b136a2e3.d45108"
             ]
         ]
     },
     {
-        "id": "df28f745.38b6c8",
+        "id": "cfee6463.dd54a",
         "type": "comment",
         "name": "ack-final=N triggers Provider to call vnf-topology-operation-aysnc DG",
         "info": "",
         "comments": "",
-        "x": 2407.4923095703125,
-        "y": 474.4761505126953,
-        "z": "4222f00.ce0af9",
+        "x": 2396.908966064453,
+        "y": 457.8094787597656,
+        "z": "bcfd2953.62c4e",
         "wires": []
     },
     {
-        "id": "b74ae95.15c3798",
+        "id": "ebf58448.85f46",
         "type": "switchNode",
         "name": "so-response-url empty?",
         "xml": "<switch test='`length($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1092.619140625,
-        "y": 218.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1082.0357971191406,
+        "y": 202.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "d060b162.861068",
-                "174d2265.acef4e"
+                "6efaf214.4f6624",
+                "a9793fc1.08e938"
             ]
         ]
     },
     {
-        "id": "d060b162.861068",
+        "id": "6efaf214.4f6624",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1317.619140625,
-        "y": 174.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1307.0357971191406,
+        "y": 158.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "2d99ad86.7ea77a"
+                "aa3c8ce5.53793"
             ]
         ]
     },
     {
-        "id": "174d2265.acef4e",
+        "id": "a9793fc1.08e938",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1307.619140625,
-        "y": 266.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1297.0357971191406,
+        "y": 250.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "81914c1b.0b07d8"
+                "31d0be5e.539722"
             ]
         ]
     },
     {
-        "id": "81914c1b.0b07d8",
+        "id": "31d0be5e.539722",
         "type": "switchNode",
         "name": "so-response-url = ignored URL?",
         "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1529.619140625,
-        "y": 267.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1519.0357971191406,
+        "y": 251.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "bf23c330.4d5838",
-                "51e5200d.187d08"
+                "de4e1a7d.d2376",
+                "84d1db43.9eb618"
             ]
         ]
     },
     {
-        "id": "2d99ad86.7ea77a",
+        "id": "aa3c8ce5.53793",
         "type": "call",
         "name": "call vnf-topology-operation-assign-sync",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1993.619140625,
-        "y": 175.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1983.0357971191406,
+        "y": 159.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "bf23c330.4d5838",
+        "id": "de4e1a7d.d2376",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1769.619140625,
-        "y": 266.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1759.0357971191406,
+        "y": 250.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "2d99ad86.7ea77a"
+                "aa3c8ce5.53793"
             ]
         ]
     },
     {
-        "id": "51e5200d.187d08",
+        "id": "84d1db43.9eb618",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1777.619140625,
-        "y": 367.95237731933594,
-        "z": "4222f00.ce0af9",
+        "x": 1767.0357971191406,
+        "y": 351.28570556640625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "babbb832.10e11"
+                "d256cf36.0c3f28"
             ]
         ]
     },
     {
-        "id": "3a76d55f.574fea",
+        "id": "621f2def.3bc7f4",
         "type": "execute",
         "name": "execute getProperties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105.99560546875,
-        "y": 109.21214294433594,
-        "z": "4222f00.ce0af9",
+        "x": 1095.4122619628906,
+        "y": 92.54547119140625,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "30e9386b.1bf9e",
+        "id": "8097b3a1.623438",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 915.086669921875,
-        "y": 107.39396667480469,
-        "z": "4222f00.ce0af9",
+        "x": 904.5033264160156,
+        "y": 90.727294921875,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "b74ae95.15c3798",
-                "3a76d55f.574fea"
+                "ebf58448.85f46",
+                "621f2def.3bc7f4"
             ]
         ]
     },
     {
-        "id": "a5d6fe4e.3bf49",
+        "id": "2476b7aa.1b79f8",
         "type": "outcome",
         "name": "CreateSOTNUnderlayInstance",
         "xml": "<outcome value='CreateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1440,
-        "y": 1541.6666259765625,
-        "z": "4222f00.ce0af9",
+        "x": 1435.4165983200073,
+        "y": 1588.999900341034,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "b0a72405.4724e8"
+                "93caa9d0.6497a8"
             ]
         ]
     },
     {
-        "id": "b0a72405.4724e8",
+        "id": "93caa9d0.6497a8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-create",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1896.5236206054688,
-        "y": 1546.187405347824,
-        "z": "4222f00.ce0af9",
+        "x": 1891.940218925476,
+        "y": 1593.5206797122955,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "793759a8.9ea39",
+        "id": "85c7833e.301688",
         "type": "outcome",
         "name": "ActivateSOTNUnderlayInstance",
         "xml": "<outcome value='ActivateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1423.3333129882812,
-        "y": 845.9999420642853,
-        "z": "4222f00.ce0af9",
+        "x": 1412.7499694824219,
+        "y": 829.3332703113556,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "a4e643a3.be23f"
+                "9729b91.9391748"
             ]
         ]
     },
     {
-        "id": "a4e643a3.be23f",
+        "id": "9729b91.9391748",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1883.1903076171875,
-        "y": 840.520751953125,
-        "z": "4222f00.ce0af9",
+        "x": 1872.6069641113281,
+        "y": 823.8540802001953,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8f77f4e2.24c688",
+        "id": "e2eb0e3d.ee18",
         "type": "outcome",
         "name": "DeactivateSOTNUnderlayInstance",
         "xml": "<outcome value='DeactivateSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1455,
-        "y": 1189.333251953125,
-        "z": "4222f00.ce0af9",
+        "x": 1444.4166564941406,
+        "y": 1172.6665802001953,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "5859b61d.7a069"
+                "2575141a.d8b94c"
             ]
         ]
     },
     {
-        "id": "5859b61d.7a069",
+        "id": "2575141a.d8b94c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-deactivate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-deactivate' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1923.1903076171875,
-        "y": 1192.1871948242188,
-        "z": "4222f00.ce0af9",
+        "x": 1912.6069641113281,
+        "y": 1175.520523071289,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
     },
     {
-        "id": "36a6c0b5.0c1d9",
+        "id": "61af328b.a8ad5c",
         "type": "outcome",
         "name": "DeleteSOTNUnderlayInstance",
         "xml": "<outcome value='DeleteSOTNUnderlayInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1455,
-        "y": 1921,
-        "z": "4222f00.ce0af9",
+        "x": 1441.4166717529297,
+        "y": 2026.3333563804626,
+        "z": "bcfd2953.62c4e",
         "wires": [
             [
-                "93805448.bb27d8"
+                "26312d60.4b5c62"
             ]
         ]
     },
     {
-        "id": "93805448.bb27d8",
+        "id": "26312d60.4b5c62",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:sotn-vnf-topology-operation-underlay-delete",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1893.1904296875,
-        "y": 1917.1873779296875,
-        "z": "4222f00.ce0af9",
+        "x": 1879.6071014404297,
+        "y": 2022.5207343101501,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "84311768.7532f",
+        "type": "outcome",
+        "name": "CreateAccessConnectivityInstance",
+        "xml": "<outcome value='CreateAccessConnectivityInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1449.25,
+        "y": 1292.75,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "f6358eed.8fd788"
+            ]
+        ]
+    },
+    {
+        "id": "f6358eed.8fd788",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1735.182861328125,
+        "y": 1290.033447265625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "abf89d78.ae136"
+            ]
+        ]
+    },
+    {
+        "id": "abf89d78.ae136",
+        "type": "switchNode",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1972.349365234375,
+        "y": 1284.033447265625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "2b63eeb1.50b352"
+            ]
+        ]
+    },
+    {
+        "id": "2b63eeb1.50b352",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2166.349365234375,
+        "y": 1285.03369140625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "c45d3d3e.1b1e7"
+            ]
+        ]
+    },
+    {
+        "id": "3fe1f22d.2ed6be",
+        "type": "outcome",
+        "name": "CreateInternetProfileInstance",
+        "xml": "<outcome value='CreateInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1427.033203125,
+        "y": 1329.616455078125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "37bd78e1.b21b58"
+            ]
+        ]
+    },
+    {
+        "id": "37bd78e1.b21b58",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1712.189453125,
+        "y": 1328.60595703125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "113a92fc.f5a94d"
+            ]
+        ]
+    },
+    {
+        "id": "113a92fc.f5a94d",
+        "type": "switchNode",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1965.3558349609375,
+        "y": 1325.60595703125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "8bbd3b64.069538"
+            ]
+        ]
+    },
+    {
+        "id": "8bbd3b64.069538",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2161.355712890625,
+        "y": 1341.606201171875,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "fc5c5b44.57562"
+            ]
+        ]
+    },
+    {
+        "id": "fc5c5b44.57562",
+        "type": "switchNode",
+        "name": "switch:manufacturer value",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2384.356201171875,
+        "y": 1351.6064453125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "63e9014d.bd269"
+            ]
+        ]
+    },
+    {
+        "id": "c45d3d3e.1b1e7",
+        "type": "switchNode",
+        "name": "switch:manufacturer value",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2398.349853515625,
+        "y": 1285.033935546875,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "2afa08fa.5da1b8",
+                "72740d7.e2257f4"
+            ]
+        ]
+    },
+    {
+        "id": "2afa08fa.5da1b8",
+        "type": "outcomeTrue",
+        "name": "HUAWEI",
+        "xml": "<outcome value='HUAWEI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2630.183349609375,
+        "y": 1287.03369140625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "a877b7c1.f7ab2"
+            ]
+        ]
+    },
+    {
+        "id": "72740d7.e2257f4",
+        "type": "other",
+        "name": "Other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2624.583251953125,
+        "y": 1318.75,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "2a1c0ea0.7b8bfa"
+            ]
+        ]
+    },
+    {
+        "id": "63e9014d.bd269",
+        "type": "outcomeTrue",
+        "name": "HUAWEI",
+        "xml": "<outcome value='HUAWEI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2612.189453125,
+        "y": 1381.606201171875,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "a5024e1b.c39f78"
+            ]
+        ]
+    },
+    {
+        "id": "a877b7c1.f7ab2",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-create-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3127.0269165039062,
+        "y": 1287.044189453125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2a1c0ea0.7b8bfa",
+        "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=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`\" />",
+        "comments": "",
+        "x": 2872.916259765625,
+        "y": 1330.4166259765625,
+        "z": "bcfd2953.62c4e",
+        "wires": []
+    },
+    {
+        "id": "a5024e1b.c39f78",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API: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": 3113.033447265625,
+        "y": 1383.616943359375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2446e491.707454",
+        "type": "outcome",
+        "name": "DeleteAccessConnectivityInstance",
+        "xml": "<outcome value='DeleteAccessConnectivityInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1457.5,
+        "y": 1702.75,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "6a4bffaa.01c668"
+            ]
+        ]
+    },
+    {
+        "id": "6a4bffaa.01c668",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1770.3232421875,
+        "y": 1693.73974609375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "21623b1f.3f8d44"
+            ]
+        ]
+    },
+    {
+        "id": "21623b1f.3f8d44",
+        "type": "switchNode",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2041.4893798828125,
+        "y": 1687.73974609375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "635419c6.f5c7f"
+            ]
+        ]
+    },
+    {
+        "id": "635419c6.f5c7f",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2241.489501953125,
+        "y": 1687.7396240234375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "5da11410.41b91c"
+            ]
+        ]
+    },
+    {
+        "id": "b0d73803.27cd6",
+        "type": "outcome",
+        "name": "DeleteInternetProfileInstance",
+        "xml": "<outcome value='DeleteInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1439.066650390625,
+        "y": 1742.800048828125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "a4985cc.fb944a"
+            ]
+        ]
+    },
+    {
+        "id": "a4985cc.fb944a",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1716.4000244140625,
+        "y": 1754.5167236328125,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "5b4764ae.b86d54"
+            ]
+        ]
+    },
+    {
+        "id": "5b4764ae.b86d54",
+        "type": "switchNode",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1944.5663528442383,
+        "y": 1743.516764640808,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "7462815c.35f6c"
+            ]
+        ]
+    },
+    {
+        "id": "7462815c.35f6c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2134.566230773926,
+        "y": 1743.517008781433,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "81263075.e9e5c8"
+            ]
+        ]
+    },
+    {
+        "id": "81263075.e9e5c8",
+        "type": "switchNode",
+        "name": "switch:manufacturer value",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2348.566719055176,
+        "y": 1739.517252922058,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "532a59b0.2081a8"
+            ]
+        ]
+    },
+    {
+        "id": "5da11410.41b91c",
+        "type": "switchNode",
+        "name": "switch:manufacturer value",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2500.4898986816406,
+        "y": 1680.739761352539,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "a81f1872.f6aa9"
+            ]
+        ]
+    },
+    {
+        "id": "a81f1872.f6aa9",
+        "type": "outcomeTrue",
+        "name": "HUAWEI",
+        "xml": "<outcome value='HUAWEI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2703.3232421875,
+        "y": 1689.7396240234375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "848d81b5.130f"
+            ]
+        ]
+    },
+    {
+        "id": "532a59b0.2081a8",
+        "type": "outcomeTrue",
+        "name": "HUAWEI",
+        "xml": "<outcome value='HUAWEI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2536.3997802734375,
+        "y": 1735.5169677734375,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "91a8b026.241e6"
+            ]
+        ]
+    },
+    {
+        "id": "91a8b026.241e6",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API: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": 2879.243896484375,
+        "y": 1795.527587890625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "848d81b5.130f",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:bbs-access-connectivity-vnf-topology-operation-delete-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3144.500732421875,
+        "y": 1738.7506103515625,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ed83e2f.1faa02",
+        "type": "outcome",
+        "name": "update",
+        "xml": "<outcome value='update'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 923.25,
+        "y": 2087,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "ac49fc9a.d44d8"
+            ]
+        ]
+    },
+    {
+        "id": "ac49fc9a.d44d8",
+        "type": "switchNode",
+        "name": "switch request-action",
+        "xml": "<switch test='`$vnf-topology-operation-input.request-information.request-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1126.2500305175781,
+        "y": 2180.5,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "b2415f4b.ebd0b"
+            ]
+        ]
+    },
+    {
+        "id": "b2415f4b.ebd0b",
+        "type": "outcome",
+        "name": "ChangeInternetProfileInstance",
+        "xml": "<outcome value='ChangeInternetProfileInstance'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1399.2499694824219,
+        "y": 2177,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "63ada1aa.f3dca"
+            ]
+        ]
+    },
+    {
+        "id": "63ada1aa.f3dca",
+        "type": "for",
+        "name": "for:vnf-input-paramters",
+        "xml": "<for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1723.4061851501465,
+        "y": 2175.98966217041,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "549f7959.1514a"
+            ]
+        ]
+    },
+    {
+        "id": "549f7959.1514a",
+        "type": "switchNode",
+        "name": "switch:manufacturer",
+        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1970.5724754333496,
+        "y": 2175.989679336548,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "39016a4.e633196"
+            ]
+        ]
+    },
+    {
+        "id": "39016a4.e633196",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2158.5723609924316,
+        "y": 2177.9898414611816,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "c2bca40.df8efe"
+            ]
+        ]
+    },
+    {
+        "id": "c2bca40.df8efe",
+        "type": "switchNode",
+        "name": "switch:manufacturer value",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2369.5730018615723,
+        "y": 2177.9901666641235,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "b6eebb76.bbbd78"
+            ]
+        ]
+    },
+    {
+        "id": "b6eebb76.bbbd78",
+        "type": "outcomeTrue",
+        "name": "HUAWEI",
+        "xml": "<outcome value='HUAWEI'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2621.406234741211,
+        "y": 2103.98983001709,
+        "z": "bcfd2953.62c4e",
+        "wires": [
+            [
+                "cafa6fb7.bfb6"
+            ]
+        ]
+    },
+    {
+        "id": "cafa6fb7.bfb6",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:bbs-internet-profile-vnf-topology-operation-change-huawei",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3085.250789642334,
+        "y": 2105.000162124634,
+        "z": "bcfd2953.62c4e",
         "wires": [
             []
         ]
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
new file mode 100644
index 00000000..3f30d506
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
@@ -0,0 +1,276 @@
+<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>
\ 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
new file mode 100644
index 00000000..9d50feef
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
@@ -0,0 +1,171 @@
+<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-delete-huawei' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' ></call>
+            <set>
+                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
+                <parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />
+            </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>
+            <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"/>
+                <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>
+                <outcome value='success'>
+                    <switch test='`$token-result.accessSession`'>
+                        <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>
+                        <outcome value='Other'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
+                            </set>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+            <for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >
+                <switch test="`$vnf-input-parameters.param[$idx].name == 'serviceID'`">
+                    <outcome value='true'>
+                        <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                            <outcome value='Other'>
+                                <set>
+                                    <parameter name='prop.bbs.serviceID' value='`$vnf-input-parameters.param[$idx].value`' />
+                                </set>
+                            </outcome>
+                            <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>
+                        </switch>
+                    </outcome>
+                </switch>
+            </for>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`" />
+                <parameter name="httpMethod" value="get"/>
+                <parameter name="contentType" value="application/x-www-form-urlencoded"/>
+                <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"/>
+                <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 deleteAccessConnectivityService" />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <block atomic="true">
+                        <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 deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
+                                </return>
+                            </outcome>
+                            <outcome value=''>
+                                <block></block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+            </execute>
+            <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='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <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='AccessConnectivity'>
+                                                                    <set>
+                                                                        <parameter name='prop.bbs.accessConnectivityVNFId' value='`$aai.generic-vnf.vnf-id`' />
+                                                                    </set>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </get-resource>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </for>
+                        </for>
+                    </block>
+                </outcome>
+            </get-resource>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="generic-vnf" 
+		key="generic-vnf.vnf-id = $prop.bbs.accessConnectivityVNFId">
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </delete>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
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
new file mode 100644
index 00000000..9df1b38f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
@@ -0,0 +1,42 @@
+<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-internet-profile-vnf-topology-operation-change-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 + '/ChangeInternetProfileInstance'`" />
+                <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 ChangeInternetProfileInstance" />
+                    </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 ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
+                            </return>
+                        </outcome>
+                        <outcome value=''>
+                            <block></block>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+            <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-internet-profile-vnf-topology-operation-common-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
new file mode 100644
index 00000000..4f67b46b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-common-huawei.xml
@@ -0,0 +1,76 @@
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='bbs-internet-profile-vnf-topology-operation-common-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='http://172.30.0.121:5000' />
+                <parameter name='prop.bbs.service_id' value='`$vnf-topology-operation-input.service-information.service-id`' />
+            </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 == 'ip_service_type'`">
+                        <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.service_type' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ip_upstream_speed'`">
+                        <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.up_speed' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ip_downstream_speed'`">
+                        <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.down_speed' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+        </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-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
new file mode 100644
index 00000000..27048ab0
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
@@ -0,0 +1,146 @@
+<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-internet-profile-vnf-topology-operation-create-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 + '/CreateInternetProfileInstance'`" />
+                <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 CreateInternetProfileInstance" />
+                    </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 CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
+                            </return>
+                        </outcome>
+                        <outcome value=''>
+                            <block></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 = "InternetProfile"/>
+                    <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="service-type" />
+                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.service_type`" />
+                    <parameter name="metadata.metadatum[1].metaname" value="up-speed" />
+                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.up_speed`" />
+                    <parameter name="metadata.metadatum[2].metaname" value="down-speed" />
+                    <parameter name="metadata.metadatum[2].metaval" value="`$prop.bbs.down_speed`" />
+                    <!--<parameter name="metadata.metadatum[3].metaname" value="cvlan" />-->
+                    <!--<parameter name="metadata.metadatum[3].metaval" value="`$prop.bbs.c_vlan`" />-->
+                    <!--<parameter name="metadata.metadatum[4].metaname" value="svlan" />-->
+                    <!--<parameter name="metadata.metadatum[4].metaval" value="`$prop.bbs.s_vlan`" />-->
+                    <!--<parameter name="metadata.metadatum[5].metaname" value="expected-ont-id" />-->
+                    <!--<parameter name="metadata.metadatum[5].metaval" value="`$prop.bbs.ont_sn`" />-->
+                    <!--<parameter name="metadata.metadatum[6].metaname" value="rgw-mac-address" />-->
+                    <!--<parameter name="metadata.metadatum[6].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-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
new file mode 100644
index 00000000..4b2e5fb3
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
@@ -0,0 +1,84 @@
+<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-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"/>
+                <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.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" 
+		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>
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+		resource="generic-vnf" 
+		key="generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId">
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+                <outcome value='not-found'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </delete>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml
new file mode 100644
index 00000000..7f72fbdb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-bbs-vnf-input-parameters.xml
@@ -0,0 +1,118 @@
+<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='validate-bbs-vnf-input-parameters' mode='sync'>
+        <block atomic="true">
+            <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
+                <outcome value='create'>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateAccessConnectivityInstance'>
+                                <switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error invalid request-action" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                            <outcome value='CreateInternetProfileInstance'>
+                                <switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error invalid request-action" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error invalid request-action" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='delete'>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteAccessConnectivityInstance'>
+                                <switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error invalid request-action" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                            <outcome value='DeleteInternetProfileInstance'>
+                                <switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error invalid request-action" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error invalid request-action" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='update'>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='Other'>
+                                <return status='failure'>
+                                    <parameter name='ack-final' value='Y'/>
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="Error invalid request-action" />
+                                </return>
+                            </outcome>
+                            <outcome value='ChangeInternetProfileInstance'>
+                                <switch test='$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length'>
+                                    <outcome value=''>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="Error invalid request-action" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
+                <outcome value='Other'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`" />
+                    </return>
+                </outcome>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="svc-action is null" />
+                    </return>
+                </outcome>
+            </switch>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index 74ce797f..9b8f9a0a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -100,6 +100,39 @@
                 <outcome value='create'>
                     <block atomic="true">
                         <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateAccessConnectivityInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync' ></call>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                            <outcome value='CreateInternetProfileInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
                             <outcome value='CreateSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' ></call>
                             </outcome>
@@ -131,6 +164,32 @@
                 <outcome value='delete'>
                     <block atomic="true">
                         <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteAccessConnectivityInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                            <outcome value='DeleteInternetProfileInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
                             <outcome value='DeleteSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' ></call>
                             </outcome>
@@ -159,6 +218,23 @@
                         </switch>
                     </block>
                 </outcome>
+                <outcome value='update'>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='ChangeInternetProfileInstance'>
+                            <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                    <outcome value='true'>
+                                        <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                            <outcome value='HUAWEI'>
+                                                <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync' ></call>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
-- 
cgit 1.2.3-korg