Merge "Fix bbs dgs bug for edge"

Former-commit-id: 91e028c7e988d5b54d2da272ae4efb4e8f5b1a93

6 files changed, 646 insertions, 248 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json
index d8498007..a82d8ad7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "6fc09f6d.0870b",
+        "id": "8986a615.d2eba",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 395,
-        "y": 364,
-        "z": "42dfc057.bac69",
+        "x": 893,
+        "y": 435,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "17053a75.1de276"
+                "a587d37.4461bb"
             ]
         ]
     },
     {
-        "id": "17053a75.1de276",
+        "id": "a587d37.4461bb",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,206 +22,206 @@
         "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": 702.9996490478516,
-        "y": 364.0000219345093,
-        "z": "42dfc057.bac69",
+        "x": 1200.9996490478516,
+        "y": 435.0000219345093,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "31b28a93.bc7546"
+                "7bf72e16.cc5638"
             ]
         ]
     },
     {
-        "id": "31b28a93.bc7546",
+        "id": "7bf72e16.cc5638",
         "type": "method",
         "name": "method:bbs-internet-profile-network-topology-operation-change-huawei",
         "xml": "<method rpc='bbs-internet-profile-network-topology-operation-change-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 700.9996490478516,
-        "y": 560.0000619888306,
-        "z": "42dfc057.bac69",
+        "x": 1198.9996490478516,
+        "y": 631.0000619888306,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "6078be8e.3dc1b"
+                "d96dea5b.58d7"
             ]
         ]
     },
     {
-        "id": "6078be8e.3dc1b",
+        "id": "d96dea5b.58d7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1107.9998626708984,
-        "y": 561.0000619888306,
-        "z": "42dfc057.bac69",
+        "x": 1605.9998626708984,
+        "y": 632.0000619888306,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "18b0a0e1.bc2b9f",
-                "d8d2c4cf.831298",
-                "a7f761b1.d0d6"
+                "7720916f.7813b8",
+                "627c5b65.98524c",
+                "e657d2bd.9178a8"
             ]
         ]
     },
     {
-        "id": "d8d2c4cf.831298",
+        "id": "627c5b65.98524c",
         "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\"/>\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\"/>",
+        "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": 1435,
-        "y": 562,
-        "z": "42dfc057.bac69",
+        "x": 1933,
+        "y": 633,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "6653aa52.b5a3e4",
-                "5cfea4a3.4063fc"
+                "adc20a6c.9b2ab",
+                "55d7a784.5951f"
             ]
         ]
     },
     {
-        "id": "5cfea4a3.4063fc",
+        "id": "55d7a784.5951f",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1736.3329811096191,
-        "y": 562,
-        "z": "42dfc057.bac69",
+        "x": 2234.332981109619,
+        "y": 633,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "18532102.a9364f"
+                "cce9a716.18951"
             ]
         ]
     },
     {
-        "id": "6653aa52.b5a3e4",
+        "id": "adc20a6c.9b2ab",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1745.332893371582,
-        "y": 637.0000019073486,
-        "z": "42dfc057.bac69",
+        "x": 2243.332893371582,
+        "y": 708.0000019073486,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "fee00388.9b406"
+                "b35bace0.7d3d98"
             ]
         ]
     },
     {
-        "id": "fee00388.9b406",
+        "id": "b35bace0.7d3d98",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1980.3490142822266,
-        "y": 636.0392971038818,
-        "z": "42dfc057.bac69",
+        "x": 2478.3490142822266,
+        "y": 707.0392971038818,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "842854c5.b1e1c8",
-                "e77a86f6.1bffc8"
+                "a90ffced.1c8348",
+                "63b509e9.2d95d8"
             ]
         ]
     },
     {
-        "id": "18532102.a9364f",
+        "id": "cce9a716.18951",
         "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`\" />\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call ChangeInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 2245.2665939331055,
-        "y": 562.289547920227,
-        "z": "42dfc057.bac69",
+        "x": 2743.2665939331055,
+        "y": 633.289547920227,
+        "z": "ab14e16a.6a0518",
         "wires": []
     },
     {
-        "id": "842854c5.b1e1c8",
+        "id": "a90ffced.1c8348",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2206.349353790283,
-        "y": 637.0393905639648,
-        "z": "42dfc057.bac69",
+        "x": 2704.349353790283,
+        "y": 708.0393905639648,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "b066a3a6.b8196"
+                "e561cbc.a164eb8"
             ]
         ]
     },
     {
-        "id": "e77a86f6.1bffc8",
+        "id": "63b509e9.2d95d8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2216.3490600585938,
-        "y": 723.0392570495605,
-        "z": "42dfc057.bac69",
+        "x": 2714.3490600585938,
+        "y": 794.0392570495605,
+        "z": "ab14e16a.6a0518",
         "wires": [
             [
-                "cf2d9b30.93fde8"
+                "96c1b54d.1bf908"
             ]
         ]
     },
     {
-        "id": "b066a3a6.b8196",
+        "id": "e561cbc.a164eb8",
         "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 failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
         "comments": "",
-        "x": 2392.849021911621,
-        "y": 637.0392274856567,
-        "z": "42dfc057.bac69",
+        "x": 2890.849021911621,
+        "y": 708.0392274856567,
+        "z": "ab14e16a.6a0518",
         "wires": []
     },
     {
-        "id": "cf2d9b30.93fde8",
+        "id": "96c1b54d.1bf908",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2374.5156898498535,
-        "y": 724.0392322540283,
-        "z": "42dfc057.bac69",
+        "x": 2872.5156898498535,
+        "y": 795.0392322540283,
+        "z": "ab14e16a.6a0518",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7f761b1.d0d6",
+        "id": "e657d2bd.9178a8",
         "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": 1350.8489570617676,
-        "y": 644.0393257141113,
-        "z": "42dfc057.bac69",
+        "x": 1848.8489570617676,
+        "y": 715.0393257141113,
+        "z": "ab14e16a.6a0518",
         "wires": []
     },
     {
-        "id": "18b0a0e1.bc2b9f",
+        "id": "7720916f.7813b8",
         "type": "call",
         "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1537.015869140625,
-        "y": 476.03915786743164,
-        "z": "42dfc057.bac69",
+        "x": 2035.015869140625,
+        "y": 547.0391578674316,
+        "z": "ab14e16a.6a0518",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json
index dd449497..49090932 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "2d7f5053.43f88",
+        "id": "89575381.22e988",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 161,
+        "x": 825,
         "y": 430,
-        "z": "ad27a06a.ac6cb",
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "72df2435.5886ec"
+                "62fc8ed2.1c1c7"
             ]
         ]
     },
     {
-        "id": "72df2435.5886ec",
+        "id": "62fc8ed2.1c1c7",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,208 +22,522 @@
         "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": 468.99964904785156,
-        "y": 430.0000219345093,
-        "z": "ad27a06a.ac6cb",
+        "x": 1184.9996490478516,
+        "y": 431.0000219345093,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "ffb91d40.32d4b"
+                "9c1ae725.2fe18"
             ]
         ]
     },
     {
-        "id": "ffb91d40.32d4b",
+        "id": "9c1ae725.2fe18",
         "type": "method",
         "name": "method:bbs-internet-profile-network-topology-operation-create-huawei",
         "xml": "<method rpc='bbs-internet-profile-network-topology-operation-create-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 466.9996643066406,
-        "y": 650.0000991821289,
-        "z": "ad27a06a.ac6cb",
+        "x": 1182.9996643066406,
+        "y": 651.0000991821289,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "53f797bd.cfd8e8"
+                "11984569.4d6beb"
             ]
         ]
     },
     {
-        "id": "53f797bd.cfd8e8",
+        "id": "11984569.4d6beb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 890.9998626708984,
-        "y": 649.0000991821289,
-        "z": "ad27a06a.ac6cb",
+        "x": 1606.9998626708984,
+        "y": 650.0000991821289,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "370af337.5154fc",
-                "4e0ef08b.97054",
-                "f93c1da.de250e"
+                "673fbee.7c17dc",
+                "3a7cb4b2.9f805c",
+                "9d9c04a.550a178",
+                "7117f977.4492b8"
             ]
         ]
     },
     {
-        "id": "370af337.5154fc",
+        "id": "673fbee.7c17dc",
         "type": "call",
         "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1407.0001525878906,
-        "y": 562.0000190734863,
-        "z": "ad27a06a.ac6cb",
+        "x": 2123.0001525878906,
+        "y": 563.0000190734863,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e0ef08b.97054",
+        "id": "3a7cb4b2.9f805c",
         "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\"/>\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\"/>",
+        "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": 1296.6507873535156,
-        "y": 647.9608345031738,
-        "z": "ad27a06a.ac6cb",
+        "x": 2012.6507873535156,
+        "y": 648.9608345031738,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "e4c140e5.037d7",
-                "d8bbe45d.2352e8"
+                "5cb835fe.0ebfdc",
+                "4e297705.0757e8"
             ]
         ]
     },
     {
-        "id": "d8bbe45d.2352e8",
+        "id": "4e297705.0757e8",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1597.9837684631348,
-        "y": 647.9608345031738,
-        "z": "ad27a06a.ac6cb",
+        "x": 2313.9837684631348,
+        "y": 648.9608345031738,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "1df15208.d8ff4e"
+                "340c0c87.92c8b4"
             ]
         ]
     },
     {
-        "id": "e4c140e5.037d7",
+        "id": "5cb835fe.0ebfdc",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1606.9836807250977,
-        "y": 722.9608364105225,
-        "z": "ad27a06a.ac6cb",
+        "x": 2322.9836807250977,
+        "y": 723.9608364105225,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "facb658d.68f2f8"
+                "8f2db25f.f4b24"
             ]
         ]
     },
     {
-        "id": "facb658d.68f2f8",
+        "id": "8f2db25f.f4b24",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1841.9998016357422,
-        "y": 722.0001316070557,
-        "z": "ad27a06a.ac6cb",
+        "x": 2557.999801635742,
+        "y": 723.0001316070557,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "6422cd06.ccef54",
-                "d37ab755.7eae88"
+                "d3ab0cf2.457f3",
+                "dee7fa1f.4d78b"
             ]
         ]
     },
     {
-        "id": "1df15208.d8ff4e",
+        "id": "340c0c87.92c8b4",
         "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call CreateInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 2106.917381286621,
-        "y": 648.2503824234009,
-        "z": "ad27a06a.ac6cb",
+        "x": 2826.250898361206,
+        "y": 649.250337600708,
+        "z": "b2abc2ea.cc1c28",
         "wires": []
     },
     {
-        "id": "6422cd06.ccef54",
+        "id": "d3ab0cf2.457f3",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.000141143799,
-        "y": 723.0002250671387,
-        "z": "ad27a06a.ac6cb",
+        "x": 2784.000141143799,
+        "y": 724.0002250671387,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "8b2e9879.6244c8"
+                "957b2d71.78c288"
             ]
         ]
     },
     {
-        "id": "d37ab755.7eae88",
+        "id": "dee7fa1f.4d78b",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2077.9998474121094,
-        "y": 809.0000915527344,
-        "z": "ad27a06a.ac6cb",
+        "x": 2793.9998474121094,
+        "y": 810.0000915527344,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             [
-                "684bf460.d7a28c"
+                "e5fb5f82.18f85"
             ]
         ]
     },
     {
-        "id": "8b2e9879.6244c8",
+        "id": "957b2d71.78c288",
         "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 failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
         "comments": "",
-        "x": 2254.4998092651367,
-        "y": 723.0000619888306,
-        "z": "ad27a06a.ac6cb",
+        "x": 2970.4998092651367,
+        "y": 724.0000619888306,
+        "z": "b2abc2ea.cc1c28",
         "wires": []
     },
     {
-        "id": "684bf460.d7a28c",
+        "id": "e5fb5f82.18f85",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2236.166477203369,
-        "y": 810.0000667572021,
-        "z": "ad27a06a.ac6cb",
+        "x": 2952.166477203369,
+        "y": 811.0000667572021,
+        "z": "b2abc2ea.cc1c28",
         "wires": [
             []
         ]
     },
     {
-        "id": "f93c1da.de250e",
+        "id": "9d9c04a.550a178",
         "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": 1217.4998321533203,
-        "y": 742.0001058578491,
-        "z": "ad27a06a.ac6cb",
+        "x": 1917.4999237060547,
+        "y": 1448.000192642212,
+        "z": "b2abc2ea.cc1c28",
+        "wires": []
+    },
+    {
+        "id": "c44ed27a.d90d8",
+        "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 = \"`$network-topology-operation-input.service-information.service-id`\"/><!--to be clarified,service-id different from service-instance-id -->\n<parameter name=  \"prov-status\" value = \"ACTIVE\"/>\n<parameter name=  \"orchestration-status\" value = \"Active\"/>\n<parameter name=  \"ipv4-oam-address\" value = \"169.254.236.13\"/>\n<parameter name=  \"in-maint\" value = \"false\" />\n<parameter name=  \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name=  \"model-invariant-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=  \"model-version-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-uuid`\"/>\n<parameter name=  \"model-customization-id\" value = \"`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 2196.0312366485596,
+        "y": 1114.031213760376,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "30abcda.3452c32",
+                "d057da2e.575678",
+                "d2286b35.a71d48"
+            ]
+        ]
+    },
+    {
+        "id": "30abcda.3452c32",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2432.253091812134,
+        "y": 985.9199714660645,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "819a16a6.0c9978"
+            ]
+        ]
+    },
+    {
+        "id": "d057da2e.575678",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2443.228910446167,
+        "y": 1045.9358277320862,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "c90efb31.bd2ff8"
+            ]
+        ]
+    },
+    {
+        "id": "819a16a6.0c9978",
+        "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": 2668.3956394195557,
+        "y": 985.4914364814758,
+        "z": "b2abc2ea.cc1c28",
+        "wires": []
+    },
+    {
+        "id": "c90efb31.bd2ff8",
+        "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": 2663.2764377593994,
+        "y": 1046.412142276764,
+        "z": "b2abc2ea.cc1c28",
+        "wires": []
+    },
+    {
+        "id": "d2286b35.a71d48",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2436.8397159576416,
+        "y": 1111.0623078346252,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "cc6c45ae.c943c8"
+            ]
+        ]
+    },
+    {
+        "id": "cc6c45ae.c943c8",
+        "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": 2644.8399696350098,
+        "y": 1109.0624370574951,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b746f152.4e5ac",
+        "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 = $network-topology-operation-input.service-information.service-id  \n\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id\n\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type\n\t  AND service-instance.service-instance-id =  $network-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": 2194.5305881500244,
+        "y": 1266.0309810638428,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "260fcebb.248022",
+                "e5ef08e9.671048",
+                "a5459cad.aad38"
+            ]
+        ]
+    },
+    {
+        "id": "260fcebb.248022",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2425.006097793579,
+        "y": 1197.3955845832825,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "e624300e.f97b6"
+            ]
+        ]
+    },
+    {
+        "id": "e5ef08e9.671048",
+        "type": "failure",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2436.982259750366,
+        "y": 1267.4115180969238,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "15c9d9c7.1da386"
+            ]
+        ]
+    },
+    {
+        "id": "e624300e.f97b6",
+        "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": 2665.1488933563232,
+        "y": 1195.967086315155,
+        "z": "b2abc2ea.cc1c28",
+        "wires": []
+    },
+    {
+        "id": "15c9d9c7.1da386",
+        "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": 2662.0297927856445,
+        "y": 1266.8877544403076,
+        "z": "b2abc2ea.cc1c28",
+        "wires": []
+    },
+    {
+        "id": "a5459cad.aad38",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2431.592969894409,
+        "y": 1337.5379576683044,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "6f08d5bf.9a889c"
+            ]
+        ]
+    },
+    {
+        "id": "6f08d5bf.9a889c",
+        "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": 2642.592969894409,
+        "y": 1337.5379576683044,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7117f977.4492b8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1891.164836883545,
+        "y": 987.9997653961182,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "c44ed27a.d90d8",
+                "b746f152.4e5ac",
+                "d803f78c.61a4a8",
+                "a1487411.171428"
+            ]
+        ]
+    },
+    {
+        "id": "d803f78c.61a4a8",
+        "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": 2179.1651859283447,
+        "y": 984.332763671875,
+        "z": "b2abc2ea.cc1c28",
         "wires": []
+    },
+    {
+        "id": "a1487411.171428",
+        "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": 2200.529399871826,
+        "y": 910.030613899231,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "916e0fd0.b9f37"
+            ]
+        ]
+    },
+    {
+        "id": "916e0fd0.b9f37",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2429.529342651367,
+        "y": 911.0305881500244,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "8e69817d.115b9"
+            ]
+        ]
+    },
+    {
+        "id": "8e69817d.115b9",
+        "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": 2620.529399871826,
+        "y": 909.0305881500244,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "52b18bce.20b054"
+            ]
+        ]
+    },
+    {
+        "id": "3a61e04b.9260a",
+        "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": 2952.529462814331,
+        "y": 907.0306491851807,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "52b18bce.20b054",
+        "type": "outcome",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2787.52933883667,
+        "y": 908.0306186676025,
+        "z": "b2abc2ea.cc1c28",
+        "wires": [
+            [
+                "3a61e04b.9260a"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
index 3d478c21..61ce5ca9 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5e265471.e67f7c",
+        "id": "714a0239.f58d34",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 344,
-        "y": 400,
-        "z": "5f22295c.f35688",
+        "x": 899,
+        "y": 435,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "d75b37ac.e738e8"
+                "34d45d5a.766c6a"
             ]
         ]
     },
     {
-        "id": "d75b37ac.e738e8",
+        "id": "34d45d5a.766c6a",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,206 +22,206 @@
         "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": 651.9996490478516,
-        "y": 400.0000219345093,
-        "z": "5f22295c.f35688",
+        "x": 1206.9996490478516,
+        "y": 435.0000219345093,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "f2820cf8.0bd53"
+                "c113efec.233458"
             ]
         ]
     },
     {
-        "id": "f2820cf8.0bd53",
+        "id": "c113efec.233458",
         "type": "method",
         "name": "method:bbs-internet-profile-network-topology-operation-delete-huawei",
         "xml": "<method rpc='bbs-internet-profile-network-topology-operation-delete-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.9996337890625,
-        "y": 596.0000982284546,
-        "z": "5f22295c.f35688",
+        "x": 1204.9996337890625,
+        "y": 631.0000982284546,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "9b232b7e.58e2b8"
+                "60fe006b.0de45"
             ]
         ]
     },
     {
-        "id": "9b232b7e.58e2b8",
+        "id": "60fe006b.0de45",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1056.9998626708984,
-        "y": 597.0000619888306,
-        "z": "5f22295c.f35688",
+        "x": 1611.9998626708984,
+        "y": 632.0000619888306,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "9eb1d9e6.392fa8",
-                "7617ea2e.9a48d4",
-                "5d716cef.c08464"
+                "aac40cc8.0649f",
+                "4ecef0e8.b1d6b8",
+                "ac3e26be.750fd"
             ]
         ]
     },
     {
-        "id": "9eb1d9e6.392fa8",
+        "id": "aac40cc8.0649f",
         "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\"/>\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\"/>",
+        "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": 1445.6509246826172,
-        "y": 600.9608850479126,
-        "z": "5f22295c.f35688",
+        "x": 2000.6509246826172,
+        "y": 635.9608850479126,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "2862e76.2bc8318",
-                "a6a0cc88.189c9"
+                "eebf5d0c.1b2fd8",
+                "ffc4504a.e72108"
             ]
         ]
     },
     {
-        "id": "a6a0cc88.189c9",
+        "id": "ffc4504a.e72108",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1746.9839057922363,
-        "y": 600.9608850479126,
-        "z": "5f22295c.f35688",
+        "x": 2301.9839057922363,
+        "y": 635.9608850479126,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "68923169.94f92"
+                "622738c2.3df3e"
             ]
         ]
     },
     {
-        "id": "2862e76.2bc8318",
+        "id": "eebf5d0c.1b2fd8",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1755.9838180541992,
-        "y": 675.9608869552612,
-        "z": "5f22295c.f35688",
+        "x": 2310.983818054199,
+        "y": 710.9608869552612,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "de6ab4f4.b99d68"
+                "cbf86fcd.ce3b38"
             ]
         ]
     },
     {
-        "id": "de6ab4f4.b99d68",
+        "id": "cbf86fcd.ce3b38",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1990.9999389648438,
-        "y": 675.0001821517944,
-        "z": "5f22295c.f35688",
+        "x": 2545.9999389648438,
+        "y": 710.0001821517944,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "4603a7e2.b0ee88",
-                "e87dbd8d.effaf"
+                "701b16da.9a2e28",
+                "6f5fe7b5.9c0d48"
             ]
         ]
     },
     {
-        "id": "68923169.94f92",
+        "id": "622738c2.3df3e",
         "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=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call DeleteInternetProfileInstance\" />\n",
         "comments": "",
-        "x": 2255.9175186157227,
-        "y": 601.2504329681396,
-        "z": "5f22295c.f35688",
+        "x": 2810.9175186157227,
+        "y": 636.2504329681396,
+        "z": "6516a9f0.ec0d58",
         "wires": []
     },
     {
-        "id": "4603a7e2.b0ee88",
+        "id": "701b16da.9a2e28",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2217.0002784729004,
-        "y": 676.0002756118774,
-        "z": "5f22295c.f35688",
+        "x": 2772.0002784729004,
+        "y": 711.0002756118774,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "43e7a5db.efe9bc"
+                "6ff25d76.5ec334"
             ]
         ]
     },
     {
-        "id": "e87dbd8d.effaf",
+        "id": "6f5fe7b5.9c0d48",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2226.999984741211,
-        "y": 762.0001420974731,
-        "z": "5f22295c.f35688",
+        "x": 2781.999984741211,
+        "y": 797.0001420974731,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             [
-                "22f84f13.a10ce"
+                "c34bbdbf.da607"
             ]
         ]
     },
     {
-        "id": "43e7a5db.efe9bc",
+        "id": "6ff25d76.5ec334",
         "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 failed: '+$service-result.errors.error[0].error-message`\" />\n\n",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",
         "comments": "",
-        "x": 2403.4999465942383,
-        "y": 676.0001125335693,
-        "z": "5f22295c.f35688",
+        "x": 2958.4999465942383,
+        "y": 711.0001125335693,
+        "z": "6516a9f0.ec0d58",
         "wires": []
     },
     {
-        "id": "22f84f13.a10ce",
+        "id": "c34bbdbf.da607",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2385.1666145324707,
-        "y": 763.0001173019409,
-        "z": "5f22295c.f35688",
+        "x": 2940.1666145324707,
+        "y": 798.0001173019409,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             []
         ]
     },
     {
-        "id": "7617ea2e.9a48d4",
+        "id": "4ecef0e8.b1d6b8",
         "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": 1365.4999160766602,
-        "y": 685.0001831054688,
-        "z": "5f22295c.f35688",
+        "x": 1920.4999160766602,
+        "y": 720.0001831054688,
+        "z": "6516a9f0.ec0d58",
         "wires": []
     },
     {
-        "id": "5d716cef.c08464",
+        "id": "ac3e26be.750fd",
         "type": "call",
         "name": "call:bbs-internet-profile-network-topology-operation-common-huawei",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1557.6669082641602,
-        "y": 517.0000553131104,
-        "z": "5f22295c.f35688",
+        "x": 2112.66690826416,
+        "y": 552.0000553131104,
+        "z": "6516a9f0.ec0d58",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
index 21936173..37bb23d0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-change-huawei.xml
@@ -10,15 +10,11 @@
                 <parameter name="contentType" value="application/json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="service-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="`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`" />
+                        <parameter name="error-message" value="Error failed to call ChangeInternetProfileInstance" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -27,7 +23,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
                             </return>
                         </outcome>
                         <outcome value=''>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
index 386adf5b..b6ec9d95 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-create-huawei.xml
@@ -10,15 +10,11 @@
                 <parameter name="contentType" value="application/json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="service-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="`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`" />
+                        <parameter name="error-message" value="Error failed to call CreateInternetProfileInstance" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -27,7 +23,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
                             </return>
                         </outcome>
                         <outcome value=''>
@@ -36,6 +32,102 @@
                     </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'>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/oak/logx.txt" />
+                                    <parameter name="field1" value="`$prop.random-data`" />
+                                </record>
+                            </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 = "`$network-topology-operation-input.service-information.service-id`"/>
+                    <parameter name=  "prov-status" value = "ACTIVE"/>
+                    <parameter name=  "orchestration-status" value = "Active"/>
+                    <parameter name=  "ipv4-oam-address" value = "169.254.236.13"/>
+                    <parameter name=  "in-maint" value = "false" />
+                    <parameter name=  "is-closed-loop-disabled" value = "false" />
+                    <parameter name=  "model-invariant-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`"/>
+                    <parameter name=  "model-version-id" value = "`$network-topology-operation-input.network-information.onap-model-information.model-uuid`"/>
+                    <parameter name=  "model-customization-id" value = "`$network-topology-operation-input.network-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'>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/oak/logx.txt" />
+                            <parameter name="field1" value="save generic-vnf success!" />
+                        </record>
+                    </outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
+ key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  
+	AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id
+	  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type
+	  AND service-instance.service-instance-id =  $network-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'>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/oak/logx.txt" />
+                            <parameter name="field1" value="save metadatum success!" />
+                        </record>
+                    </outcome>
+                </save>
+            </block>
             <return status='success'>
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
index 10da0f80..15f845fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-delete-huawei.xml
@@ -10,15 +10,11 @@
                 <parameter name="contentType" value="application/json"/>
                 <parameter name="httpMethod" value="post"/>
                 <parameter name="responsePrefix" value="service-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="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />
+                        <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />
                     </return>
                 </outcome>
                 <outcome value='success'>
@@ -27,7 +23,7 @@
                             <return status='failure'>
                                 <parameter name='ack-final' value='Y'/>
                                 <parameter name="error-code" value="500" />
-                                <parameter name="error-message" value="`'Error DeleteInternetProfileInstance failed: '+$service-result.errors.error[0].error-message`" />
+                                <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />
                             </return>
                         </outcome>
                         <outcome value=''>