From 159b132157de5f23b1d1f1f8a124155f45d9ad2f Mon Sep 17 00:00:00 2001
From: Victor Gao <victor.gao@huawei.com>
Date: Wed, 5 Jun 2019 15:42:42 +0800
Subject: Fix the DG writing log bug for BBS UC

Issue-ID: SDNC-784

Signed-off-by: Victor Gao <victor.gao@huawei.com>
Change-Id: I0758260afefe56645652c2966b27b86c39f2b9a4

Former-commit-id: 631902a9b2bff438352a88948e7c93927e9e4fb9
---
 ...y-network-topology-operation-delete-huawei.json | 396 +++++++-------
 ...e-network-topology-operation-common-huawei.json | 581 ++++++++++-----------
 ...ty-network-topology-operation-delete-huawei.xml |   7 +-
 ...le-network-topology-operation-common-huawei.xml |  13 -
 4 files changed, 488 insertions(+), 509 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
index 1dd2f320..444e2dc6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "32e79365.f9a674",
+        "id": "3e7ef4ac.b2e17c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 585,
-        "y": 664,
-        "z": "e7492f37.77e028",
+        "x": 704.53125,
+        "y": 248.03125,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "b127d6e2.ff9c7"
+                "cbfbc44.cd69838"
             ]
         ]
     },
     {
-        "id": "b127d6e2.ff9c7",
+        "id": "cbfbc44.cd69838",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,548 +22,546 @@
         "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": 972.9998817443848,
-        "y": 664.0000047683716,
-        "z": "e7492f37.77e028",
+        "x": 1092.5311317443848,
+        "y": 248.03125476837158,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "2c85dd35.2b753a"
+                "8072076.84dccf8"
             ]
         ]
     },
     {
-        "id": "2c85dd35.2b753a",
+        "id": "8072076.84dccf8",
         "type": "method",
         "name": "method:bbs-access-connectivity-network-topology-operation-delete-huawei",
         "xml": "<method rpc='bbs-access-connectivity-network-topology-operation-delete-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 935.9998817443848,
-        "y": 783.0000047683716,
-        "z": "e7492f37.77e028",
+        "x": 1055.5311317443848,
+        "y": 367.0312547683716,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "ef9e0c93.94adf8"
+                "9a3cc53d.6e79d8"
             ]
         ]
     },
     {
-        "id": "ef9e0c93.94adf8",
+        "id": "9a3cc53d.6e79d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1333.9999885559082,
-        "y": 782.0000047683716,
-        "z": "e7492f37.77e028",
+        "x": 1453.5312385559082,
+        "y": 366.0312547683716,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "267997b8.e9b0d",
-                "f1c69874.61cb9",
-                "7e468fe4.3b77e8",
-                "68d0163d.33ab6",
-                "1d5f9b67.3462ad",
-                "5f5fa66b.a3a898",
-                "a5de3800.3f3c9"
+                "d6360288.4527f",
+                "29565532.cf8cca",
+                "79257394.2307bc",
+                "bfbc37d6.3aa9c8",
+                "5837e3f.e88671c",
+                "ccc27501.c46688",
+                "afc719e1.eb7f48"
             ]
         ]
     },
     {
-        "id": "267997b8.e9b0d",
+        "id": "d6360288.4527f",
         "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": 1776.000286102295,
-        "y": 636.1110858917236,
-        "z": "e7492f37.77e028",
+        "x": 1895.531536102295,
+        "y": 220.14233589172363,
+        "z": "9458f851.9a2498",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f5fa66b.a3a898",
+        "id": "ccc27501.c46688",
         "type": "for",
         "name": "for:network-input-paramters",
         "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1780.0003089904785,
-        "y": 857.9999313354492,
-        "z": "e7492f37.77e028",
+        "x": 1899.5315589904785,
+        "y": 442.0311813354492,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "a2cbb6ad.9498d8"
+                "430a13df.a78e9c"
             ]
         ]
     },
     {
-        "id": "1d5f9b67.3462ad",
+        "id": "5837e3f.e88671c",
         "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": 1771.0003089904785,
-        "y": 768.0000076293945,
-        "z": "e7492f37.77e028",
+        "x": 1890.5315589904785,
+        "y": 352.03125762939453,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "2b64faec.a1d51e",
-                "15bc857f.bafd43"
+                "632411.2d700bf",
+                "df6b78a.61b9688"
             ]
         ]
     },
     {
-        "id": "15bc857f.bafd43",
+        "id": "df6b78a.61b9688",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2070.166934967041,
-        "y": 764.2500076293945,
-        "z": "e7492f37.77e028",
+        "x": 2189.698184967041,
+        "y": 348.28125762939453,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "c730ec93.32f82"
+                "c7e8c95e.bd9528"
             ]
         ]
     },
     {
-        "id": "2b64faec.a1d51e",
+        "id": "632411.2d700bf",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2066.166934967041,
-        "y": 658.2499771118164,
-        "z": "e7492f37.77e028",
+        "x": 2185.698184967041,
+        "y": 242.2812271118164,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "20d8621f.db8eee"
+                "da5c448.537c3b8"
             ]
         ]
     },
     {
-        "id": "5704a92f.4d6488",
+        "id": "53a754bd.11dc7c",
         "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": 2613.2807388305664,
-        "y": 706.6136617660522,
-        "z": "e7492f37.77e028",
+        "x": 2732.8119888305664,
+        "y": 290.64491176605225,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "a55c0e66.2654c8",
+        "id": "54233be2.f30004",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2437.000316619873,
-        "y": 706.999963760376,
-        "z": "e7492f37.77e028",
+        "x": 2556.531566619873,
+        "y": 291.031213760376,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "5704a92f.4d6488"
+                "53a754bd.11dc7c"
             ]
         ]
     },
     {
-        "id": "c730ec93.32f82",
+        "id": "c7e8c95e.bd9528",
         "type": "switchNode",
         "name": "switch:token ",
         "xml": "<switch test='`$token-result.accessSession`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2269.000316619873,
-        "y": 764.999963760376,
-        "z": "e7492f37.77e028",
+        "x": 2388.531566619873,
+        "y": 349.031213760376,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "a55c0e66.2654c8",
-                "72281c79.15bf7c"
+                "54233be2.f30004",
+                "2525724.318638e"
             ]
         ]
     },
     {
-        "id": "72281c79.15bf7c",
+        "id": "2525724.318638e",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2438.000316619873,
-        "y": 763.999963760376,
-        "z": "e7492f37.77e028",
+        "x": 2557.531566619873,
+        "y": 348.031213760376,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "85cd43c3.a877f8"
+                "b5f78ce0.e4e8f"
             ]
         ]
     },
     {
-        "id": "85cd43c3.a877f8",
+        "id": "b5f78ce0.e4e8f",
         "type": "set",
         "name": "set:token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
         "comments": "",
-        "x": 2612.5003089904785,
-        "y": 763.2500076293945,
-        "z": "e7492f37.77e028",
+        "x": 2732.0315589904785,
+        "y": 347.28125762939453,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "cf8179f9.6c703",
+        "id": "e0b6a2ae.458e8",
         "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": 2824.0003089904785,
-        "y": 760.9999465942383,
-        "z": "e7492f37.77e028",
+        "x": 2943.5315589904785,
+        "y": 345.0311965942383,
+        "z": "9458f851.9a2498",
         "wires": [
             []
         ]
     },
     {
-        "id": "68d0163d.33ab6",
+        "id": "bfbc37d6.3aa9c8",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n",
         "comments": "",
-        "x": 1742.000286102295,
-        "y": 556.0001621246338,
-        "z": "e7492f37.77e028",
+        "x": 1861.531536102295,
+        "y": 140.0314121246338,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "a5de3800.3f3c9",
+        "id": "afc719e1.eb7f48",
         "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": 1832.0005722045898,
-        "y": 1038.0001103878021,
-        "z": "e7492f37.77e028",
+        "x": 1951.5318222045898,
+        "y": 622.0313603878021,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "5b7315a4.8b9d54",
-                "b2a61f83.59c088"
+                "c6939dae.0ae37",
+                "7116ae31.13271"
             ]
         ]
     },
     {
-        "id": "5b7315a4.8b9d54",
+        "id": "c6939dae.0ae37",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2137.000587463379,
-        "y": 978.0000915527344,
-        "z": "e7492f37.77e028",
+        "x": 2256.531837463379,
+        "y": 562.0313415527344,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "218de6d2.4c392a"
+                "c09b1f3e.53091"
             ]
         ]
     },
     {
-        "id": "b2a61f83.59c088",
+        "id": "7116ae31.13271",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2137.000560760498,
-        "y": 1037.0000913143158,
-        "z": "e7492f37.77e028",
+        "x": 2256.531810760498,
+        "y": 621.0313413143158,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "ce8b9653.804e"
+                "1c65ae1f.8b01d2"
             ]
         ]
     },
     {
-        "id": "67d761ed.040b7",
+        "id": "b5b74804.ae8938",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2623.0006713867188,
-        "y": 934.000025510788,
-        "z": "e7492f37.77e028",
+        "x": 2742.5319213867188,
+        "y": 518.031275510788,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "f6e3cbc5.9d1b18"
+                "19c841bb.b9c39e"
             ]
         ]
     },
     {
-        "id": "f6e3cbc5.9d1b18",
+        "id": "19c841bb.b9c39e",
         "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=\"$network-input-parameters.param[$idx].name  +' value is null, please check it.'\" />\n",
         "comments": "",
-        "x": 2807.9096183776855,
-        "y": 933.9090785980225,
-        "z": "e7492f37.77e028",
+        "x": 2927.4408683776855,
+        "y": 517.9403285980225,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "a2cbb6ad.9498d8",
+        "id": "430a13df.a78e9c",
         "type": "switchNode",
         "name": "switch:serviceID",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'serviceID'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2055.0003356933594,
-        "y": 857.0000190734863,
-        "z": "e7492f37.77e028",
+        "x": 2174.5315856933594,
+        "y": 441.0312690734863,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "8cd031d1.154ec8"
+                "804331b5.825a1"
             ]
         ]
     },
     {
-        "id": "8cd031d1.154ec8",
+        "id": "804331b5.825a1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2228.000220298767,
-        "y": 856.0000171661377,
-        "z": "e7492f37.77e028",
+        "x": 2347.531470298767,
+        "y": 440.0312671661377,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "9ffc371.a8c8ec8"
+                "1d00164b.c74e1a"
             ]
         ]
     },
     {
-        "id": "7e9b3155.7cd6d",
+        "id": "b8311cf7.388d1",
         "type": "set",
         "name": "set:serviceID",
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2799.000186920166,
-        "y": 855.6000289916992,
-        "z": "e7492f37.77e028",
+        "x": 2918.531436920166,
+        "y": 439.6312789916992,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "9ffc371.a8c8ec8",
+        "id": "1d00164b.c74e1a",
         "type": "switchNode",
         "name": "switch:serviceID value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2409.148380279541,
-        "y": 855.777702331543,
-        "z": "e7492f37.77e028",
+        "x": 2528.679630279541,
+        "y": 439.80895233154297,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "46008887.d0731",
-                "67d761ed.040b7"
+                "acaa6a13.89b9f8",
+                "b5b74804.ae8938"
             ]
         ]
     },
     {
-        "id": "46008887.d0731",
+        "id": "acaa6a13.89b9f8",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2617.148380279541,
-        "y": 856.777702331543,
-        "z": "e7492f37.77e028",
+        "x": 2736.679630279541,
+        "y": 440.80895233154297,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "7e9b3155.7cd6d"
+                "b8311cf7.388d1"
             ]
         ]
     },
     {
-        "id": "f1c69874.61cb9",
+        "id": "29565532.cf8cca",
         "type": "call",
         "name": "call:validate-bbs-network-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1853.499912261963,
-        "y": 475.00001335144043,
-        "z": "e7492f37.77e028",
+        "x": 1973.031162261963,
+        "y": 59.03126335144043,
+        "z": "9458f851.9a2498",
         "wires": [
             []
         ]
     },
     {
-        "id": "fca294fa.de967",
-        "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": 3170.500503540039,
-        "y": 1121.0001611709595,
-        "z": "e7492f37.77e028",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ce8b9653.804e",
+        "id": "1c65ae1f.8b01d2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2313.500358581543,
-        "y": 1038.0002694129944,
-        "z": "e7492f37.77e028",
+        "x": 2433.031608581543,
+        "y": 622.0315194129944,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "558a111d.84c158"
+                "cced1fd6.04da4"
             ]
         ]
     },
     {
-        "id": "558a111d.84c158",
+        "id": "cced1fd6.04da4",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2531.5002365112305,
-        "y": 1037.0001168251038,
-        "z": "e7492f37.77e028",
+        "x": 2651.0314865112305,
+        "y": 621.0313668251038,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "3ed23c26.7d9344",
-                "3b7a58ab.469a28"
+                "4dce053b.3feafc",
+                "cf917e9d.94b86"
             ]
         ]
     },
     {
-        "id": "3ed23c26.7d9344",
+        "id": "4dce053b.3feafc",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2765.5002822875977,
-        "y": 1038.0000767707825,
-        "z": "e7492f37.77e028",
+        "x": 2885.0315322875977,
+        "y": 622.0313267707825,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "a4966b56.feb3a"
+                "7c2264f5.7e8cec"
             ]
         ]
     },
     {
-        "id": "3b7a58ab.469a28",
+        "id": "cf917e9d.94b86",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2767.5002822875977,
-        "y": 1124.0000767707825,
-        "z": "e7492f37.77e028",
+        "x": 2887.0315322875977,
+        "y": 708.0313267707825,
+        "z": "9458f851.9a2498",
         "wires": [
             [
-                "f89a532c.628618"
+                "523726af.0e2f78"
             ]
         ]
     },
     {
-        "id": "daa9ee04.8494a8",
+        "id": "7f7a43fa.cb783c",
         "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": 3205.50044631958,
-        "y": 1025.000093460083,
-        "z": "e7492f37.77e028",
+        "x": 3325.03169631958,
+        "y": 609.031343460083,
+        "z": "9458f851.9a2498",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e468fe4.3b77e8",
+        "id": "79257394.2307bc",
         "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": 1733.5001258850098,
-        "y": 1176.0000190734863,
-        "z": "e7492f37.77e028",
+        "x": 1853.0313758850098,
+        "y": 760.0312690734863,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "a4966b56.feb3a",
+        "id": "7c2264f5.7e8cec",
         "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": 2965.49995803833,
-        "y": 1038.0000114440918,
-        "z": "e7492f37.77e028",
+        "x": 3085.03120803833,
+        "y": 622.0312614440918,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "f89a532c.628618",
+        "id": "523726af.0e2f78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2951.4999771118164,
-        "y": 1123.2726850509644,
-        "z": "e7492f37.77e028",
+        "x": 3071.0312271118164,
+        "y": 707.3039350509644,
+        "z": "9458f851.9a2498",
         "wires": [
-            [
-                "fca294fa.de967"
-            ]
+            []
         ]
     },
     {
-        "id": "20d8621f.db8eee",
+        "id": "da5c448.537c3b8",
         "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": 2258.664794921875,
-        "y": 659.1193237304688,
-        "z": "e7492f37.77e028",
+        "x": 2378.196044921875,
+        "y": 243.15057373046875,
+        "z": "9458f851.9a2498",
         "wires": []
     },
     {
-        "id": "218de6d2.4c392a",
+        "id": "c09b1f3e.53091",
         "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": 2307.272705078125,
-        "y": 976.3635864257812,
-        "z": "e7492f37.77e028",
+        "x": 2426.803955078125,
+        "y": 560.3948364257812,
+        "z": "9458f851.9a2498",
         "wires": []
+    },
+    {
+        "id": "3a60417f.fe190e",
+        "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": 3290.031753540039,
+        "y": 705.0314111709595,
+        "z": "9458f851.9a2498",
+        "wires": [
+            []
+        ]
     }
 ]
