X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json;h=a79e551248983251bf3459d7b8bd0386098f509c;hb=36b54b31d97fd230a18aefe0af76cbdefd95a89d;hp=6f8e29130f77069b6052215e6ca17fbcf1e474a0;hpb=deb729cf3099ad58cb8c243101c37904da4fe349;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
index 6f8e2913..a79e5512 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "bc4c5d4f.d1f19",
+        "id": "50a67ae4.f839b4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 102.75,
-        "y": 220.99998664855957,
-        "z": "910bbedd.5fbce8",
+        "x": 112.75,
+        "y": 248.99998664855957,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "38c45b07.ed34e4"
+                "8c4d28e3.3d9228"
             ]
         ]
     },
     {
-        "id": "38c45b07.ed34e4",
+        "id": "8c4d28e3.3d9228",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,907 +22,1055 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 490.74988174438477,
-        "y": 220.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 500.74988174438477,
+        "y": 248.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "c3a71c48.0be57"
+                "ae1bacc1.ffae38"
             ]
         ]
     },
     {
-        "id": "c3a71c48.0be57",
+        "id": "ae1bacc1.ffae38",
         "type": "method",
         "name": "method:bbs-access-connectivity-vnf-topology-operation-delete-huawei",
         "xml": "<method rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 453.74988174438477,
-        "y": 339.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 463.74988174438477,
+        "y": 367.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1015d7d8.bba218"
+                "8f0f1a37.8524f"
             ]
         ]
     },
     {
-        "id": "1015d7d8.bba218",
+        "id": "8f0f1a37.8524f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 851.7499885559082,
-        "y": 338.99999141693115,
-        "z": "910bbedd.5fbce8",
+        "x": 861.7499885559082,
+        "y": 366.99999141693115,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "6803db15.0d8f74",
-                "681e5161.fa20d",
-                "a6b40423.ac2ca8",
-                "374f03c.b97d77c",
-                "2e181216.27ccce",
-                "188e79ba.5e9486",
-                "b4b9141a.0cfd8",
-                "653e84f8.bbdd14",
-                "d2d50667.fd62f"
+                "43644918.03e07",
+                "42fda2d0.76f41c",
+                "4e268208.631d44",
+                "69c9714c.cf11e8",
+                "11cb07e5.7a595",
+                "e5fc51e8.1b1648",
+                "4cec8b98.59d954",
+                "1ed9b62e.1ea66a",
+                "4553b0f0.66d808"
             ]
         ]
     },
     {
-        "id": "6803db15.0d8f74",
+        "id": "43644918.03e07",
         "type": "execute",
         "name": "excute:readProperties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293.750286102295,
-        "y": 193.1110725402832,
-        "z": "910bbedd.5fbce8",
+        "x": 1303.750286102295,
+        "y": 221.1110725402832,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "188e79ba.5e9486",
+        "id": "11cb07e5.7a595",
         "type": "for",
         "name": "for:vnf-input-paramters",
         "xml": "<for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1297.7503089904785,
-        "y": 414.9999179840088,
-        "z": "910bbedd.5fbce8",
+        "x": 1307.7503089904785,
+        "y": 442.9999179840088,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "d9d4b7b.6b23c48"
+                "8c1190d8.e53ea8"
             ]
         ]
     },
     {
-        "id": "2e181216.27ccce",
+        "id": "1ed9b62e.1ea66a",
         "type": "execute",
         "name": "execute:querryTokenID",
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1288.7503089904785,
-        "y": 324.9999942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 1298.7503089904785,
+        "y": 352.9999942779541,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "4f1fa17d.4f00e8",
-                "b7d32671.97a41"
+                "2da3f536.1b688a",
+                "20548f37.043398"
             ]
         ]
     },
     {
-        "id": "b7d32671.97a41",
+        "id": "20548f37.043398",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1587.916934967041,
-        "y": 321.2499942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 1597.916934967041,
+        "y": 349.2499942779541,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "21337368.af64c4"
+                "d327513e.748c98"
             ]
         ]
     },
     {
-        "id": "4f1fa17d.4f00e8",
+        "id": "2da3f536.1b688a",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1583.916934967041,
-        "y": 215.24996376037598,
-        "z": "910bbedd.5fbce8",
+        "x": 1593.916934967041,
+        "y": 243.24996376037598,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "d9ad86f3.bd8048"
+                "c871cfbd.770c88"
             ]
         ]
     },
     {
-        "id": "5ebb3e61.f6be88",
+        "id": "945a8775.908c38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error executing queryTokenID,vaule is null\" />\n",
         "comments": "",
-        "x": 2131.0307388305664,
-        "y": 263.6136484146118,
-        "z": "910bbedd.5fbce8",
+        "x": 2141.0307388305664,
+        "y": 291.6136484146118,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "4f940f96.eff4d",
+        "id": "214124fe.28a844",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1954.750316619873,
-        "y": 263.99995040893555,
-        "z": "910bbedd.5fbce8",
+        "x": 1964.750316619873,
+        "y": 291.99995040893555,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "5ebb3e61.f6be88"
+                "945a8775.908c38"
             ]
         ]
     },
     {
-        "id": "21337368.af64c4",
+        "id": "d327513e.748c98",
         "type": "switchNode",
         "name": "switch:token ",
         "xml": "<switch test='`$token-result.accessSession`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1783.7503356933594,
-        "y": 322.99993896484375,
-        "z": "910bbedd.5fbce8",
+        "x": 1793.7503356933594,
+        "y": 350.99993896484375,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "4f940f96.eff4d",
-                "c7c2da18.3fe03"
+                "214124fe.28a844",
+                "2fdd4ce5.71326c"
             ]
         ]
     },
     {
-        "id": "c7c2da18.3fe03",
+        "id": "2fdd4ce5.71326c",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1955.750316619873,
-        "y": 320.99995040893555,
-        "z": "910bbedd.5fbce8",
+        "x": 1965.750316619873,
+        "y": 348.99995040893555,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "626983c2.287bfc"
+                "fbc821f0.a549f"
             ]
         ]
     },
     {
-        "id": "626983c2.287bfc",
+        "id": "fbc821f0.a549f",
         "type": "set",
         "name": "set:token-id",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",
         "comments": "",
-        "x": 2130.2503089904785,
-        "y": 320.2499942779541,
-        "z": "910bbedd.5fbce8",
+        "x": 2140.2503089904785,
+        "y": 348.2499942779541,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "8811eeaf.bc7fe",
+        "id": "5c8c6071.aaf938",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Get token rest api\" />\n    <parameter name=\"field3\" value=\"`$token-result.accessSession`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2341.7503089904785,
-        "y": 317.99993324279785,
-        "z": "910bbedd.5fbce8",
+        "x": 2351.7503089904785,
+        "y": 345.99993324279785,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "374f03c.b97d77c",
+        "id": "69c9714c.cf11e8",
         "type": "set",
         "name": "set:variables",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />\n",
         "comments": "",
-        "x": 1259.750286102295,
-        "y": 113.00014877319336,
-        "z": "910bbedd.5fbce8",
+        "x": 1269.750286102295,
+        "y": 141.00014877319336,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "d2d50667.fd62f",
+        "id": "4553b0f0.66d808",
         "type": "execute",
         "name": "execute:deleteAccessConnectivityService",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/DeactivateOnt?serviceID='+$prop.bbs.serviceID`\" />\n    <parameter name=\"httpMethod\" value=\"get\"/>\n    <parameter name=\"contentType\" value=\"application/x-www-form-urlencoded\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1353.7506103515625,
-        "y": 562.0001220703125,
-        "z": "910bbedd.5fbce8",
+        "x": 1363.7506103515625,
+        "y": 591.0001220703125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "6a07c07d.4ffc58",
-                "3aea3fb0.9f27a8"
+                "bf6b3671.2756a",
+                "1076d0a3.80b937"
             ]
         ]
     },
     {
-        "id": "6a07c07d.4ffc58",
+        "id": "bf6b3671.2756a",
         "type": "outcome",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.750587463379,
-        "y": 535.000078201294,
-        "z": "910bbedd.5fbce8",
+        "x": 1664.750587463379,
+        "y": 563.000078201294,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "144af758.7f6181"
+                "7a0848b.2a313b8"
             ]
         ]
     },
     {
-        "id": "3aea3fb0.9f27a8",
+        "id": "1076d0a3.80b937",
         "type": "outcome",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.750560760498,
-        "y": 594.0000779628754,
-        "z": "910bbedd.5fbce8",
+        "x": 1664.750560760498,
+        "y": 622.0000779628754,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "47b72aff.6069ec"
+                "82dbdb0e.16fa7"
             ]
         ]
     },
     {
-        "id": "106fbc3e.7d35bc",
+        "id": "1630bf82.421768",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2140.7506713867188,
-        "y": 491.00001215934753,
-        "z": "910bbedd.5fbce8",
+        "x": 2150.7506713867188,
+        "y": 519.0000121593475,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "bdf75bc7.7d075"
+                "e19eb5c1.ad428"
             ]
         ]
     },
     {
-        "id": "bdf75bc7.7d075",
+        "id": "e19eb5c1.ad428",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'\" />\n",
         "comments": "",
-        "x": 2325.6596183776855,
-        "y": 490.90906524658203,
-        "z": "910bbedd.5fbce8",
+        "x": 2335.6596183776855,
+        "y": 518.909065246582,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "d9d4b7b.6b23c48",
+        "id": "8c1190d8.e53ea8",
         "type": "switchNode",
         "name": "switch:serviceID",
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'serviceID'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1572.7503356933594,
-        "y": 414.0000057220459,
-        "z": "910bbedd.5fbce8",
+        "x": 1582.7503356933594,
+        "y": 442.0000057220459,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "750b21bf.a6927"
+                "c845d3ac.90b5f"
             ]
         ]
     },
     {
-        "id": "750b21bf.a6927",
+        "id": "c845d3ac.90b5f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1745.750220298767,
-        "y": 413.00000381469727,
-        "z": "910bbedd.5fbce8",
+        "x": 1755.750220298767,
+        "y": 441.00000381469727,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1f68191d.946c67"
+                "f1b18887.5bf5d"
             ]
         ]
     },
     {
-        "id": "36a67602.b4e502",
+        "id": "ecdde1e1.45e498",
         "type": "set",
         "name": "set:serviceID",
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value='`$vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 2316.750186920166,
-        "y": 412.6000156402588,
-        "z": "910bbedd.5fbce8",
+        "x": 2326.750186920166,
+        "y": 440.6000156402588,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "1f68191d.946c67",
+        "id": "f1b18887.5bf5d",
         "type": "switchNode",
         "name": "switch:serviceID value",
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927.8984375,
-        "y": 412.7776794433594,
-        "z": "910bbedd.5fbce8",
+        "x": 1937.8984375,
+        "y": 440.7776794433594,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "ea1ff2ea.50521",
-                "106fbc3e.7d35bc"
+                "f1cd57aa.dc8a3",
+                "1630bf82.421768"
             ]
         ]
     },
     {
-        "id": "ea1ff2ea.50521",
+        "id": "f1cd57aa.dc8a3",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2134.898380279541,
-        "y": 413.77768898010254,
-        "z": "910bbedd.5fbce8",
+        "x": 2144.898380279541,
+        "y": 441.77768898010254,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "36a67602.b4e502"
+                "ecdde1e1.45e498"
             ]
         ]
     },
     {
-        "id": "681e5161.fa20d",
+        "id": "42fda2d0.76f41c",
         "type": "call",
         "name": "call:validate-bbs-vnf-input-parameters",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1364.2499694824219,
-        "y": 47,
-        "z": "910bbedd.5fbce8",
+        "x": 1374.2499694824219,
+        "y": 75,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "47b72aff.6069ec",
+        "id": "82dbdb0e.16fa7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1831.250358581543,
-        "y": 595.000256061554,
-        "z": "910bbedd.5fbce8",
+        "x": 1841.250358581543,
+        "y": 623.000256061554,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "303e36f6.0c3352"
+                "d761f212.3ca11"
             ]
         ]
     },
     {
-        "id": "303e36f6.0c3352",
+        "id": "d761f212.3ca11",
         "type": "switchNode",
         "name": "switch:service-result",
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2049.2502365112305,
-        "y": 594.0001034736633,
-        "z": "910bbedd.5fbce8",
+        "x": 2059.2502365112305,
+        "y": 622.0001034736633,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "68e091fa.27fed8",
-                "ab19b7c4.709eb"
+                "9ce0fa8e.22b3c8",
+                "fcb1db5c.d009c8"
             ]
         ]
     },
     {
-        "id": "68e091fa.27fed8",
+        "id": "9ce0fa8e.22b3c8",
         "type": "outcome",
         "name": "Other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2283.2502822875977,
-        "y": 595.000063419342,
-        "z": "910bbedd.5fbce8",
+        "x": 2293.2502822875977,
+        "y": 623.000063419342,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "8fc10bf.11b3578"
+                "c827fe2.329a4"
             ]
         ]
     },
     {
-        "id": "ab19b7c4.709eb",
+        "id": "fcb1db5c.d009c8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285.2502822875977,
-        "y": 681.000063419342,
-        "z": "910bbedd.5fbce8",
+        "x": 2295.2502822875977,
+        "y": 709.000063419342,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "40892b06.efda94"
+                "c261effb.9c1048"
             ]
         ]
     },
     {
-        "id": "301afc46.923fdc",
+        "id": "1a069d6d.a6538b",
         "type": "record",
         "name": "log error",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"deleteAccessConnectivityService falied!\" />\n    <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n    <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n    <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2723.25044631958,
-        "y": 582.0000801086426,
-        "z": "910bbedd.5fbce8",
+        "x": 2733.25044631958,
+        "y": 610.0000801086426,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6b40423.ac2ca8",
+        "id": "4e268208.631d44",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1257.2501220703125,
-        "y": 1178,
-        "z": "910bbedd.5fbce8",
+        "x": 1267.2501220703125,
+        "y": 1206,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "8fc10bf.11b3578",
+        "id": "c827fe2.329a4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error deleteAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />\n\n",
         "comments": "",
-        "x": 2483.24995803833,
-        "y": 594.9999980926514,
-        "z": "910bbedd.5fbce8",
+        "x": 2493.24995803833,
+        "y": 622.9999980926514,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "40892b06.efda94",
+        "id": "c261effb.9c1048",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2469.2499771118164,
-        "y": 680.2726716995239,
-        "z": "910bbedd.5fbce8",
+        "x": 2479.2499771118164,
+        "y": 708.2726716995239,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9ad86f3.bd8048",
+        "id": "c871cfbd.770c88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call queryTokenID\" />\n",
         "comments": "",
-        "x": 1776.414794921875,
-        "y": 218.1193084716797,
-        "z": "910bbedd.5fbce8",
+        "x": 1786.414794921875,
+        "y": 246.1193084716797,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "144af758.7f6181",
+        "id": "7a0848b.2a313b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call deleteAccessConnectivityService\" />\n",
         "comments": "",
-        "x": 1825.022705078125,
-        "y": 533.3635730743408,
-        "z": "910bbedd.5fbce8",
+        "x": 1835.022705078125,
+        "y": 561.3635730743408,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "b6c16596.5c7c28",
+        "id": "9dd837d6.036ee",
         "type": "record",
         "name": "log file",
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />\n    ",
         "comments": "",
         "outputs": 1,
-        "x": 2688.250503540039,
-        "y": 678.000147819519,
-        "z": "910bbedd.5fbce8",
+        "x": 2698.250503540039,
+        "y": 706.000147819519,
+        "z": "e45d4ef0.3442b",
         "wires": [
             []
         ]
     },
     {
-        "id": "653e84f8.bbdd14",
+        "id": "4cec8b98.59d954",
         "type": "update",
         "name": "deleteResourceAAI",
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.accessConnectivityVNFId\">",
         "comments": "",
         "outputs": 1,
-        "x": 1277.5,
-        "y": 1009.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1287.5,
+        "y": 1037.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "b41b6e9c.1adb4",
-                "88408d5b.2bbfc"
+                "bb87a673.eda418",
+                "8b446a24.a509"
             ]
         ]
     },
     {
-        "id": "f48317c3.07c1f8",
+        "id": "c9478f65.f0c428",
         "type": "comment",
         "name": "delete resource from AAI",
         "info": "",
         "comments": "",
-        "x": 1289.5,
-        "y": 831.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1299.5,
+        "y": 859.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "1310b851.c4289",
+        "id": "4012c344.81d004",
         "type": "for",
         "name": "for relationship-list",
         "xml": "<for silentFailure='true' index='ridx' start='0' end=\"`$aai.service-instance.relationship-list.relationship_length`\" >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1897.2501983642578,
-        "y": 801.0040102005005,
-        "z": "910bbedd.5fbce8",
+        "x": 1907.250244140625,
+        "y": 832.0040283203125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "ae25bd57.d493d"
+                "63765b59.e71844"
             ]
         ]
     },
     {
-        "id": "2fcbbd67.547f72",
+        "id": "44d85dcd.180994",
         "type": "comment",
         "name": "get generic-vnf of type AccessConnectivity",
         "info": "",
         "comments": "",
-        "x": 1965.2501068115234,
-        "y": 754.0039329528809,
-        "z": "910bbedd.5fbce8",
+        "x": 1975.2501068115234,
+        "y": 782.0039329528809,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "b4b9141a.0cfd8",
+        "id": "e5fc51e8.1b1648",
         "type": "update",
         "name": "get AAI service-instance",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"service-instance\" \n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\"\n        pfx='aai.service-instance' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1290.25,
-        "y": 748.0040283203125,
-        "z": "910bbedd.5fbce8",
+        "x": 1300.25,
+        "y": 776.0040283203125,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "cb45bd7f.6bb5c",
-                "f400169e.cf5978"
+                "b69b0c92.e4152",
+                "a389294b.9f1638"
             ]
         ]
     },
     {
-        "id": "55a732ae.2107cc",
+        "id": "862bb762.1570c8",
         "type": "comment",
         "name": "fetch relationship-list",
         "info": "",
         "comments": "",
-        "x": 1281.25,
-        "y": 635.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1291.25,
+        "y": 663.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "cb45bd7f.6bb5c",
+        "id": "b69b0c92.e4152",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1550.250244140625,
-        "y": 695.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1560.250244140625,
+        "y": 723.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7f971e3d.47d1a"
+                "e03f1216.bc1b2"
             ]
         ]
     },
     {
-        "id": "7f971e3d.47d1a",
+        "id": "e03f1216.bc1b2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1728.25,
-        "y": 699.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1738.25,
+        "y": 727.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "f400169e.cf5978",
+        "id": "a389294b.9f1638",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544.5001029968262,
-        "y": 800.7538871765137,
-        "z": "910bbedd.5fbce8",
+        "x": 1554.5001029968262,
+        "y": 828.7538871765137,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "52fa2c61.864a04"
+                "f1c18dab.afcd68"
             ]
         ]
     },
     {
-        "id": "52fa2c61.864a04",
+        "id": "f1c18dab.afcd68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1709.500072479248,
-        "y": 800.7539024353027,
-        "z": "910bbedd.5fbce8",
+        "x": 1719.500072479248,
+        "y": 828.7539024353027,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "1310b851.c4289"
+                "4012c344.81d004",
+                "4ce2100a.cd1018"
             ]
         ]
     },
     {
-        "id": "ae25bd57.d493d",
+        "id": "63765b59.e71844",
         "type": "for",
         "name": "for relationship data",
         "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2104.500244140625,
-        "y": 801.7539672851562,
-        "z": "910bbedd.5fbce8",
+        "x": 2114.500244140625,
+        "y": 829.7539672851562,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "f5970165.f7806"
+                "f31414d1.f162e"
             ]
         ]
     },
     {
-        "id": "8a56e636.4f7278",
+        "id": "c8550193.b4c99",
         "type": "switchNode",
         "name": "switch vnf-id",
         "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2368.5000228881836,
-        "y": 803.7539052963257,
-        "z": "910bbedd.5fbce8",
+        "x": 2378.5000228881836,
+        "y": 831.7539052963257,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "75f76578.cb5554"
+                "d09ca3d4.f11cb8"
             ]
         ]
     },
     {
-        "id": "75f76578.cb5554",
+        "id": "d09ca3d4.f11cb8",
         "type": "other",
         "name": "generic-vnf.vnf-id",
         "xml": "<outcome value='generic-vnf.vnf-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2561.5,
-        "y": 802.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 2571.5,
+        "y": 830.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "dead2f7a.e665e8"
+                "d0762f0e.84e988"
             ]
         ]
     },
     {
-        "id": "dead2f7a.e665e8",
+        "id": "d0762f0e.84e988",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2746.4999923706055,
-        "y": 802.7539052963257,
-        "z": "910bbedd.5fbce8",
+        "x": 2756.4999923706055,
+        "y": 830.7539052963257,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "eae921f2.e87618"
+                "34276a74.16485e"
             ]
         ]
     },
     {
-        "id": "eae921f2.e87618",
+        "id": "34276a74.16485e",
         "type": "update",
         "name": "get AAI generic-vnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value\"\n        pfx='aai.generic-vnf' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2954,
-        "y": 803.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 2964,
+        "y": 831.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "b9ebb66b.17626"
+                "7e789cdf.3df4bc"
             ]
         ]
     },
     {
-        "id": "7851584b.b526c8",
+        "id": "f49b4b0b.877478",
         "type": "switchNode",
         "name": "switch vnf-type",
         "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3426.5009765625,
-        "y": 882.75390625,
-        "z": "910bbedd.5fbce8",
+        "x": 3436.5009765625,
+        "y": 910.75390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "a3dcce28.fb6658"
+                "f85fda00.f58188"
             ]
         ]
     },
     {
-        "id": "a3dcce28.fb6658",
+        "id": "f85fda00.f58188",
         "type": "other",
         "name": "AccessConnectivity",
         "xml": "<outcome value='AccessConnectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3618.500648498535,
-        "y": 871.7539482116699,
-        "z": "910bbedd.5fbce8",
+        "x": 3628.500648498535,
+        "y": 899.7539482116699,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "bea7fa49.6293f"
+                "861f7d6b.55d1a"
             ]
         ]
     },
     {
-        "id": "bea7fa49.6293f",
+        "id": "861f7d6b.55d1a",
         "type": "set",
         "name": "set AccessConnectivity vnf-id",
         "xml": "<set>\n<parameter name='prop.bbs.accessConnectivityVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",
         "comments": "",
-        "x": 3862.500160217285,
-        "y": 869.7538728713989,
-        "z": "910bbedd.5fbce8",
+        "x": 3872.500160217285,
+        "y": 897.7538728713989,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "88408d5b.2bbfc",
+        "id": "8b446a24.a509",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1495.5,
-        "y": 978.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1505.5,
+        "y": 1006.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "574ff2aa.24627c"
+                "25362798.cabad"
             ]
         ]
     },
     {
-        "id": "b41b6e9c.1adb4",
+        "id": "bb87a673.eda418",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1499.5,
-        "y": 1041.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1509.5,
+        "y": 1069.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "574ff2aa.24627c"
+                "25362798.cabad"
             ]
         ]
     },
     {
-        "id": "574ff2aa.24627c",
+        "id": "25362798.cabad",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1720.5,
-        "y": 1008.00390625,
-        "z": "910bbedd.5fbce8",
+        "x": 1730.5,
+        "y": 1036.00390625,
+        "z": "e45d4ef0.3442b",
         "wires": []
     },
     {
-        "id": "f5970165.f7806",
+        "id": "f31414d1.f162e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2254.75,
-        "y": 837.2539043426514,
-        "z": "910bbedd.5fbce8",
+        "x": 2264.75,
+        "y": 865.2539043426514,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "8a56e636.4f7278"
+                "c8550193.b4c99"
             ]
         ]
     },
     {
-        "id": "7ba155f0.72fa54",
+        "id": "8697252.ff47458",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3241.5000381469727,
-        "y": 878.2539186477661,
-        "z": "910bbedd.5fbce8",
+        "x": 3251.5000381469727,
+        "y": 906.2539186477661,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7851584b.b526c8"
+                "f49b4b0b.877478"
             ]
         ]
     },
     {
-        "id": "b9ebb66b.17626",
+        "id": "7e789cdf.3df4bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3144.5,
-        "y": 802.0039043426514,
-        "z": "910bbedd.5fbce8",
+        "x": 3154.5,
+        "y": 830.0039043426514,
+        "z": "e45d4ef0.3442b",
         "wires": [
             [
-                "7ba155f0.72fa54"
+                "8697252.ff47458"
+            ]
+        ]
+    },
+    {
+        "id": "4ce2100a.cd1018",
+        "type": "for",
+        "name": "for metadata",
+        "xml": "<for silentFailure='true' index='rix' start='0' end=\"`$aai.service-instance.metadata.metadatum_length`\" >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1891.75,
+        "y": 985.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "9a48ff0.faf94"
+            ]
+        ]
+    },
+    {
+        "id": "e9902840.bdfac8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2665,
+        "y": 1002.5,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "98e36478.8c4bd"
+            ]
+        ]
+    },
+    {
+        "id": "98e36478.8c4bd",
+        "type": "update",
+        "name": "deleteResourceAAI",
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n        resource=\"service-instance\"\n\t\tkey=\"customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\n\t\t\tmetadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname\" >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2908,
+        "y": 994.5,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c33a67af.a46208",
+        "type": "other",
+        "name": "remote-id",
+        "xml": "<outcome value='remote-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2339.24951171875,
+        "y": 935.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "ce821d55.1eb7d8",
+        "type": "other",
+        "name": "cvlan",
+        "xml": "<outcome value='cvlan'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.24951171875,
+        "y": 1031.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "9a48ff0.faf94",
+        "type": "switchNode",
+        "name": "switch meatname",
+        "xml": "<switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2081.25,
+        "y": 991.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "7fedf5ad.6ecc04",
+                "c33a67af.a46208",
+                "ce821d55.1eb7d8",
+                "28fb3bcc.e84bdc",
+                "7f75cdba.08b70c"
+            ]
+        ]
+    },
+    {
+        "id": "7fedf5ad.6ecc04",
+        "type": "other",
+        "name": "controller-service-id",
+        "xml": "<outcome value='controller-service-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2339.24951171875,
+        "y": 985.2500610351562,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "7f75cdba.08b70c",
+        "type": "other",
+        "name": "expected-ont-id",
+        "xml": "<outcome value='expected-ont-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.75,
+        "y": 1117.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
+            ]
+        ]
+    },
+    {
+        "id": "28fb3bcc.e84bdc",
+        "type": "other",
+        "name": "svlan",
+        "xml": "<outcome value='svlan'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2352.75,
+        "y": 1076.25,
+        "z": "e45d4ef0.3442b",
+        "wires": [
+            [
+                "e9902840.bdfac8"
             ]
         ]
     }