\ 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-common-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
index 9fb4ecb4..849637a3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "1e347aad.d3338d",
+        "id": "1005a4d7.cdc89b",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 880,
-        "y": 429,
-        "z": "2edf7d59.cf16ea",
+        "x": 157.03125,
+        "y": 337.9999974966049,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "842aa2b0.9a6e38"
+                "84618843.f74f18"
             ]
         ]
     },
     {
-        "id": "842aa2b0.9a6e38",
+        "id": "84618843.f74f18",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,853 +22,852 @@
         "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": 1187.9996490478516,
-        "y": 429.0000219345093,
-        "z": "2edf7d59.cf16ea",
+        "x": 465.03089904785156,
+        "y": 338.0000194311142,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "fd3c684f.426a28"
+                "39d6495c.2a8966"
             ]
         ]
     },
     {
-        "id": "fd3c684f.426a28",
+        "id": "39d6495c.2a8966",
         "type": "method",
         "name": "method:bbs-internet-profile-network-topology-operation-common-huawei",
         "xml": "<method rpc='bbs-internet-profile-network-topology-operation-common-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1185.9996643066406,
-        "y": 649.0000991821289,
-        "z": "2edf7d59.cf16ea",
+        "x": 463.0309143066406,
+        "y": 558.0000966787338,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "2175700f.c2f0c8"
+                "bc585204.23434"
             ]
         ]
     },
     {
-        "id": "2175700f.c2f0c8",
+        "id": "bc585204.23434",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1609.9998626708984,
-        "y": 648.0000991821289,
-        "z": "2edf7d59.cf16ea",
+        "x": 887.0311126708984,
+        "y": 557.0000966787338,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "4127c3fa.9673b4",
-                "1d343f0c.026059",
-                "eab220b4.352a5",
-                "55d0514e.620318",
-                "38f1d224.3b5b8e"
+                "641b9dc3.c76d44",
+                "22e9e7f6.319e28",
+                "5806343e.90d4bc",
+                "ff7e2b0b.240d18"
             ]
         ]
     },
     {
-        "id": "4127c3fa.9673b4",
+        "id": "641b9dc3.c76d44",
         "type": "call",
         "name": "call:validate-bbs-network-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-network-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2076.000030517578,
-        "y": 327.00000953674316,
-        "z": "2edf7d59.cf16ea",
+        "x": 1353.0312805175781,
+        "y": 236.00000703334808,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d343f0c.026059",
+        "id": "22e9e7f6.319e28",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='network-input-parameters.' value='`$network-topology-operation-input.network-request-input.network-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='http://172.30.0.121:5000' />\n<parameter name='prop.bbs.service_id' value='`$network-topology-operation-input.service-information.service-id`' />\n\n",
         "comments": "",
-        "x": 1966.00053024292,
-        "y": 433.00020599365234,
-        "z": "2edf7d59.cf16ea",
+        "x": 1243.03178024292,
+        "y": 342.00020349025726,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "eab220b4.352a5",
+        "id": "5806343e.90d4bc",
         "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": 1993,
-        "y": 543.1111707687378,
-        "z": "2edf7d59.cf16ea",
+        "x": 1270.03125,
+        "y": 452.1111682653427,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             []
         ]
     },
     {
-        "id": "55d0514e.620318",
+        "id": "ff7e2b0b.240d18",
         "type": "for",
         "name": "for:network-input-paramters",
         "xml": "<for index='idx' start='0' end='`$network-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2009.5003662109375,
-        "y": 642.0001726150513,
-        "z": "2edf7d59.cf16ea",
+        "x": 1286.5316162109375,
+        "y": 551.0001701116562,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "7929126f.1978ec"
+                "405ee64e.c6f528"
             ]
         ]
     },
     {
-        "id": "8a494a8.20a8bb8",
+        "id": "87370c41.174ad",
         "type": "switchNode",
         "name": "switch:ip_remote_id",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_remote_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606.5004272460938,
-        "y": 423.00020694732666,
-        "z": "2edf7d59.cf16ea",
+        "x": 1883.5316772460938,
+        "y": 332.0002044439316,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "fe05659d.525818"
+                "6f712c2f.00fd94"
             ]
         ]
     },
     {
-        "id": "fe05659d.525818",
+        "id": "6f712c2f.00fd94",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2810.500347137451,
-        "y": 423.00017833709717,
-        "z": "2edf7d59.cf16ea",
+        "x": 2087.531597137451,
+        "y": 332.0001758337021,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "8225c847.1697b"
+                "1531c27c.bf6ace"
             ]
         ]
     },
     {
-        "id": "a7d3481c.08f7b8",
+        "id": "82c53c1.cbe2cc",
         "type": "set",
         "name": "set:remote_id",
         "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3529.5007095336914,
-        "y": 416.60026264190674,
-        "z": "2edf7d59.cf16ea",
+        "x": 2806.5319595336914,
+        "y": 325.60026013851166,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "7929126f.1978ec",
+        "id": "405ee64e.c6f528",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2255.5004081726074,
-        "y": 641.0001811981201,
-        "z": "2edf7d59.cf16ea",
+        "x": 1532.5316581726074,
+        "y": 550.000178694725,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "8a494a8.20a8bb8",
-                "c33f3624.738b68",
-                "e50f084d.3dcf38",
-                "19d2ce64.f177ba",
-                "d857f73d.adc418",
-                "17321748.f836a9",
-                "80e0672.33dd098",
-                "9ec2e808.aa4ef"
+                "87370c41.174ad",
+                "c3b38917.be7dd8",
+                "9df0c6fb.c3cff8",
+                "c04f9f0a.fdecd",
+                "70d3b64e.02f668",
+                "518351b3.5bba",
+                "3d4326b7.055a3a",
+                "363ebd91.fb5852"
             ]
         ]
     },
     {
-        "id": "c33f3624.738b68",
+        "id": "c3b38917.be7dd8",
         "type": "switchNode",
         "name": "switch:ont_sn",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ont_sn'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606.352222442627,
-        "y": 484.0002088546753,
-        "z": "2edf7d59.cf16ea",
+        "x": 1883.383472442627,
+        "y": 393.0002063512802,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "91cb6667.0e6f38"
+                "fcb34afe.c01578"
             ]
         ]
     },
     {
-        "id": "91cb6667.0e6f38",
+        "id": "fcb34afe.c01578",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2809.3521251678467,
-        "y": 484.0002727508545,
-        "z": "2edf7d59.cf16ea",
+        "x": 2086.3833751678467,
+        "y": 393.0002702474594,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "2781aecd.a647d2"
+                "b65719a8.25dce8"
             ]
         ]
     },
     {
-        "id": "98c0b103.95e21",
+        "id": "1cf31c48.ca8d04",
         "type": "set",
         "name": "set:ont_sn",
         "xml": "<set>\n<parameter name='prop.bbs.ont_sn' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3528.353015899658,
-        "y": 478.60032749176025,
-        "z": "2edf7d59.cf16ea",
+        "x": 2805.384265899658,
+        "y": 387.6003249883652,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "e50f084d.3dcf38",
+        "id": "9df0c6fb.c3cff8",
         "type": "switchNode",
         "name": "switch:c_vlan",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'c_vlan'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2601.3524780273438,
-        "y": 843.0003833770752,
-        "z": "2edf7d59.cf16ea",
+        "x": 1878.3837280273438,
+        "y": 752.0003808736801,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "cc2858fe.effe8"
+                "9f06e43c.6bf558"
             ]
         ]
     },
     {
-        "id": "cc2858fe.effe8",
+        "id": "9f06e43c.6bf558",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2804.352336883545,
-        "y": 843.000394821167,
-        "z": "2edf7d59.cf16ea",
+        "x": 2081.383586883545,
+        "y": 752.0003923177719,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "9cd70077.ad156"
+                "6d16f565.8a456c"
             ]
         ]
     },
     {
-        "id": "484906a8.869108",
+        "id": "da1647b1.e6b208",
         "type": "set",
         "name": "set:c_vlan",
         "xml": "<set>\n<parameter name='prop.bbs.c_vlan' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3523.35302734375,
-        "y": 839.6004438400269,
-        "z": "2edf7d59.cf16ea",
+        "x": 2800.38427734375,
+        "y": 748.6004413366318,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "19d2ce64.f177ba",
+        "id": "c04f9f0a.fdecd",
         "type": "switchNode",
         "name": "switch:s_vlan",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 's_vlan'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2596.3524856567383,
-        "y": 786.2226104736328,
-        "z": "2edf7d59.cf16ea",
+        "x": 1873.3837356567383,
+        "y": 695.2226079702377,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "63ab238d.357434"
+                "c02cb5b5.2a9368"
             ]
         ]
     },
     {
-        "id": "63ab238d.357434",
+        "id": "c02cb5b5.2a9368",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2805.352370262146,
-        "y": 785.2226085662842,
-        "z": "2edf7d59.cf16ea",
+        "x": 2082.383620262146,
+        "y": 694.2226060628891,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "79609442.62289c"
+                "ad861806.5a6d18"
             ]
         ]
     },
     {
-        "id": "1dc9c73a.36a871",
+        "id": "e8f72dd1.3f17a",
         "type": "set",
         "name": "set:s_vlan",
         "xml": "<set>\n<parameter name='prop.bbs.s_vlan' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3525.35294342041,
-        "y": 779.8226985931396,
-        "z": "2edf7d59.cf16ea",
+        "x": 2802.38419342041,
+        "y": 688.8226960897446,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "8225c847.1697b",
+        "id": "1531c27c.bf6ace",
         "type": "switchNode",
         "name": "switch:ip_remote_id value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3021.500347137451,
-        "y": 422.0002088546753,
-        "z": "2edf7d59.cf16ea",
+        "x": 2298.531597137451,
+        "y": 331.0002063512802,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "f6d633a5.8dcd68",
-                "c415f41b.dc79"
+                "ead29df7.edff2",
+                "7088f31b.2c3bac"
             ]
         ]
     },
     {
-        "id": "c415f41b.dc79",
+        "id": "7088f31b.2c3bac",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3322.5007553100586,
-        "y": 416.00030040740967,
-        "z": "2edf7d59.cf16ea",
+        "x": 2599.5320053100586,
+        "y": 325.0002979040146,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "a7d3481c.08f7b8"
+                "82c53c1.cbe2cc"
             ]
         ]
     },
     {
-        "id": "2781aecd.a647d2",
+        "id": "b65719a8.25dce8",
         "type": "switchNode",
         "name": "switch:ont_sn value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3021.500347137451,
-        "y": 484.0002088546753,
-        "z": "2edf7d59.cf16ea",
+        "x": 2298.531597137451,
+        "y": 393.0002063512802,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "f6d633a5.8dcd68",
-                "68a8565a.8b2ef"
+                "ead29df7.edff2",
+                "693a2d60.620f14"
             ]
         ]
     },
     {
-        "id": "68a8565a.8b2ef",
+        "id": "693a2d60.620f14",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3324.5007553100586,
-        "y": 479.00030040740967,
-        "z": "2edf7d59.cf16ea",
+        "x": 2601.5320053100586,
+        "y": 388.0002979040146,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "98c0b103.95e21"
+                "1cf31c48.ca8d04"
             ]
         ]
     },
     {
-        "id": "9cd70077.ad156",
+        "id": "6d16f565.8a456c",
         "type": "switchNode",
         "name": "switch:c_vlan value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3019.50053024292,
-        "y": 844.0003337860107,
-        "z": "2edf7d59.cf16ea",
+        "x": 2296.53178024292,
+        "y": 753.0003312826157,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "f6d633a5.8dcd68",
-                "5078e952.0204f8"
+                "ead29df7.edff2",
+                "c393438f.bba03"
             ]
         ]
     },
     {
-        "id": "5078e952.0204f8",
+        "id": "c393438f.bba03",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3323.5011291503906,
-        "y": 841.0004281997681,
-        "z": "2edf7d59.cf16ea",
+        "x": 2600.5323791503906,
+        "y": 750.000425696373,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "484906a8.869108"
+                "da1647b1.e6b208"
             ]
         ]
     },
     {
-        "id": "79609442.62289c",
+        "id": "ad861806.5a6d18",
         "type": "switchNode",
         "name": "switch:s_vlan value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3018.50053024292,
-        "y": 785.0002937316895,
-        "z": "2edf7d59.cf16ea",
+        "x": 2295.53178024292,
+        "y": 694.0002912282944,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "f6d633a5.8dcd68",
-                "4f84a1a2.f9dfb8"
+                "ead29df7.edff2",
+                "bcb8e5a5.9e5928"
             ]
         ]
     },
     {
-        "id": "4f84a1a2.f9dfb8",
+        "id": "bcb8e5a5.9e5928",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3321.5009384155273,
-        "y": 781.0003852844238,
-        "z": "2edf7d59.cf16ea",
+        "x": 2598.5321884155273,
+        "y": 690.0003827810287,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "1dc9c73a.36a871"
+                "e8f72dd1.3f17a"
             ]
         ]
     },
     {
-        "id": "f6d633a5.8dcd68",
+        "id": "ead29df7.edff2",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3334.500732421875,
-        "y": 259.0002098083496,
-        "z": "2edf7d59.cf16ea",
+        "x": 2611.531982421875,
+        "y": 168.00020730495453,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "7c23f619.45f3b8"
+                "b35dde56.d6c17"
             ]
         ]
     },
     {
-        "id": "d857f73d.adc418",
+        "id": "70d3b64e.02f668",
         "type": "switchNode",
         "name": "switch:ip_service_type",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_service_type'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2603.333610534668,
-        "y": 544.0001068115234,
-        "z": "2edf7d59.cf16ea",
+        "x": 1880.364860534668,
+        "y": 453.00010430812836,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "3b602ed0.d84d6a"
+                "920a7410.841ae8"
             ]
         ]
     },
     {
-        "id": "3b602ed0.d84d6a",
+        "id": "920a7410.841ae8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2812.3334951400757,
-        "y": 543.0001049041748,
-        "z": "2edf7d59.cf16ea",
+        "x": 2089.3647451400757,
+        "y": 452.0001024007797,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "a24014b6.22fb98"
+                "a417f2d7.b944f"
             ]
         ]
     },
     {
-        "id": "c455421d.7c5a78",
+        "id": "5db34f7f.78458",
         "type": "set",
         "name": "set:service_type",
         "xml": "<set>\n<parameter name='prop.bbs.service_type' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3532.33406829834,
-        "y": 537.6001949310303,
-        "z": "2edf7d59.cf16ea",
+        "x": 2809.36531829834,
+        "y": 446.6001924276352,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "a24014b6.22fb98",
+        "id": "a417f2d7.b944f",
         "type": "switchNode",
         "name": "switch:ip_service_type value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3025.4816551208496,
-        "y": 542.7777900695801,
-        "z": "2edf7d59.cf16ea",
+        "x": 2302.5129051208496,
+        "y": 451.777787566185,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "dae0bd9.b9c44c",
-                "f6d633a5.8dcd68"
+                "2cc279ab.a0af76",
+                "ead29df7.edff2"
             ]
         ]
     },
     {
-        "id": "dae0bd9.b9c44c",
+        "id": "2cc279ab.a0af76",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3328.482063293457,
-        "y": 538.7778816223145,
-        "z": "2edf7d59.cf16ea",
+        "x": 2605.513313293457,
+        "y": 447.7778791189194,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "c455421d.7c5a78"
+                "5db34f7f.78458"
             ]
         ]
     },
     {
-        "id": "17321748.f836a9",
+        "id": "518351b3.5bba",
         "type": "switchNode",
         "name": "switch:ip_rg_mac_addr",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_rg_mac_addr'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2601.333610534668,
-        "y": 604.0001087188721,
-        "z": "2edf7d59.cf16ea",
+        "x": 1878.364860534668,
+        "y": 513.000106215477,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "2e394322.e3b494"
+                "8a32b1ef.5d1bd"
             ]
         ]
     },
     {
-        "id": "2e394322.e3b494",
+        "id": "8a32b1ef.5d1bd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2810.3334951400757,
-        "y": 603.0001068115234,
-        "z": "2edf7d59.cf16ea",
+        "x": 2087.3647451400757,
+        "y": 512.0001043081284,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "f5b4bf6e.71b26"
+                "d637aef8.5a4c4"
             ]
         ]
     },
     {
-        "id": "b4892f9a.ccf8d8",
+        "id": "201d0bf8.38ef94",
         "type": "set",
         "name": "set:mac",
         "xml": "<set>\n<parameter name='prop.bbs.mac' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3519.333984375,
-        "y": 597.6002368927002,
-        "z": "2edf7d59.cf16ea",
+        "x": 2796.365234375,
+        "y": 506.6002343893051,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "f5b4bf6e.71b26",
+        "id": "d637aef8.5a4c4",
         "type": "switchNode",
         "name": "switch:ip_rg_mac_addr value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3023.4816551208496,
-        "y": 602.7777919769287,
-        "z": "2edf7d59.cf16ea",
+        "x": 2300.5129051208496,
+        "y": 511.77778947353363,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "6b930f07.9c92d",
-                "f6d633a5.8dcd68"
+                "2891a7be.4e6178",
+                "ead29df7.edff2"
             ]
         ]
     },
     {
-        "id": "6b930f07.9c92d",
+        "id": "2891a7be.4e6178",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3326.482063293457,
-        "y": 598.7778835296631,
-        "z": "2edf7d59.cf16ea",
+        "x": 2603.513313293457,
+        "y": 507.777881026268,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "b4892f9a.ccf8d8"
+                "201d0bf8.38ef94"
             ]
         ]
     },
     {
-        "id": "9ec2e808.aa4ef",
+        "id": "363ebd91.fb5852",
         "type": "switchNode",
         "name": "switch:ip_downstream_speed",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_downstream_speed'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2600.333770751953,
-        "y": 726.0002136230469,
-        "z": "2edf7d59.cf16ea",
+        "x": 1877.3650207519531,
+        "y": 635.0002111196518,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "af0e2874.cdaf58"
+                "bb19ad4b.b256c"
             ]
         ]
     },
     {
-        "id": "af0e2874.cdaf58",
+        "id": "bb19ad4b.b256c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2809.333655357361,
-        "y": 725.0002117156982,
-        "z": "2edf7d59.cf16ea",
+        "x": 2086.364905357361,
+        "y": 634.0002092123032,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "5343752.1ca258c"
+                "fdc80625.9b6288"
             ]
         ]
     },
     {
-        "id": "93741b2.676f168",
+        "id": "541d49b3.202258",
         "type": "set",
         "name": "set:down_speed",
         "xml": "<set>\n<parameter name='prop.bbs.down_speed' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3529.334228515625,
-        "y": 719.6003017425537,
-        "z": "2edf7d59.cf16ea",
+        "x": 2806.365478515625,
+        "y": 628.6002992391586,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "5343752.1ca258c",
+        "id": "fdc80625.9b6288",
         "type": "switchNode",
         "name": "switch:ip_downstream_speed value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3022.4818153381348,
-        "y": 724.7778968811035,
-        "z": "2edf7d59.cf16ea",
+        "x": 2299.5130653381348,
+        "y": 633.7778943777084,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "4ea44007.a38f9",
-                "f6d633a5.8dcd68"
+                "6796c19d.201ef",
+                "ead29df7.edff2"
             ]
         ]
     },
     {
-        "id": "4ea44007.a38f9",
+        "id": "6796c19d.201ef",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3325.482223510742,
-        "y": 720.7779884338379,
-        "z": "2edf7d59.cf16ea",
+        "x": 2602.513473510742,
+        "y": 629.7779859304428,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "93741b2.676f168"
+                "541d49b3.202258"
             ]
         ]
     },
     {
-        "id": "df5d55aa.feb328",
+        "id": "f9293ec6.f63f5",
         "type": "switchNode",
         "name": "switch:service_id",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'service_id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2611.3334617614746,
-        "y": 365.0000114440918,
-        "z": "2edf7d59.cf16ea",
+        "x": 1888.3647117614746,
+        "y": 274.0000089406967,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "915b1f59.98c2"
+                "5b9ff78a.e4ef68"
             ]
         ]
     },
     {
-        "id": "915b1f59.98c2",
+        "id": "5b9ff78a.e4ef68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2815.333381652832,
-        "y": 364.9999828338623,
-        "z": "2edf7d59.cf16ea",
+        "x": 2092.364631652832,
+        "y": 273.9999803304672,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "97d5893.0c105f8"
+                "bd60c3c1.753f3"
             ]
         ]
     },
     {
-        "id": "bd2c3108.5e8e4",
+        "id": "666554a.9b343ac",
         "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": 3534.3337440490723,
-        "y": 358.6000671386719,
-        "z": "2edf7d59.cf16ea",
+        "x": 2811.3649940490723,
+        "y": 267.6000646352768,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "97d5893.0c105f8",
+        "id": "bd60c3c1.753f3",
         "type": "switchNode",
         "name": "switch:service_id value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3026.333381652832,
-        "y": 364.00001335144043,
-        "z": "2edf7d59.cf16ea",
+        "x": 2303.364631652832,
+        "y": 273.00001084804535,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "c8da08c5.7c8588"
+                "db0298c0.2da528"
             ]
         ]
     },
     {
-        "id": "c8da08c5.7c8588",
+        "id": "db0298c0.2da528",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.3337898254395,
-        "y": 358.0001049041748,
-        "z": "2edf7d59.cf16ea",
+        "x": 2604.3650398254395,
+        "y": 267.0001024007797,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "bd2c3108.5e8e4"
+                "666554a.9b343ac"
             ]
         ]
     },
     {
-        "id": "80e0672.33dd098",
+        "id": "3d4326b7.055a3a",
         "type": "switchNode",
         "name": "switch:ip_upstream_speed",
         "xml": "<switch test=\"`$network-input-parameters.param[$idx].name == 'ip_upstream_speed'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2600.3339309692383,
-        "y": 665.0001907348633,
-        "z": "2edf7d59.cf16ea",
+        "x": 1877.3651809692383,
+        "y": 574.0001882314682,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "20277844.76ed4"
+                "b44522a4.559ad"
             ]
         ]
     },
     {
-        "id": "20277844.76ed4",
+        "id": "b44522a4.559ad",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2809.333815574646,
-        "y": 664.0001888275146,
-        "z": "2edf7d59.cf16ea",
+        "x": 2086.365065574646,
+        "y": 573.0001863241196,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "1e51a898.1b496f"
+                "dd2d9b7b.ed18c8"
             ]
         ]
     },
     {
-        "id": "204cebd9.88796c",
+        "id": "d48daabb.434658",
         "type": "set",
         "name": "set:up_speed",
         "xml": "<set>\n<parameter name='prop.bbs.up_speed' value='`$network-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 3529.33438873291,
-        "y": 658.6002788543701,
-        "z": "2edf7d59.cf16ea",
+        "x": 2806.36563873291,
+        "y": 567.600276350975,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "1e51a898.1b496f",
+        "id": "dd2d9b7b.ed18c8",
         "type": "switchNode",
         "name": "switch:ip_upstream_speed value",
         "xml": "<switch test='`$network-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3022.48197555542,
-        "y": 663.7778739929199,
-        "z": "2edf7d59.cf16ea",
+        "x": 2299.51322555542,
+        "y": 572.7778714895248,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "cf0ce51.5cc7b18",
-                "f6d633a5.8dcd68"
+                "45350699.e53268",
+                "ead29df7.edff2"
             ]
         ]
     },
     {
-        "id": "cf0ce51.5cc7b18",
+        "id": "45350699.e53268",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3325.4823837280273,
-        "y": 659.7779655456543,
-        "z": "2edf7d59.cf16ea",
+        "x": 2602.5136337280273,
+        "y": 568.7779630422592,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             [
-                "204cebd9.88796c"
+                "d48daabb.434658"
             ]
         ]
     },
     {
-        "id": "7c23f619.45f3b8",
+        "id": "b35dde56.d6c17",
         "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=\"`$network-input-parameters.param[$idx].name  +' value is null, please check it.'`\" />\n",
         "comments": "",
-        "x": 3521.333251953125,
-        "y": 258,
-        "z": "2edf7d59.cf16ea",
+        "x": 2798.364501953125,
+        "y": 166.99999749660492,
+        "z": "b5d9a62e.6044f8",
         "wires": []
     },
     {
-        "id": "38f1d224.3b5b8e",
+        "id": "b035a2d5.a72c7",
         "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": 1944.222095489502,
-        "y": 748.5555591583252,
-        "z": "2edf7d59.cf16ea",
+        "x": 1221.253345489502,
+        "y": 657.5555566549301,
+        "z": "b5d9a62e.6044f8",
         "wires": [
             []
         ]
     }
-]
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
index 732f4f39..ef6ba0ba 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-network-topology-operation-delete-huawei.xml
@@ -94,12 +94,7 @@
                                 </return>
                             </outcome>
                             <outcome value=''>
-                                <block>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/oak/logx.txt" />
-                                        <parameter name="field1" value="deleteAccessConnectivityService success!" />
-                                    </record>
-                                </block>
+                                <block></block>
                             </outcome>
                         </switch>
                     </block>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
index 0eea0e09..d41dfd50 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-network-topology-operation-common-huawei.xml
@@ -161,19 +161,6 @@
                     </switch>
                 </block>
             </for>
-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/oak/logx.txt" />
-                <parameter name="field1" value="bbs-internet-profile-common" />
-                <parameter name="field2" value="`$prop.bbs.service_id`" />
-                <parameter name="field3" value="`$prop.bbs.remote_id`" />
-                <parameter name="field4" value="`$prop.bbs.ont_sn`" />
-                <parameter name="field5" value="`$prop.bbs.service_type`" />
-                <parameter name="field6" value="`$prop.bbs.mac`" />
-                <parameter name="field7" value="`$prop.bbs.up_speed`" />
-                <parameter name="field8" value="`$prop.bbs.down_speed`" />
-                <parameter name="field9" value="`$prop.bbs.s_vlan`" />
-                <parameter name="field10" value="`$prop.bbs.c_vlan`" />
-            </record>
         </block>
     </method>
 </service-logic>
-- 
cgit 1.2.3-korg