Bug fixed related to service-instance metadat

Issue-ID: SDNC-1021
Signed-off-by: Rahul_cool <rahul.tamrkar@huawei.com>
Change-Id: I5a48fd7e119ba4a4c32daa33785e637521315838

Former-commit-id: 5a25099f4388a07809b5f5501cbf14035f860d78

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
index 9a63197..49e1d4b 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "1d6261af.026296",\r
+        "id": "1dfeb3dd.1c381c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 106.75,\r
-        "y": 146.00012969970703,\r
-        "z": "e0329916.b170f8",\r
+        "x": 119.75,\r
+        "y": 180.00012969970703,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "4f356558.c09824"\r
+                "64cbb377.7c0bf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f356558.c09824",\r
+        "id": "64cbb377.7c0bf4",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,1194 +22,1209 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 399.74940490722656,\r
-        "y": 146.0000295639038,\r
-        "z": "e0329916.b170f8",\r
+        "x": 412.74940490722656,\r
+        "y": 180.0000295639038,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f6fdf774.8bb96"\r
+                "520c0a59.153664"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6fdf774.8bb96",\r
+        "id": "520c0a59.153664",\r
         "type": "method",\r
         "name": "method:bbs-access-connectivity-vnf-topology-operation-create-huawei",\r
         "xml": "<method rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 397.74940490722656,\r
-        "y": 342.0000696182251,\r
-        "z": "e0329916.b170f8",\r
+        "x": 410.74940490722656,\r
+        "y": 376.0000696182251,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f3bcfb95.a6758"\r
+                "acdb8fbc.c4c32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3bcfb95.a6758",\r
+        "id": "acdb8fbc.c4c32",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 804.7496185302734,\r
-        "y": 343.0000696182251,\r
-        "z": "e0329916.b170f8",\r
+        "x": 817.7496185302734,\r
+        "y": 377.0000696182251,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "3a2b8179.f5c316",\r
-                "f43916c0.05b38",\r
-                "5819ae74.c281a",\r
-                "f4291e2e.795f3",\r
-                "bdcb838b.2c793",\r
-                "2efe0fba.b3123",\r
-                "48d2f628.580118",\r
-                "f603acaf.f2ab88"\r
+                "92311e7.928946",\r
+                "7b2360fe.45f79",\r
+                "f70f044f.f4216",\r
+                "148d0ddb.c1c5d2",\r
+                "ab8a01b3.157068",\r
+                "4fe300f9.717bd",\r
+                "14ca751b.b082bb",\r
+                "677aa3bb.4d4e74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a2b8179.f5c316",\r
+        "id": "92311e7.928946",\r
         "type": "execute",\r
         "name": "excute:readProperties",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1236.7498779296875,\r
-        "y": 232.11117553710938,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1249.7498779296875,\r
+        "y": 266.1111755371094,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f43916c0.05b38",\r
+        "id": "7b2360fe.45f79",\r
         "type": "call",\r
         "name": "call:validate-bbs-vnf-input-parameters",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1317.749755859375,\r
-        "y": 20,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1330.749755859375,\r
+        "y": 54,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f603acaf.f2ab88",\r
+        "id": "677aa3bb.4d4e74",\r
         "type": "execute",\r
         "name": "execute:createAccessConnectivityService",\r
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`'http://159.138.58.209:30335/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n    \n       <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />-->",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    <parameter name=\"customHttpHeaders\" value=\"`'X-Auth-Token=' + $prop.sdncRestApi.token_id`\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n    \n       <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1295.4008178710938,\r
-        "y": 792.9608383178711,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1309.4008178710938,\r
+        "y": 824.9608383178711,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "60f74c55.fe6e34",\r
-                "d4535369.b036"\r
+                "6c10e0e6.d236f8",\r
+                "11f064a9.56fa43"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60f74c55.fe6e34",\r
+        "id": "6c10e0e6.d236f8",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1640.733585357666,\r
-        "y": 882.9607381820679,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1653.733585357666,\r
+        "y": 916.9607381820679,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "15628a38.6513e6"\r
+                "65f44139.642dd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4535369.b036",\r
+        "id": "11f064a9.56fa43",\r
         "type": "outcome",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1632.64306640625,\r
-        "y": 791.1426010131836,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1645.64306640625,\r
+        "y": 825.1426010131836,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "3377addc.d013aa"\r
+                "f0c20005.cbb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2efe0fba.b3123",\r
+        "id": "14ca751b.b082bb",\r
         "type": "execute",\r
         "name": "execute:querryTokenID",\r
-        "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`'http://159.138.58.209:30335/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n\n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>-->",\r
+        "xml": " <execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-token-template.json'`\"/>\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>\n    <parameter name=\"format\" value=\"json\"/>\n    <parameter name=\"httpMethod\" value=\"put\"/>\n    <parameter name=\"responsePrefix\" value=\"token-result\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n\n\n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`\"/>-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1230.97216796875,\r
-        "y": 594.5557861328125,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1243.97216796875,\r
+        "y": 628.5557861328125,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f9c0e434.ab18e",\r
-                "ecb05dd5.09d378"\r
+                "41d71aa5.903454",\r
+                "e6e0653b.c6ad58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ecb05dd5.09d378",\r
+        "id": "e6e0653b.c6ad58",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1518.9169921875,\r
-        "y": 594.2502002716064,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1531.9169921875,\r
+        "y": 628.2502002716064,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f290b563.afea"\r
+                "84b8bff2.0e32c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9c0e434.ab18e",\r
+        "id": "41d71aa5.903454",\r
         "type": "outcome",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1517.1900024414062,\r
-        "y": 667.6138753890991,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1530.1900024414062,\r
+        "y": 701.6138753890991,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "50dc0542.4371cc"\r
+                "d82a2a82.f5e938"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "369cde33.b9c072",\r
+        "id": "38fd0525.aa8892",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2138.030807495117,\r
-        "y": 661.1595993041992,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2151.030807495117,\r
+        "y": 695.1595993041992,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1422e405.e818ac",\r
+        "id": "9abe0e72.caaf3",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1921.7502174377441,\r
-        "y": 663.0004110336304,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1934.7502174377441,\r
+        "y": 697.0004110336304,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "369cde33.b9c072"\r
+                "38fd0525.aa8892"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f290b563.afea",\r
+        "id": "84b8bff2.0e32c8",\r
         "type": "switchNode",\r
         "name": "switch:token ",\r
         "xml": "<switch test='`$token-result.accessSession`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1732.7500495910645,\r
-        "y": 593.0001859664917,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1745.7500495910645,\r
+        "y": 627.0001859664917,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "1422e405.e818ac",\r
-                "e2811aac.af4e88"\r
+                "9abe0e72.caaf3",\r
+                "9fff6487.f8195"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2811aac.af4e88",\r
+        "id": "9fff6487.f8195",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1919.750057220459,\r
-        "y": 592.0001831054688,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1932.750057220459,\r
+        "y": 626.0001831054688,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "83e041e2.11968"\r
+                "216dd074.c9033"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83e041e2.11968",\r
+        "id": "216dd074.c9033",\r
         "type": "set",\r
         "name": "set:token-id",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\n",\r
         "comments": "",\r
-        "x": 2130.2500648498535,\r
-        "y": 592.2501840591431,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2143.2500648498535,\r
+        "y": 626.2501840591431,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5819ae74.c281a",\r
+        "id": "f70f044f.f4216",\r
         "type": "set",\r
         "name": "set:variables",\r
         "xml": "<set>\n<parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\n<parameter name='prop.bbs.HsiPackage' value='50M' />\n<parameter name='prop.bbs.HsiType' value='IPoE' />\n",\r
         "comments": "",\r
-        "x": 1195.7503967285156,\r
-        "y": 132.00025749206543,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1208.7503967285156,\r
+        "y": 166.00025749206543,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "424a1338.c6c804",\r
+        "id": "8c8f9f2c.a4f258",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"`$prop.bbs.remote_id`\" />\n    <parameter name=\"field3\" value=\"`$prop.bbs.ONTSN`\" />\n    <parameter name=\"field4\" value=\"`$prop.bbs.CVLAN`\" />\n    <parameter name=\"field5\" value=\"`$prop.bbs.SVLAN`\" />\n    <parameter name=\"field6\" value=\"`$prop.bbs.HsiPackage`\" />\n    <parameter name=\"field7\" value=\"`$prop.bbs.HsiType`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1185.7502746582031,\r
-        "y": 425.00019550323486,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1198.7502746582031,\r
+        "y": 459.00019550323486,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2c82d829.e0ab68",\r
+        "id": "8b12d898.3d72d",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"createAccessConnectivityService success!\" />\n    <parameter name=\"field2\" value=\"`$service-result.accessE2Eservice.serviceID`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2458.7500400543213,\r
-        "y": 952.0003020167351,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2471.7500400543213,\r
+        "y": 986.0003020167351,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "15628a38.6513e6",\r
+        "id": "65f44139.642dd",\r
         "type": "switchNode",\r
         "name": "switch:service-result",\r
         "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1875.7497062683105,\r
-        "y": 882.0000333786011,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1888.7497062683105,\r
+        "y": 916.0000333786011,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f5141e0a.b112f8",\r
-                "f195f6a2.69ce68"\r
+                "c071ccac.1342c8",\r
+                "bd77dc7e.818a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5141e0a.b112f8",\r
+        "id": "c071ccac.1342c8",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2096.750011444092,\r
-        "y": 804.0002164840698,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2109.750011444092,\r
+        "y": 838.0002164840698,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "8275b3aa.8d1378"\r
+                "5358758f.0d5684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f195f6a2.69ce68",\r
+        "id": "bd77dc7e.818a8",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2097.7496337890625,\r
-        "y": 880.0000152587891,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2110.7496337890625,\r
+        "y": 914.0000152587891,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "917abc23.c0d878"\r
+                "5c433db5.e1230c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ffd1d599.c71c18",\r
+        "id": "25985c98.53ae4c",\r
         "type": "record",\r
         "name": "log error",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"createAccessConnectivityService falied!\" />\n    <parameter name=\"field2\" value=\"`$service-result.errors.error[0].error-info.error-code`\" />\n    <parameter name=\"field3\" value=\"`$service-result.errors.error[0].error-message`\" />\n    <parameter name=\"field4\" value=\"`$service-result.errors.error[0].error-tag`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2634.7500381469727,\r
-        "y": 842.0002098083496,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2647.7500381469727,\r
+        "y": 876.0002098083496,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "bdcb838b.2c793",\r
+        "id": "ab8a01b3.157068",\r
         "type": "for",\r
         "name": "for:vnf-input-paramters",\r
         "xml": "<for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1260.2501220703125,\r
-        "y": 335.00017261505127,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1273.2501220703125,\r
+        "y": 369.00017261505127,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "a466675f.e223b"\r
+                "d22ff9a3.fbfbb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ab8eedc.cb66a8",\r
+        "id": "cb807928.2112c8",\r
         "type": "switchNode",\r
         "name": "switch:remote_id",\r
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'remote_id'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.2502479553223,\r
-        "y": 136.000226020813,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1814.2502479553223,\r
+        "y": 170.000226020813,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "fb671302.f08a28"\r
+                "d4e1d576.c2d6f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb671302.f08a28",\r
+        "id": "d4e1d576.c2d6f8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2004.2501678466797,\r
-        "y": 136.0001974105835,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2017.2501678466797,\r
+        "y": 170.0001974105835,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "5ca67ab9.1ce66c"\r
+                "7927b5c0.d398f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2257c990.31ddd6",\r
+        "id": "5e2c004f.b53818",\r
         "type": "set",\r
         "name": "set:remote_id",\r
         "xml": "<set>\n<parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 2722.2499237060547,\r
-        "y": 134.60020351409912,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2735.2499237060547,\r
+        "y": 168.60020351409912,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a466675f.e223b",\r
+        "id": "d22ff9a3.fbfbb",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1515.2504196166992,\r
-        "y": 336.00021171569824,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1528.2504196166992,\r
+        "y": 370.00021171569824,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "6ab8eedc.cb66a8",\r
-                "ad025760.15512",\r
-                "931e8201.e0a528",\r
-                "1021a2a7.9d963d"\r
+                "cb807928.2112c8",\r
+                "2616fb50.5f93e4",\r
+                "2be8fa1f.fcef86",\r
+                "52dab55c.8b17dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad025760.15512",\r
+        "id": "2616fb50.5f93e4",\r
         "type": "switchNode",\r
         "name": "switch:ONTSN",\r
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'ONTSN'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.1020431518555,\r
-        "y": 197.00022792816162,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1814.1020431518555,\r
+        "y": 231.00022792816162,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f93e9a17.ed77c"\r
+                "1175216.ae444df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f93e9a17.ed77c",\r
+        "id": "1175216.ae444df",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2003.1019458770752,\r
-        "y": 197.00029182434082,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2016.1019458770752,\r
+        "y": 231.00029182434082,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "4c4d0595.c8d74c"\r
+                "5561709c.b3df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9de6cf9d.95e438",\r
+        "id": "41a1bcbb.4edd5c",\r
         "type": "set",\r
         "name": "set:ONTSN",\r
         "xml": "<set>\n<parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 2721.1022300720215,\r
-        "y": 196.60026836395264,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2734.1022300720215,\r
+        "y": 230.60026836395264,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "931e8201.e0a528",\r
+        "id": "2be8fa1f.fcef86",\r
         "type": "switchNode",\r
         "name": "switch:CVLAN",\r
         "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'CVLAN'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1801.1021156311035,\r
-        "y": 257.0002775192261,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1814.1021156311035,\r
+        "y": 291.0002775192261,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "45aee947.1f79f"\r
+                "430ccce0.a19a7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45aee947.1f79f",\r
+        "id": "430ccce0.a19a7c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2003.1019744873047,\r
-        "y": 257.00028896331787,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2016.1019744873047,\r
+        "y": 291.00028896331787,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f12f75d1.378e7"\r
+                "5fa318d2.3cda"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b328ff7b.de2178",\r
+        "id": "23ae22e3.22418e",\r
         "type": "set",\r
         "name": "set:CVLAN",\r
         "xml": "<set>\n<parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 2719.1019744873047,\r
-        "y": 257.60026454925537,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2732.1019744873047,\r
+        "y": 291.60026454925537,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1021a2a7.9d963d",\r
+        "id": "52dab55c.8b17dc",\r
         "type": "switchNode",\r
         "name": "switch:SVLAN",\r
-        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'SVLAN'`\">\n",\r
+        "xml": "<switch test=\"`$vnf-input-parameters.param[$idx].name == 'serviceID'`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1798.102123260498,\r
-        "y": 333.222544670105,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1811.102123260498,\r
+        "y": 367.222544670105,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "a0cd6bfe.37df4"\r
+                "d9dc9da4.a45018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0cd6bfe.37df4",\r
+        "id": "d9dc9da4.a45018",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2006.1020078659058,\r
-        "y": 332.22254276275635,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2019.1020078659058,\r
+        "y": 366.22254276275635,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "b2009bd.404af68"\r
+                "96fa65e7.f61a1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd36dd78.cdefd",\r
+        "id": "762a30f5.19315",\r
         "type": "set",\r
         "name": "set:SVLAN",\r
         "xml": "<set>\n<parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\n",\r
         "comments": "",\r
-        "x": 2725.1019744873047,\r
-        "y": 331.82255458831787,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2738.1019744873047,\r
+        "y": 365.82255458831787,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ca67ab9.1ce66c",\r
+        "id": "7927b5c0.d398f4",\r
         "type": "switchNode",\r
         "name": "switch:remote_id value",\r
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2249.2501678466797,\r
-        "y": 135.00022792816162,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2262.2501678466797,\r
+        "y": 169.00022792816162,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "9dd975e7.7bf628",\r
-                "9c64fed9.d1167"\r
+                "25b5ca63.22e58e",\r
+                "7f9a22df.b3546c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c64fed9.d1167",\r
+        "id": "7f9a22df.b3546c",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2537.2501678466797,\r
-        "y": 134.00022792816162,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2550.2501678466797,\r
+        "y": 168.00022792816162,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "2257c990.31ddd6"\r
+                "5e2c004f.b53818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dd975e7.7bf628",\r
+        "id": "25b5ca63.22e58e",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2535.250576019287,\r
-        "y": 65.00020694732666,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2548.250576019287,\r
+        "y": 99.00020694732666,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "e7c90529.4dc4f8"\r
+                "efd50227.ac304"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c4d0595.c8d74c",\r
+        "id": "5561709c.b3df8",\r
         "type": "switchNode",\r
         "name": "switch:ONTSN value",\r
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2249.2501678466797,\r
-        "y": 197.00022792816162,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2262.2501678466797,\r
+        "y": 231.00022792816162,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "9dd975e7.7bf628",\r
-                "923642af.93bc88"\r
+                "25b5ca63.22e58e",\r
+                "63df4639.d0b868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "923642af.93bc88",\r
+        "id": "63df4639.d0b868",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2539.2501678466797,\r
-        "y": 197.00022792816162,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2552.2501678466797,\r
+        "y": 231.00022792816162,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "9de6cf9d.95e438"\r
+                "41a1bcbb.4edd5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f12f75d1.378e7",\r
+        "id": "5fa318d2.3cda",\r
         "type": "switchNode",\r
         "name": "switch:CVLAN value",\r
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2252.2501678466797,\r
-        "y": 258.0002279281616,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2265.2501678466797,\r
+        "y": 292.0002279281616,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "9dd975e7.7bf628",\r
-                "f56650c5.51ce2"\r
+                "25b5ca63.22e58e",\r
+                "20955e4d.c0a422"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f56650c5.51ce2",\r
+        "id": "20955e4d.c0a422",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2540.2501678466797,\r
-        "y": 257.0002279281616,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2553.2501678466797,\r
+        "y": 291.0002279281616,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "b328ff7b.de2178"\r
+                "23ae22e3.22418e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2009bd.404af68",\r
+        "id": "96fa65e7.f61a1",\r
         "type": "switchNode",\r
         "name": "switch:SVLAN value",\r
         "xml": "<switch test='`$vnf-input-parameters.param[$idx].value`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2253.2501678466797,\r
-        "y": 332.0002279281616,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2266.2501678466797,\r
+        "y": 366.0002279281616,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "9dd975e7.7bf628",\r
-                "b2fcbca3.42bad"\r
+                "25b5ca63.22e58e",\r
+                "9fbec5d2.cbbe08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2fcbca3.42bad",\r
+        "id": "9fbec5d2.cbbe08",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2543.2501678466797,\r
-        "y": 333.0002279281616,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2556.2501678466797,\r
+        "y": 367.0002279281616,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "fd36dd78.cdefd"\r
+                "762a30f5.19315"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4291e2e.795f3",\r
+        "id": "148d0ddb.c1c5d2",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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`\" />",\r
         "comments": "",\r
-        "x": 1168.8052062988281,\r
-        "y": 1376.7781105041504,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1181.8052062988281,\r
+        "y": 1410.7781105041504,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "917abc23.c0d878",\r
+        "id": "5c433db5.e1230c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2255.9162635803223,\r
-        "y": 880.9999904632568,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2268.9162635803223,\r
+        "y": 914.9999904632568,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "c2dbfb5a.03777"\r
+                "4538034.6a1697c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8275b3aa.8d1378",\r
+        "id": "5358758f.0d5684",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`\" />",\r
         "comments": "",\r
-        "x": 2283.2496795654297,\r
-        "y": 804.0000534057617,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2296.2496795654297,\r
+        "y": 838.0000534057617,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e7c90529.4dc4f8",\r
+        "id": "efd50227.ac304",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2718.2496643066406,\r
-        "y": 65.00003147125244,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2731.2496643066406,\r
+        "y": 99.00003147125244,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50dc0542.4371cc",\r
+        "id": "d82a2a82.f5e938",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1717.5055389404297,\r
-        "y": 668.0284957885742,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1730.5055389404297,\r
+        "y": 702.0284957885742,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3377addc.d013aa",\r
+        "id": "f0c20005.cbb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call  createAccessConnectivityService\" />\n",\r
         "comments": "",\r
-        "x": 1847.1422576904297,\r
-        "y": 790.8467025756836,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1860.1422576904297,\r
+        "y": 824.8467025756836,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2ab02c3.18a528",\r
+        "id": "5e38308f.370118",\r
         "type": "save",\r
         "name": "save:generic-vnf",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name=  \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name=  \"vnf-type\" value = \"AccessConnectivity\"/>\n<parameter name=  \"service-id\" value = \"`$vnf-topology-operation-input.service-information.service-id`\"/>\n<parameter name=  \"prov-status\" value = \"ACTIVE\"/>\n<parameter name=  \"orchestration-status\" value = \"Active\"/>\n<parameter name=  \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name=  \"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=  \"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=  \"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1492.2832126617432,\r
-        "y": 1232.032096862793,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1506.283203125,\r
+        "y": 1264.0321044921875,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "7b50f775.bd98f8",\r
-                "57259626.7849c",\r
-                "e87076a5.810bc8"\r
+                "6773274d.45a418",\r
+                "cfe6b7ff.d9f358",\r
+                "fafcc8c3.49e96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b50f775.bd98f8",\r
+        "id": "6773274d.45a418",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1728.5050678253174,\r
-        "y": 1103.9208545684814,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1741.5050678253174,\r
+        "y": 1137.9208545684814,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "929e3be2.0040b8"\r
+                "a8a66d.ee4ae19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57259626.7849c",\r
+        "id": "cfe6b7ff.d9f358",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1739.4808864593506,\r
-        "y": 1163.9367108345032,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1752.4808864593506,\r
+        "y": 1197.9367108345032,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "4d0490a4.dc1d78"\r
+                "2eb6f04a.49f0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "929e3be2.0040b8",\r
+        "id": "a8a66d.ee4ae19",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save generic-vnf\" />\n",\r
         "comments": "",\r
-        "x": 1964.6476154327393,\r
-        "y": 1103.4923195838928,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1977.6476154327393,\r
+        "y": 1137.4923195838928,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d0490a4.dc1d78",\r
+        "id": "2eb6f04a.49f0a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generic-vnf instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1959.528413772583,\r
-        "y": 1164.413025379181,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1972.528413772583,\r
+        "y": 1198.413025379181,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e87076a5.810bc8",\r
+        "id": "fafcc8c3.49e96",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1733.0916919708252,\r
-        "y": 1229.0631909370422,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1746.0916919708252,\r
+        "y": 1263.0631909370422,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f68ce26b.06d55",\r
+        "id": "f142de1d.601888",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1941.0919456481934,\r
-        "y": 1227.063320159912,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1954.0919456481934,\r
+        "y": 1261.063320159912,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ac883442.28d84",\r
+        "id": "717695ed.d653b4",\r
         "type": "save",\r
         "name": "save:metadata",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  \n\tAND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n\t  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n\t  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\"\n    >\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"remote-id\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.remote_id`\" />\n    <parameter name=\"metadata.metadatum[1].metaname\" value=\"controller-service-id\" />\n    <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.serviceID`\" />\n    <parameter name=\"metadata.metadatum[2].metaname\" value=\"cvlan\" />\n    <parameter name=\"metadata.metadatum[2].metaval\" value=\"`$prop.bbs.CVLAN`\" />\n    <parameter name=\"metadata.metadatum[3].metaname\" value=\"svlan\" />\n    <parameter name=\"metadata.metadatum[3].metaval\" value=\"`$prop.bbs.SVLAN`\" />\n    <parameter name=\"metadata.metadatum[4].metaname\" value=\"expected-ont-id\" />\n    <parameter name=\"metadata.metadatum[4].metaval\" value=\"`$prop.bbs.ONTSN`\" />\n    <!--<parameter name=\"metadata.metadatum[5].metaname\" value=\"rgw-mac-address\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaval\" value=\"`$prop.bbs.mac`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1473.7825393676758,\r
-        "y": 1395.031925201416,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1486.782470703125,\r
+        "y": 1434.0318603515625,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "eafd77cb.b8397",\r
-                "1f25a38e.70d264",\r
-                "7db9333e.87da9c"\r
+                "90f289c9.afda58",\r
+                "490b0a19.59868c",\r
+                "63ec1381.7af084"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eafd77cb.b8397",\r
+        "id": "90f289c9.afda58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1704.2580490112305,\r
-        "y": 1326.3965287208557,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1717.2580490112305,\r
+        "y": 1360.3965287208557,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "f5714bd.89e15b8"\r
+                "e039528f.e88268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f25a38e.70d264",\r
+        "id": "490b0a19.59868c",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1716.2342109680176,\r
-        "y": 1396.412462234497,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1729.2342109680176,\r
+        "y": 1430.412462234497,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "2a90de57.54b0d2"\r
+                "8c5a3cb9.2f5608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5714bd.89e15b8",\r
+        "id": "e039528f.e88268",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save metadatum\" />\n",\r
         "comments": "",\r
-        "x": 1944.4008445739746,\r
-        "y": 1324.9680304527283,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1957.4008445739746,\r
+        "y": 1358.9680304527283,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a90de57.54b0d2",\r
+        "id": "8c5a3cb9.2f5608",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"metadatum instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1941.281744003296,\r
-        "y": 1395.8886985778809,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1954.281744003296,\r
+        "y": 1429.8886985778809,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7db9333e.87da9c",\r
+        "id": "63ec1381.7af084",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1710.8449211120605,\r
-        "y": 1466.5389018058777,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1723.8449211120605,\r
+        "y": 1500.5389018058777,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "223cf7d5.348cb8",\r
+        "id": "78cc77f3.b1e2f8",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save metadatum success!\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1921.8449211120605,\r
-        "y": 1466.5389018058777,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1934.8449211120605,\r
+        "y": 1500.5389018058777,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48d2f628.580118",\r
+        "id": "4fe300f9.717bd",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1187.4168128967285,\r
-        "y": 1106.0006484985352,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1200.4168128967285,\r
+        "y": 1140.0006484985352,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "c2ab02c3.18a528",\r
-                "ac883442.28d84",\r
-                "b153daf9.f98aa",\r
-                "74332c3b.90a3c4",\r
-                "e193ec3.bce899"\r
+                "5e38308f.370118",\r
+                "717695ed.d653b4",\r
+                "b8fc79ed.565",\r
+                "f65c3b6d.d69a38",\r
+                "f01db867.d36098",\r
+                "8fa4935d.532fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b153daf9.f98aa",\r
+        "id": "b8fc79ed.565",\r
         "type": "set",\r
         "name": "set:variables",\r
-        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n",\r
+        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n\n\n\n<!--<set>-->\n<!--<parameter name='vnf-id' value=\"123456789\"/>-->\n<!--<parameter name='vnf-name' value=\"vnf_name\"/>-->",\r
         "comments": "",\r
-        "x": 1476.4172821044922,\r
-        "y": 1110.333641052246,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1489.4172821044922,\r
+        "y": 1144.333641052246,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "74332c3b.90a3c4",\r
+        "id": "f65c3b6d.d69a38",\r
         "type": "execute",\r
         "name": "execute:generate",\r
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n    <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1496.7817077636719,\r
-        "y": 1026.0316162109375,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1509.7817077636719,\r
+        "y": 1060.0316162109375,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "5f8abaa7.bb84f4"\r
+                "48ab2a4c.2a241c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f8abaa7.bb84f4",\r
+        "id": "48ab2a4c.2a241c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1732.781421661377,\r
-        "y": 1030.0315780639648,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1745.781421661377,\r
+        "y": 1064.0315780639648,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "d24b114c.00fb78"\r
+                "fdd1ef38.730528"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d24b114c.00fb78",\r
+        "id": "fdd1ef38.730528",\r
         "type": "execute",\r
         "name": "execute",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n    <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n    <parameter name=\"regex\" value=\"-\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1919.7814769744873,\r
-        "y": 1029.0314865112305,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1932.7814769744873,\r
+        "y": 1063.0314865112305,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "c28eecff.183408"\r
+                "2eaae9b6.ab1ec6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd5c3172.606e3",\r
+        "id": "97bc6eeb.c32ca8",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2251.781539916992,\r
-        "y": 1027.0315475463867,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2264.781539916992,\r
+        "y": 1061.0315475463867,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c28eecff.183408",\r
+        "id": "2eaae9b6.ab1ec6",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2086.781415939331,\r
-        "y": 1028.0315170288086,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2099.781415939331,\r
+        "y": 1062.0315170288086,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2dbfb5a.03777",\r
+        "id": "4538034.6a1697c",\r
         "type": "set",\r
         "name": "set:variables",\r
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"`$service-result.accessE2Eservice.serviceID`\"/>\n",\r
         "comments": "",\r
-        "x": 2469.78129196167,\r
-        "y": 880.0314292907715,\r
-        "z": "e0329916.b170f8",\r
+        "x": 2482.78129196167,\r
+        "y": 914.0314292907715,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "80452a04.8e8ca8",\r
+        "id": "adcd38ea.8cbb8",\r
         "type": "set",\r
         "name": "set:variables",\r
         "xml": "<set>\n<parameter name='prop.bbs.serviceID' value=\"HSI20190330\"/>\n\n",\r
         "comments": "",\r
-        "x": 1166.0831298828125,\r
-        "y": 869.333381652832,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1179.0831298828125,\r
+        "y": 903.333381652832,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e193ec3.bce899",\r
+        "id": "f01db867.d36098",\r
         "type": "save",\r
         "name": "save:relationship",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n      key=\"service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type \n         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-id`\" />\n ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1480.25,\r
-        "y": 1585.0312519073486,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1493.25,\r
+        "y": 1619.0312519073486,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "8b7cfe7c.bb05c",\r
-                "605adc34.dc45b4",\r
-                "c57b41f2.edd368"\r
+                "afb1797d.cb3048",\r
+                "eb0ddaae.dc5158",\r
+                "7a2e5f09.7f4db8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b7cfe7c.bb05c",\r
+        "id": "afb1797d.cb3048",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1731.25,\r
-        "y": 1538.0312519073486,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1744.25,\r
+        "y": 1572.0312519073486,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "11122765.99c301"\r
+                "7b869183.1a645"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "605adc34.dc45b4",\r
+        "id": "eb0ddaae.dc5158",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1743.226161956787,\r
-        "y": 1608.04718542099,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1756.226161956787,\r
+        "y": 1642.04718542099,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             [\r
-                "8cd2a407.0333e"\r
+                "38d0b39a.587ff4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11122765.99c301",\r
+        "id": "7b869183.1a645",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save metadatum\" />\n",\r
         "comments": "",\r
-        "x": 1971.3927955627441,\r
-        "y": 1536.6027536392212,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1984.3927955627441,\r
+        "y": 1570.6027536392212,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cd2a407.0333e",\r
+        "id": "38d0b39a.587ff4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"metadatum instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1968.2736949920654,\r
-        "y": 1607.5234217643738,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1981.2736949920654,\r
+        "y": 1641.5234217643738,\r
+        "z": "f70766ca.3cc678",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c57b41f2.edd368",\r
+        "id": "7a2e5f09.7f4db8",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1737.83687210083,\r
-        "y": 1678.1736249923706,\r
-        "z": "e0329916.b170f8",\r
+        "x": 1750.83687210083,\r
+        "y": 1712.1736249923706,\r
+        "z": "f70766ca.3cc678",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "8fa4935d.532fd",\r
+        "type": "record",\r
+        "name": "log file",\r
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='`$vnf-id`'/>\n        <parameter name='field2' value='`$vnf-name`'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1485.75,\r
+        "y": 1202.75,\r
+        "z": "f70766ca.3cc678",\r
         "wires": [\r
             []\r
         ]\r

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

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
index 3623c26..271c3ef 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "30e08a8.30d50f6",\r
+        "id": "2827b574.5d0a5a",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 109.75,\r
-        "y": 57.75,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 88.75,\r
+        "y": 77,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "48f4fbce.5d31ac"\r
+                "140d5ce7.fff6d3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48f4fbce.5d31ac",\r
+        "id": "140d5ce7.fff6d3",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,206 +22,250 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 417.74964904785156,\r
-        "y": 57.75002193450928,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 396.74964904785156,\r
+        "y": 77.00002193450928,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "74687d07.30906c"\r
+                "a22a267b.703cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74687d07.30906c",\r
+        "id": "a22a267b.703cc",\r
         "type": "method",\r
         "name": "method:bbs-internet-profile-vnf-topology-operation-change-huawei",\r
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 415.74964904785156,\r
-        "y": 253.75006198883057,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 394.74964904785156,\r
+        "y": 273.00006198883057,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "4da1c203.90ca44"\r
+                "ff51862c.680cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4da1c203.90ca44",\r
+        "id": "ff51862c.680cf",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 822.7498626708984,\r
-        "y": 254.75006198883057,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 801.7498626708984,\r
+        "y": 274.00006198883057,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "dd2b33a2.9b6cb8",\r
-                "562f3ae4.b70bec",\r
-                "39abed71.23fa8a"\r
+                "4bd5e314.3dca5c",\r
+                "eb68bb85.4ef888",\r
+                "21691e47.3dfbe2",\r
+                "5fb0bbe8.44e5cc",\r
+                "1dfe4746.2621f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "562f3ae4.b70bec",\r
+        "id": "1dfe4746.2621f9",\r
         "type": "execute",\r
         "name": "execute:ChangeInternetProfileInstance",\r
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/ChangeInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1149.75,\r
-        "y": 255.75,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1119.75,\r
+        "y": 272,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "218b60aa.c94c1",\r
-                "4970adb.e3682d4"\r
+                "8f54d9cf.14791",\r
+                "cb1b12c0.cbc068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4970adb.e3682d4",\r
+        "id": "cb1b12c0.cbc068",\r
         "type": "outcome",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1451.0829811096191,\r
-        "y": 255.75,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1430.0829811096191,\r
+        "y": 275,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "651aa8da.9f2b6"\r
+                "64b06154.bbf13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "218b60aa.c94c1",\r
+        "id": "8f54d9cf.14791",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1460.082893371582,\r
-        "y": 330.75000190734863,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1439.082893371582,\r
+        "y": 350.00000190734863,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "ac4ee16c.6acf"\r
+                "da2a9799.3fd878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac4ee16c.6acf",\r
+        "id": "64b06154.bbf13",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call ChangeInternetProfileInstance\" />\n",\r
+        "comments": "",\r
+        "x": 1939.0165939331055,\r
+        "y": 275.28954792022705,\r
+        "z": "db4a8a9e.7821b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "eb68bb85.4ef888",\r
+        "type": "returnSuccess",\r
+        "name": "return success",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1051.598876953125,\r
+        "y": 608.039306640625,\r
+        "z": "db4a8a9e.7821b8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4bd5e314.3dca5c",\r
+        "type": "call",\r
+        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1210.765869140625,\r
+        "y": 191.03915405273438,\r
+        "z": "db4a8a9e.7821b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "21691e47.3dfbe2",\r
+        "type": "call",\r
+        "name": "call bbs-internet-profile-vnf-topology-operation-delete-huawei",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1208.75,\r
+        "y": 406.75,\r
+        "z": "db4a8a9e.7821b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5fb0bbe8.44e5cc",\r
+        "type": "call",\r
+        "name": "call bbs-internet-profile-vnf-topology-operation-create-huawei",\r
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1208,\r
+        "y": 491.75,\r
+        "z": "db4a8a9e.7821b8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "da2a9799.3fd878",\r
         "type": "switchNode",\r
         "name": "switch:service-result",\r
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",\r
+        "xml": "<switch test=\"`$service-result.status`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1695.0990142822266,\r
-        "y": 329.78929710388184,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1641.75,\r
+        "y": 345.75,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "7fde3fda.e84e4",\r
-                "b0522dad.def458"\r
+                "648e2996.26021",\r
+                "d5ee3d66.d58ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "651aa8da.9f2b6",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call ChangeInternetProfileInstance\" />\n",\r
-        "comments": "",\r
-        "x": 1960.0165939331055,\r
-        "y": 256.03954792022705,\r
-        "z": "f67d7469.c15c48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "7fde3fda.e84e4",\r
+        "id": "648e2996.26021",\r
         "type": "outcome",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1921.0993537902832,\r
-        "y": 330.78939056396484,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1867.7503395080566,\r
+        "y": 346.750093460083,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "26ffbe03.508d62"\r
+                "357ad26f.f6abce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0522dad.def458",\r
+        "id": "d5ee3d66.d58ce",\r
         "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
+        "name": "ok",\r
+        "xml": "<outcome value='ok'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1931.0990600585938,\r
-        "y": 416.78925704956055,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 1876.7501068115234,\r
+        "y": 432.7499485015869,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             [\r
-                "5ce83dfd.6c2514"\r
+                "88d9f41b.15a318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26ffbe03.508d62",\r
+        "id": "357ad26f.f6abce",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",\r
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error ChangeInternetProfileInstance return: '+$service-result.status`\" />\n\n",\r
         "comments": "",\r
-        "x": 2107.599021911621,\r
-        "y": 330.78922748565674,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 2054.2500076293945,\r
+        "y": 346.7499303817749,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5ce83dfd.6c2514",\r
+        "id": "88d9f41b.15a318",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2089.2656898498535,\r
-        "y": 417.7892322540283,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 2151.9166107177734,\r
+        "y": 429.7499485015869,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "39abed71.23fa8a",\r
-        "type": "returnSuccess",\r
-        "name": "return success",\r
-        "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",\r
-        "comments": "",\r
-        "x": 1065.5989570617676,\r
-        "y": 337.7893257141113,\r
-        "z": "f67d7469.c15c48",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "dd2b33a2.9b6cb8",\r
-        "type": "call",\r
-        "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",\r
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",\r
+        "id": "19293418.3b3464",\r
+        "type": "record",\r
+        "name": "log file",\r
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='my status`'/>\n        <parameter name='field2' value='status ok'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1251.765869140625,\r
-        "y": 169.78915786743164,\r
-        "z": "f67d7469.c15c48",\r
+        "x": 2155.6509857177734,\r
+        "y": 519.4607028961182,\r
+        "z": "db4a8a9e.7821b8",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
index 3bb1781..e0e2393 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "e24bd1dc.e94098",\r
+        "id": "d9de4964.2ddfb8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 93.75,\r
-        "y": 67,\r
-        "z": "ad46b000.c8324",\r
+        "x": 96.75,\r
+        "y": 48.75,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "4ea3eab3.ac826c"\r
+                "1a984b6b.c92bdd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ea3eab3.ac826c",\r
+        "id": "1a984b6b.c92bdd",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,601 +22,615 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 453.74964904785156,\r
-        "y": 68.00002193450928,\r
-        "z": "ad46b000.c8324",\r
+        "x": 456.74964904785156,\r
+        "y": 49.75002193450928,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "5c5c94c9.de2b2c"\r
+                "f48e46fa.493c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5c5c94c9.de2b2c",\r
+        "id": "f48e46fa.493c48",\r
         "type": "method",\r
         "name": "method:bbs-internet-profile-vnf-topology-operation-create-huawei",\r
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 448.7496643066406,\r
-        "y": 285.0000915527344,\r
-        "z": "ad46b000.c8324",\r
+        "x": 451.7496643066406,\r
+        "y": 266.7500915527344,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "f9739e65.c96bc8"\r
+                "c552944.716a168"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9739e65.c96bc8",\r
+        "id": "c552944.716a168",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 875.7498626708984,\r
-        "y": 287.0000991821289,\r
-        "z": "ad46b000.c8324",\r
+        "x": 878.7498626708984,\r
+        "y": 268.7500991821289,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "4406703d.473cb",\r
-                "24ad8f04.047a9",\r
-                "e22f8867.ca2c88",\r
-                "e451aa9.94334d8"\r
+                "93a57f35.ce30e",\r
+                "7cd9936c.a74f0c",\r
+                "28d2a60f.198f62",\r
+                "2a0a058a.d362aa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4406703d.473cb",\r
+        "id": "93a57f35.ce30e",\r
         "type": "call",\r
         "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1391.7501525878906,\r
-        "y": 200.00001907348633,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1394.7501525878906,\r
+        "y": 181.75001907348633,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e451aa9.94334d8",\r
+        "id": "2a0a058a.d362aa",\r
         "type": "execute",\r
         "name": "execute:CreateInternetProfileInstance",\r
-        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",\r
+        "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>\n    \n    \n    \n    \n    <!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1281.4007873535156,\r
-        "y": 285.9608345031738,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1284.4007568359375,\r
+        "y": 286.7108459472656,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "8b4a24c2.b740e",\r
-                "ef3863e0.509128"\r
+                "4ac07c83.2f81c4",\r
+                "2e139f54.9e08a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef3863e0.509128",\r
+        "id": "2e139f54.9e08a",\r
         "type": "outcome",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1582.7337684631348,\r
-        "y": 285.9608345031738,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1585.7337684631348,\r
+        "y": 267.7108345031738,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "7fe5ce9e.59b238"\r
+                "6994c9f.9e564b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b4a24c2.b740e",\r
+        "id": "4ac07c83.2f81c4",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1591.7336807250977,\r
-        "y": 360.96083641052246,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1594.7336807250977,\r
+        "y": 342.71083641052246,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "aa1c3229.429f2"\r
+                "b6053705.eb38f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa1c3229.429f2",\r
-        "type": "switchNode",\r
-        "name": "switch:service-result",\r
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1826.7498016357422,\r
-        "y": 360.00013160705566,\r
-        "z": "ad46b000.c8324",\r
-        "wires": [\r
-            [\r
-                "c0c77be6.d8a9",\r
-                "6e05de0f.e6dcb8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7fe5ce9e.59b238",\r
+        "id": "6994c9f.9e564b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call CreateInternetProfileInstance\" />\n",\r
         "comments": "",\r
-        "x": 2095.000898361206,\r
-        "y": 286.250337600708,\r
-        "z": "ad46b000.c8324",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "c0c77be6.d8a9",\r
-        "type": "outcome",\r
-        "name": "Other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2052.750141143799,\r
-        "y": 361.0002250671387,\r
-        "z": "ad46b000.c8324",\r
-        "wires": [\r
-            [\r
-                "d97a5f32.793c18"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6e05de0f.e6dcb8",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2062.7498474121094,\r
-        "y": 447.0000915527344,\r
-        "z": "ad46b000.c8324",\r
-        "wires": [\r
-            [\r
-                "637db1ee.358f3"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "d97a5f32.793c18",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",\r
-        "comments": "",\r
-        "x": 2239.2498092651367,\r
-        "y": 361.00006198883057,\r
-        "z": "ad46b000.c8324",\r
+        "x": 2098.000898361206,\r
+        "y": 268.000337600708,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "637db1ee.358f3",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2220.916477203369,\r
-        "y": 448.00006675720215,\r
-        "z": "ad46b000.c8324",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "24ad8f04.047a9",\r
+        "id": "7cd9936c.a74f0c",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1186.2499237060547,\r
-        "y": 1085.000192642212,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1189.2499237060547,\r
+        "y": 1066.750192642212,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8e72813.387f28",\r
+        "id": "4774618e.1748c8",\r
         "type": "save",\r
         "name": "save:generic-vnf",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"generic-vnf\" key=\"generic-vnf.vnf-id = $vnf-id\" >\n<parameter name= \"vnf-id\" value = \"`$vnf-id`\"/>\n<parameter name=  \"vnf-name\" value = \"`$vnf-name`\"/>\n<parameter name=  \"vnf-type\" value = \"InternetProfile\"/>\n<parameter name=  \"service-id\" value = \"`$vnf-topology-operation-input.service-information.service-id`\"/>\n<parameter name=  \"prov-status\" value = \"ACTIVE\"/>\n<parameter name=  \"orchestration-status\" value = \"Active\"/>\n<parameter name=  \"is-closed-loop-disabled\" value = \"false\" />\n<parameter name=  \"model-invariant-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`\"/>\n<parameter name=  \"model-version-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`\"/>\n<parameter name=  \"model-customization-id\" value = \"`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1464.78125,\r
-        "y": 751.0311889648438,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1467.78125,\r
+        "y": 732.7811889648438,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "333581cd.5fc33e",\r
-                "72a79e15.e23ae",\r
-                "8820e403.3378d8"\r
+                "a2030550.6968d8",\r
+                "a2e61682.0496d",\r
+                "c2e89ee1.fd39a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "333581cd.5fc33e",\r
+        "id": "a2030550.6968d8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1701.0030918121338,\r
-        "y": 622.9199714660645,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1704.0030918121338,\r
+        "y": 604.6699714660645,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "3908c055.5bdf4"\r
+                "a8f2f0b4.613d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72a79e15.e23ae",\r
+        "id": "a2e61682.0496d",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1711.978910446167,\r
-        "y": 682.9358277320862,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1714.978910446167,\r
+        "y": 664.6858277320862,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "d8258ad6.c3d598"\r
+                "c52ea4aa.3cc458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3908c055.5bdf4",\r
+        "id": "a8f2f0b4.613d58",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save generic-vnf\" />\n",\r
         "comments": "",\r
-        "x": 1937.1456394195557,\r
-        "y": 622.4914364814758,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1940.1456394195557,\r
+        "y": 604.2414364814758,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8258ad6.c3d598",\r
+        "id": "c52ea4aa.3cc458",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"generic-vnf instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1932.0264377593994,\r
-        "y": 683.4121422767639,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1935.0264377593994,\r
+        "y": 665.1621422767639,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8820e403.3378d8",\r
+        "id": "c2e89ee1.fd39a",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1705.5897159576416,\r
-        "y": 748.0623078346252,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1708.5897159576416,\r
+        "y": 729.8123078346252,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58b69da0.e8a154",\r
+        "id": "30875ff1.5bdfd8",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save generic-vnf success!\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1913.5899696350098,\r
-        "y": 746.0624370574951,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1916.5899696350098,\r
+        "y": 727.8124370574951,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d09cdb3b.55b35",\r
+        "id": "9f601e99.56d0d8",\r
         "type": "save",\r
         "name": "save:metadata",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  \n\tAND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n\t  AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n\t  AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"service-type\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$prop.bbs.service_type`\" />\n    <parameter name=\"metadata.metadatum[1].metaname\" value=\"up-speed\" />\n    <parameter name=\"metadata.metadatum[1].metaval\" value=\"`$prop.bbs.up_speed`\" />\n    <parameter name=\"metadata.metadatum[2].metaname\" value=\"down-speed\" />\n    <parameter name=\"metadata.metadatum[2].metaval\" value=\"`$prop.bbs.down_speed`\" />\n    <!--<parameter name=\"metadata.metadatum[3].metaname\" value=\"cvlan\" />-->\n    <!--<parameter name=\"metadata.metadatum[3].metaval\" value=\"`$prop.bbs.c_vlan`\" />-->\n    <!--<parameter name=\"metadata.metadatum[4].metaname\" value=\"svlan\" />-->\n    <!--<parameter name=\"metadata.metadatum[4].metaval\" value=\"`$prop.bbs.s_vlan`\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaname\" value=\"expected-ont-id\" />-->\n    <!--<parameter name=\"metadata.metadatum[5].metaval\" value=\"`$prop.bbs.ont_sn`\" />-->\n    <!--<parameter name=\"metadata.metadatum[6].metaname\" value=\"rgw-mac-address\" />-->\n    <!--<parameter name=\"metadata.metadatum[6].metaval\" value=\"`$prop.bbs.mac`\" />-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1463.2805881500244,\r
-        "y": 903.0309810638428,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1466.2806396484375,\r
+        "y": 884.781005859375,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "47ea2ed4.dab158",\r
-                "9b5c45a7.24ac",\r
-                "6e196242.6f111c"\r
+                "75d1f186.5e1628",\r
+                "1ef6650b.7bc7e3",\r
+                "fd18d32d.89767"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47ea2ed4.dab158",\r
+        "id": "75d1f186.5e1628",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1693.756097793579,\r
-        "y": 834.3955845832825,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1696.756097793579,\r
+        "y": 816.1455845832825,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "9c97c54a.182df"\r
+                "65dca94f.73cf2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b5c45a7.24ac",\r
+        "id": "1ef6650b.7bc7e3",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1705.7322597503662,\r
-        "y": 904.4115180969238,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1708.7322597503662,\r
+        "y": 886.1615180969238,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "b3de2c8b.bfd47"\r
+                "ce07defc.f7b8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c97c54a.182df",\r
+        "id": "65dca94f.73cf2",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save metadatum\" />\n",\r
         "comments": "",\r
-        "x": 1933.8988933563232,\r
-        "y": 832.967086315155,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1936.8988933563232,\r
+        "y": 814.717086315155,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3de2c8b.bfd47",\r
+        "id": "ce07defc.f7b8a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"metadatum instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1930.7797927856445,\r
-        "y": 903.8877544403076,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1933.7797927856445,\r
+        "y": 885.6377544403076,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e196242.6f111c",\r
+        "id": "fd18d32d.89767",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1700.3429698944092,\r
-        "y": 974.5379576683044,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1703.3429698944092,\r
+        "y": 956.2879576683044,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7263158e.3880f4",\r
+        "id": "b224e896.894f78",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"save metadatum success!\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1911.3429698944092,\r
-        "y": 974.5379576683044,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1914.3429698944092,\r
+        "y": 956.2879576683044,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e22f8867.ca2c88",\r
+        "id": "28d2a60f.198f62",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1159.914836883545,\r
-        "y": 624.9997653961182,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1162.914836883545,\r
+        "y": 606.7497653961182,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "d8e72813.387f28",\r
-                "d09cdb3b.55b35",\r
-                "336f1685.eaa8ba",\r
-                "869f359a.e187d8",\r
-                "ad68b782.700918"\r
+                "4774618e.1748c8",\r
+                "9f601e99.56d0d8",\r
+                "ba5a1797.70727",\r
+                "7803fefc.d4c7c8",\r
+                "8aee37b2.5ea6b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "336f1685.eaa8ba",\r
+        "id": "ba5a1797.70727",\r
         "type": "set",\r
         "name": "set:variables",\r
-        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n",\r
+        "xml": "<set>\n<parameter name='vnf-id' value=\"`$prop.random-data-list[3]`\"/>\n<parameter name='vnf-name' value=\"`'vnf-'+$prop.random-data-list[4]`\"/>\n\n<!--<set>-->\n<!--<parameter name='vnf-id' value=\"123456789\"/>-->\n<!--<parameter name='vnf-name' value=\"vnf_name\"/>-->",\r
         "comments": "",\r
-        "x": 1447.9151859283447,\r
-        "y": 621.332763671875,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1450.9151859283447,\r
+        "y": 603.082763671875,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "869f359a.e187d8",\r
+        "id": "7803fefc.d4c7c8",\r
         "type": "execute",\r
         "name": "execute:generate",\r
         "xml": " <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\">\n    <parameter name=\"ctx-destination\" value=\"prop.random-data\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1469.2793998718262,\r
-        "y": 547.030613899231,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1472.2793998718262,\r
+        "y": 528.780613899231,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "945f0b47.7a271"\r
+                "f2e54c60.7f91a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "945f0b47.7a271",\r
+        "id": "f2e54c60.7f91a8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1698.2793426513672,\r
-        "y": 548.0305881500244,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1701.2793426513672,\r
+        "y": 529.7805881500244,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "ba59e650.603da8"\r
+                "fcc3c7f0.ad45a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba59e650.603da8",\r
+        "id": "fcc3c7f0.ad45a8",\r
         "type": "execute",\r
         "name": "execute",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n    <parameter name=\"ctx_memory_result_key\" value=\"prop.random-data-list\"/>\n    <parameter name=\"original_string\" value=\"`$prop.random-data`\"/>\n    <parameter name=\"regex\" value=\"-\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1889.2793998718262,\r
-        "y": 546.0305881500244,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1892.2793998718262,\r
+        "y": 527.7805881500244,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "983150fa.b57c18"\r
+                "b59ad4ce.202cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b3b5961.4f30b8",\r
+        "id": "b9cb7d9c.55a978",\r
         "type": "record",\r
         "name": "log file",\r
         "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/oak/logx.txt\" />\n    <parameter name=\"field1\" value=\"`$prop.random-data`\" />\n    ",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2221.279462814331,\r
-        "y": 544.0306491851807,\r
-        "z": "ad46b000.c8324",\r
+        "x": 2224.279462814331,\r
+        "y": 525.7806491851807,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "983150fa.b57c18",\r
+        "id": "b59ad4ce.202cb8",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2056.27933883667,\r
-        "y": 545.0306186676025,\r
-        "z": "ad46b000.c8324",\r
+        "x": 2059.27933883667,\r
+        "y": 526.7806186676025,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ad68b782.700918",\r
+        "id": "8aee37b2.5ea6b",\r
         "type": "save",\r
         "name": "save:relationship",\r
         "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:relationship-list\" \n      key=\"service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\n         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type \n         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1408.75,\r
-        "y": 1123,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1411.75,\r
+        "y": 1104.75,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "95e71e63.b5a5e",\r
-                "2d716580.c38172",\r
-                "e09c00e3.de6a5"\r
+                "4e76192d.d1829",\r
+                "abf77744.d2107",\r
+                "ca875a30.55c0f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95e71e63.b5a5e",\r
+        "id": "4e76192d.d1829",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1639.2255096435547,\r
-        "y": 1054.3646035194397,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1642.2255096435547,\r
+        "y": 1036.1146035194397,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "aaa91f6b.20f22"\r
+                "f08d83a5.7df08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d716580.c38172",\r
+        "id": "abf77744.d2107",\r
         "type": "failure",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1651.2016716003418,\r
-        "y": 1124.380537033081,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1654.2016716003418,\r
+        "y": 1106.130537033081,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             [\r
-                "bffe8727.325998"\r
+                "6675ba9e.68afe4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aaa91f6b.20f22",\r
+        "id": "f08d83a5.7df08",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Failure calling AAI to save metadatum\" />\n",\r
         "comments": "",\r
-        "x": 1879.3683052062988,\r
-        "y": 1052.9361052513123,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1882.3683052062988,\r
+        "y": 1034.6861052513123,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bffe8727.325998",\r
+        "id": "6675ba9e.68afe4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"metadatum instance does not exist in AAI\" />\n",\r
         "comments": "",\r
-        "x": 1876.2492046356201,\r
-        "y": 1123.8567733764648,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1879.2492046356201,\r
+        "y": 1105.6067733764648,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e09c00e3.de6a5",\r
+        "id": "ca875a30.55c0f8",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1645.8123817443848,\r
-        "y": 1194.5069766044617,\r
-        "z": "ad46b000.c8324",\r
+        "x": 1648.8123817443848,\r
+        "y": 1176.2569766044617,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b6053705.eb38f8",\r
+        "type": "switchNode",\r
+        "name": "switch:service-result",\r
+        "xml": "<switch test=\"`$service-result.status`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1790.5,\r
+        "y": 336.75,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": [\r
+            [\r
+                "f6c8a32c.d2ddd",\r
+                "c64a8b4f.023918"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f6c8a32c.d2ddd",\r
+        "type": "outcome",\r
+        "name": "Other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2016.5003395080566,\r
+        "y": 337.750093460083,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": [\r
+            [\r
+                "b9d680ed.ff6d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "c64a8b4f.023918",\r
+        "type": "outcome",\r
+        "name": "ok",\r
+        "xml": "<outcome value='ok'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2025.5001068115234,\r
+        "y": 423.7499485015869,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": [\r
+            [\r
+                "db92c6c9.2636c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "b9d680ed.ff6d8",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error CreateInternetProfileInstance return: '+$service-result.status`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2203.0000076293945,\r
+        "y": 337.7499303817749,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "db92c6c9.2636c",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2300.6666107177734,\r
+        "y": 420.7499485015869,\r
+        "z": "e692aafc.7d6fa8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "aad8dfdd.efd4d",\r
+        "type": "record",\r
+        "name": "log file",\r
+        "xml": " <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>\n    <parameter name='logger' value='message-log'/>\n        <parameter name='field1' value='my status`'/>\n        <parameter name='field2' value='status ok'/>\n\n\n\n <!--<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">-->\n <!--   <parameter name=\"file\" value=\"/root/logx.txt\" />-->\n <!--   <parameter name=\"field1\" value=\"deleteAccessConnectivityService success!\" />-->\n <!--       <parameter name=\"field2\" value='`$topology.networks.network[0].network-types`' />-->\n    ",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2447.40087890625,\r
+        "y": 479.460693359375,\r
+        "z": "e692aafc.7d6fa8",\r
         "wires": [\r
             []\r
         ]\r

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
index 93ffdb3..6133b02 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.json
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "a77f6699.47796",\r
+        "id": "107dd3ad.6ad91c",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 106.75,\r
-        "y": 79.77389526367188,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 122.75,\r
+        "y": 72.75,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "c640c202.91b41"\r
+                "83222bba.63a2c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c640c202.91b41",\r
+        "id": "83222bba.63a2c8",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,466 +22,733 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 414.74964904785156,\r
-        "y": 79.77391719818115,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 392.74964904785156,\r
+        "y": 73.75002193450928,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "4e95369f.bf41e"\r
+                "97bb6ddd.1d4fd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e95369f.bf41e",\r
+        "id": "97bb6ddd.1d4fd",\r
         "type": "method",\r
         "name": "method:bbs-internet-profile-vnf-topology-operation-delete-huawei",\r
         "xml": "<method rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 412.7496337890625,\r
-        "y": 275.77399349212646,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 390.7496337890625,\r
+        "y": 269.7500982284546,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "a33839b0.90a02"\r
+                "eb7b740e.3178f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a33839b0.90a02",\r
+        "id": "eb7b740e.3178f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 819.7498626708984,\r
-        "y": 276.77395725250244,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 797.7498626708984,\r
+        "y": 270.75006198883057,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "2ed02a5c.5d72ce",\r
-                "c8fbb930.846a4",\r
-                "3956ad31.45a35a",\r
-                "bf1fcd53.ddfe",\r
-                "1fd3f69.1d31e89"\r
+                "2aed678d.ccad18",\r
+                "a82b827c.c45a18",\r
+                "38b2d21b.25735e",\r
+                "6ae86a23.f13794",\r
+                "d358382c.fffa98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fd3f69.1d31e89",\r
+        "id": "52f37237.872894",\r
         "type": "execute",\r
         "name": "execute:DeleteInternetProfileInstance",\r
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode\" method=\"sendRequest\">\n    <parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`\" />\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`\" />\n    <parameter name=\"contentType\" value=\"application/json\"/>\n    <parameter name=\"httpMethod\" value=\"post\"/>\n    <parameter name=\"responsePrefix\" value=\"service-result\"/>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1208.4009246826172,\r
-        "y": 280.7347803115845,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1635.40087890625,\r
+        "y": 273.71087646484375,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "4123db34.0e7424",\r
-                "888adbdc.266ba8"\r
+                "57e00cd.1172574",\r
+                "7cf7dc05.83fe54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "888adbdc.266ba8",\r
+        "id": "7cf7dc05.83fe54",\r
         "type": "outcome",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1509.7339057922363,\r
-        "y": 280.7347803115845,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1940.73388671875,\r
+        "y": 271.71087646484375,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "6237fdd6.7dcb44"\r
+                "8bc7302d.af26b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4123db34.0e7424",\r
+        "id": "57e00cd.1172574",\r
         "type": "outcome",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1518.7338180541992,\r
-        "y": 355.7347822189331,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1675.7337646484375,\r
+        "y": 358.71087646484375,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "497cc63b.30848"\r
+                "9f9c92c8.4c1788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "497cc63b.30848",\r
-        "type": "switchNode",\r
-        "name": "switch:service-result",\r
-        "xml": "<switch test=\"`$service-result.errors.error[0].error-message`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1753.7499389648438,\r
-        "y": 354.7740774154663,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": [\r
-            [\r
-                "448428e5.a62b48",\r
-                "7cffa4c4.69e0d4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6237fdd6.7dcb44",\r
+        "id": "8bc7302d.af26b8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"Error failed to call DeleteInternetProfileInstance\" />\n",\r
         "comments": "",\r
-        "x": 2018.6675186157227,\r
-        "y": 281.0243282318115,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "448428e5.a62b48",\r
-        "type": "outcome",\r
-        "name": "Other",\r
-        "xml": "<outcome value='Other'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1979.7502784729004,\r
-        "y": 355.7741708755493,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": [\r
-            [\r
-                "eba25570.9a106"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7cffa4c4.69e0d4",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1989.749984741211,\r
-        "y": 441.774037361145,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": [\r
-            [\r
-                "4fc581b8.3b36a"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "eba25570.9a106",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`\" />\n\n",\r
-        "comments": "",\r
-        "x": 2166.2499465942383,\r
-        "y": 355.7740077972412,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2184.66748046875,\r
+        "y": 282.00042724609375,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4fc581b8.3b36a",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2147.9166145324707,\r
-        "y": 442.7740125656128,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "2ed02a5c.5d72ce",\r
+        "id": "2aed678d.ccad18",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 1147.1387634277344,\r
-        "y": 793.6630086898804,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1125.1387634277344,\r
+        "y": 787.6391134262085,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8fbb930.846a4",\r
+        "id": "a82b827c.c45a18",\r
         "type": "call",\r
         "name": "call:bbs-internet-profile-vnf-topology-operation-common-huawei",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1320.4169082641602,\r
-        "y": 196.77395057678223,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1298.4169082641602,\r
+        "y": 190.75005531311035,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dea36b4d.64e4",\r
+        "id": "3b653e8f.9983c2",\r
         "type": "comment",\r
         "name": "fetch relationship-list",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1127.9205322265625,\r
-        "y": 70,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1105.9205322265625,\r
+        "y": 63.976104736328125,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bf1fcd53.ddfe",\r
-        "type": "for",\r
-        "name": "for relationship data",\r
-        "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1160.393009185791,\r
-        "y": 455.75003242492676,\r
-        "z": "e5a6ac34.a7198",\r
-        "wires": [\r
-            [\r
-                "5f6aa36e.f418f4"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "362b4d43.71efaa",\r
+        "id": "e22b854a.815078",\r
         "type": "switchNode",\r
         "name": "switch vnf-id",\r
         "xml": "<switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1508.6150512695312,\r
-        "y": 455.41671800613403,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2117.6151123046875,\r
+        "y": 518.392822265625,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "dca82cdd.160458"\r
+                "e2f988d5.7bc23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dca82cdd.160458",\r
+        "id": "e2f988d5.7bc23",\r
         "type": "other",\r
         "name": "generic-vnf.vnf-id",\r
         "xml": "<outcome value='generic-vnf.vnf-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1681.837272644043,\r
-        "y": 455.5277795791626,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2290.837333679199,\r
+        "y": 518.5038838386536,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "48c7c532.f812c4"\r
+                "9ee9136f.479f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48c7c532.f812c4",\r
+        "id": "9ee9136f.479f08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1861.0594940185547,\r
-        "y": 523.3055810928345,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2512.0594520568848,\r
+        "y": 518.2816786766052,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "dbcb4df4.6dfa68"\r
+                "9b1e6a18.f7cc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbcb4df4.6dfa68",\r
+        "id": "9b1e6a18.f7cc4",\r
         "type": "update",\r
         "name": "get AAI generic-vnf",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2072.2261810302734,\r
-        "y": 524.3056182861328,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2723.22607421875,\r
+        "y": 519.2817077636719,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "f82b8813.df9498"\r
+                "4f841b67.60eb14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eceba1e.5f3b96",\r
+        "id": "97288862.73562",\r
         "type": "switchNode",\r
         "name": "switch vnf-type",\r
         "xml": "<switch test='`$aai.generic-vnf.vnf-type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2643.50479888916,\r
-        "y": 530.5278158187866,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 3249.504741668701,\r
+        "y": 517.5038967132568,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "49b85927.406f78"\r
+                "97ef98e.9440868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49b85927.406f78",\r
+        "id": "97ef98e.9440868",\r
         "type": "other",\r
         "name": "InternetProfile",\r
         "xml": "<outcome value='InternetProfile'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2837.504554748535,\r
-        "y": 524.5278453826904,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 3443.504497528076,\r
+        "y": 511.50392627716064,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "301145e6.198712"\r
+                "44e5b717.3abe78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "301145e6.198712",\r
+        "id": "44e5b717.3abe78",\r
         "type": "set",\r
         "name": "set InternetProfile vnf-id",\r
         "xml": "<set>\n<parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\n",\r
         "comments": "",\r
-        "x": 3081.504066467285,\r
-        "y": 522.5277700424194,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 3687.504009246826,\r
+        "y": 509.50385093688965,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
     },\r
     {\r
-        "id": "36ca2449.b1df6c",\r
+        "id": "4daed2f.ab45aac",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1340.9482955932617,\r
-        "y": 626.6667156219482,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1318.9482955932617,\r
+        "y": 620.6428203582764,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "aa8632c1.a4018"\r
+                "cda60208.a98e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6034493.649d",\r
+        "id": "29e461c3.021796",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1348.9482955932617,\r
-        "y": 686.6667156219482,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1326.9482955932617,\r
+        "y": 680.6428203582764,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "aa8632c1.a4018"\r
+                "cda60208.a98e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa8632c1.a4018",\r
+        "id": "cda60208.a98e38",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1556.9482955932617,\r
-        "y": 661.6667156219482,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1534.9482955932617,\r
+        "y": 655.6428203582764,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f6aa36e.f418f4",\r
+        "id": "3dd62fcb.d4bf38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1343.7538604736328,\r
-        "y": 455.5833511352539,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1921.75390625,\r
+        "y": 517.5594482421875,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "362b4d43.71efaa"\r
+                "e22b854a.815078"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f33b322.9852f5",\r
+        "id": "6ade0cdb.12e274",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2460.5039443969727,\r
-        "y": 531.0278158187866,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 3066.5038871765137,\r
+        "y": 518.0038967132568,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "2eceba1e.5f3b96"\r
+                "97288862.73562"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f82b8813.df9498",\r
+        "id": "4f841b67.60eb14",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2257.9483070373535,\r
-        "y": 523.6667051315308,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 2896.9482421875,\r
+        "y": 518.6427917480469,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "f33b322.9852f5"\r
+                "6ade0cdb.12e274"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3956ad31.45a35a",\r
+        "id": "38b2d21b.25735e",\r
         "type": "update",\r
         "name": "deleteResourceAAI",\r
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId\">",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1150.9112243652344,\r
-        "y": 626.7129230499268,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1128.9112243652344,\r
+        "y": 620.6890277862549,\r
+        "z": "82f9347f.003f68",\r
         "wires": [\r
             [\r
-                "36ca2449.b1df6c",\r
-                "f6034493.649d"\r
+                "4daed2f.ab45aac",\r
+                "29e461c3.021796"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "95856666.28972",\r
+        "id": "b66e07b8.1ddac8",\r
         "type": "comment",\r
         "name": "delete AAI resource",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1148.6890716552734,\r
-        "y": 573.3796081542969,\r
-        "z": "e5a6ac34.a7198",\r
+        "x": 1126.6890716552734,\r
+        "y": 567.355712890625,\r
+        "z": "82f9347f.003f68",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "6ae86a23.f13794",\r
+        "type": "update",\r
+        "name": "get AAI service-instance",\r
+        "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' >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1078,\r
+        "y": 438.75,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "7af9dcae.b039bc",\r
+                "240386a1.30810a"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d3f2b322.8b29a",\r
+        "type": "comment",\r
+        "name": "fetch relationship-list",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1063.000015258789,\r
+        "y": 382.7498474121094,\r
+        "z": "82f9347f.003f68",\r
         "wires": []\r
+    },\r
+    {\r
+        "id": "7af9dcae.b039bc",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1330.0002326965332,\r
+        "y": 389.74989223480225,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "f374f3a8.4abf78"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "f374f3a8.4abf78",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
+        "comments": "",\r
+        "x": 1521.000015258789,\r
+        "y": 389.7498779296875,\r
+        "z": "82f9347f.003f68",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "240386a1.30810a",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1266.2501220703125,\r
+        "y": 487.4998474121094,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "e718117f.fb2dc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e718117f.fb2dc",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1409.2501220703125,\r
+        "y": 496.4998474121094,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "7333ae69.c02df8",\r
+                "1ab6b41a.45b75c"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7333ae69.c02df8",\r
+        "type": "for",\r
+        "name": "for metadata",\r
+        "xml": "<for silentFailure='true' index='rix' start='0' end=\"`$aai.service-instance.metadata.metadatum_length`\" >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1584.75,\r
+        "y": 598.75,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "6e5a59d8.ef6978"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ce9e2279.5491f",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2218,\r
+        "y": 623,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "8ef73844.3e4718"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8ef73844.3e4718",\r
+        "type": "update",\r
+        "name": "deleteResourceAAI",\r
+        "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\" >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2445,\r
+        "y": 620,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "852919c3.1568f8",\r
+        "type": "other",\r
+        "name": "service-type",\r
+        "xml": "<outcome value='service-type'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1972.4996337890625,\r
+        "y": 567.5000610351562,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "ce9e2279.5491f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "d6328d5b.a9cb68",\r
+        "type": "other",\r
+        "name": "down-speed",\r
+        "xml": "<outcome value='down-speed'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1979.4996337890625,\r
+        "y": 663.5000610351562,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "ce9e2279.5491f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6e5a59d8.ef6978",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-type",\r
+        "xml": "<switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1780.5,\r
+        "y": 620.5,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "4c7c8000.3258b",\r
+                "852919c3.1568f8",\r
+                "d6328d5b.a9cb68"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4c7c8000.3258b",\r
+        "type": "other",\r
+        "name": "up-speed",\r
+        "xml": "<outcome value='up-speed'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1972.4996337890625,\r
+        "y": 617.5000610351562,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "ce9e2279.5491f"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "1ab6b41a.45b75c",\r
+        "type": "for",\r
+        "name": "for relationship-list",\r
+        "xml": "<for silentFailure='true' index='ridx' start='0' end=\"`$aai.service-instance.relationship-list.relationship_length`\" >\n\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1580,\r
+        "y": 463.75,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "cc722b6d.f8805"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "cc722b6d.f8805",\r
+        "type": "for",\r
+        "name": "for relationship data",\r
+        "xml": "<for silentFailure='false' index='rdidx' start='0' end=\"`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`\" >",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1733.25,\r
+        "y": 520.4999389648438,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "3dd62fcb.d4bf38"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9f9c92c8.4c1788",\r
+        "type": "switchNode",\r
+        "name": "switch:service-result",\r
+        "xml": "<switch test=\"`$service-result.status`\">\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1855.25,\r
+        "y": 355.7261047363281,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "9c274296.3d0d1",\r
+                "5de8bdae.d03adc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9c274296.3d0d1",\r
+        "type": "outcome",\r
+        "name": "Other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2061.2503662109375,\r
+        "y": 358.7261962890625,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "79e39401.d28ac4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5de8bdae.d03adc",\r
+        "type": "outcome",\r
+        "name": "ok",\r
+        "xml": "<outcome value='ok'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2073.2501220703125,\r
+        "y": 447.7260437011719,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "4dce1751.41215"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "79e39401.d28ac4",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n<parameter name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\" value=\"`'Error DeleteInternetProfileInstance return: '+$service-result.status`\" />\n\n",\r
+        "comments": "",\r
+        "x": 2209.75,\r
+        "y": 355.7260437011719,\r
+        "z": "82f9347f.003f68",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "4dce1751.41215",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2223.4166107177734,\r
+        "y": 447.72605323791504,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d358382c.fffa98",\r
+        "type": "switchNode",\r
+        "name": "switch svc-action",\r
+        "xml": "<switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1071.75,\r
+        "y": 273.7261047363281,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "2d932b23.299604"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2d932b23.299604",\r
+        "type": "outcome",\r
+        "name": "delete",\r
+        "xml": "<outcome value='delete'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1240.25,\r
+        "y": 277.7261047363281,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "bcac2398.eadaa"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "bcac2398.eadaa",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic='true'>",\r
+        "atomic": "true",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1400.25,\r
+        "y": 276.2261047363281,\r
+        "z": "82f9347f.003f68",\r
+        "wires": [\r
+            [\r
+                "52f37237.872894"\r
+            ]\r
+        ]\r
     }\r
 ]
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
index 3f30d50..2ba5835 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-create-huawei.xml
@@ -1,276 +1,288 @@
-<service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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}'>\r
-    <method rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>\r
-        <block atomic="true">\r
-            <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' ></call>\r
-            <set>\r
-                <parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />\r
-                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />\r
-                <parameter name='prop.bbs.HsiPackage' value='50M' />\r
-                <parameter name='prop.bbs.HsiType' value='IPoE' />\r
-            </set>\r
-            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
-                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
-                <parameter name='contextPrefix' value='prop' />\r
-            </execute>\r
-            <for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >\r
-                <block>\r
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'remote_id'`">\r
-                        <outcome value='true'>\r
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>\r
-                                <outcome value=''>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='Other'>\r
-                                    <set>\r
-                                        <parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />\r
-                                    </set>\r
-                                </outcome>\r
-                            </switch>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ONTSN'`">\r
-                        <outcome value='true'>\r
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>\r
-                                <outcome value=''>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='Other'>\r
-                                    <set>\r
-                                        <parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />\r
-                                    </set>\r
-                                </outcome>\r
-                            </switch>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'CVLAN'`">\r
-                        <outcome value='true'>\r
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>\r
-                                <outcome value=''>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='Other'>\r
-                                    <set>\r
-                                        <parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\r
-                                    </set>\r
-                                </outcome>\r
-                            </switch>\r
-                        </outcome>\r
-                    </switch>\r
-                    <switch test="`$vnf-input-parameters.param[$idx].name == 'SVLAN'`">\r
-                        <outcome value='true'>\r
-                            <switch test='`$vnf-input-parameters.param[$idx].value`'>\r
-                                <outcome value=''>\r
-                                    <return status='failure'>\r
-                                        <parameter name='ack-final' value='Y'/>\r
-                                        <parameter name="error-code" value="500" />\r
-                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />\r
-                                    </return>\r
-                                </outcome>\r
-                                <outcome value='Other'>\r
-                                    <set>\r
-                                        <parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />\r
-                                    </set>\r
-                                </outcome>\r
-                            </switch>\r
-                        </outcome>\r
-                    </switch>\r
-                </block>\r
-            </for>\r
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>\r
-                <parameter name="restapiUrl" value="`'http://159.138.58.209:30335/rest/plat/smapp/v1/oauth/token'`"/>\r
-                <parameter name="format" value="json"/>\r
-                <parameter name="httpMethod" value="put"/>\r
-                <parameter name="responsePrefix" value="token-result"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>-->\r
-                <outcome value='success'>\r
-                    <switch test='`$token-result.accessSession`'>\r
-                        <outcome value='Other'>\r
-                            <set>\r
-                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />\r
-                            </set>\r
-                        </outcome>\r
-                        <outcome value=''>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />\r
-                            </return>\r
-                        </outcome>\r
-                    </switch>\r
-                </outcome>\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error failed to call queryTokenID" />\r
-                    </return>\r
-                </outcome>\r
-            </execute>\r
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`" />\r
-                <parameter name="restapiUrl" value="`'http://159.138.58.209:30335/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />\r
-                <parameter name="contentType" value="application/json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="service-result"/>\r
-                <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>\r
-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                <parameter name="keyStorePassword" value="adminadmin"/>\r
-                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />-->\r
-                <outcome value='failure'>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error failed to call  createAccessConnectivityService" />\r
-                    </return>\r
-                </outcome>\r
-                <outcome value='success'>\r
-                    <switch test="`$service-result.errors.error[0].error-message`">\r
-                        <outcome value='Other'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value=''>\r
-                            <block>\r
-                                <set>\r
-                                    <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/>\r
-                                </set>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
-                </outcome>\r
-            </execute>\r
-            <block>\r
-                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">\r
-                    <parameter name="ctx-destination" value="prop.random-data"/>\r
-                    <outcome value='success'>\r
-                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
-                            <parameter name="ctx_memory_result_key" value="prop.random-data-list"/>\r
-                            <parameter name="original_string" value="`$prop.random-data`"/>\r
-                            <parameter name="regex" value="-"/>\r
-                            <outcome value='success'></outcome>\r
-                        </execute>\r
-                    </outcome>\r
-                </execute>\r
-                <set>\r
-                    <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>\r
-                    <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>\r
-                </set>\r
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >\r
-                    <parameter name= "vnf-id" value = "`$vnf-id`"/>\r
-                    <parameter name=  "vnf-name" value = "`$vnf-name`"/>\r
-                    <parameter name=  "vnf-type" value = "AccessConnectivity"/>\r
-                    <parameter name=  "service-id" value = "`$vnf-topology-operation-input.service-information.service-id`"/>\r
-                    <parameter name=  "prov-status" value = "ACTIVE"/>\r
-                    <parameter name=  "orchestration-status" value = "Active"/>\r
-                    <parameter name=  "is-closed-loop-disabled" value = "false" />\r
-                    <parameter name=  "model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>\r
-                    <parameter name=  "model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>\r
-                    <parameter name=  "model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>\r
-                    <outcome value='failure'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="Failure calling AAI to save generic-vnf" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='not-found'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="generic-vnf instance does not exist in AAI" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='success'></outcome>\r
-                </save>\r
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"\r
- key="service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  \r
-       AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
-         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\r
-         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id"  force="true" pfx="tmp.AnAI-data"\r
-    >\r
-                    <parameter name="metadata.metadatum[0].metaname" value="remote-id" />\r
-                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" />\r
-                    <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />\r
-                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />\r
-                    <parameter name="metadata.metadatum[2].metaname" value="cvlan" />\r
-                    <parameter name="metadata.metadatum[2].metaval" value="`$prop.bbs.CVLAN`" />\r
-                    <parameter name="metadata.metadatum[3].metaname" value="svlan" />\r
-                    <parameter name="metadata.metadatum[3].metaval" value="`$prop.bbs.SVLAN`" />\r
-                    <parameter name="metadata.metadatum[4].metaname" value="expected-ont-id" />\r
-                    <parameter name="metadata.metadatum[4].metaval" value="`$prop.bbs.ONTSN`" />\r
-                    <!--<parameter name="metadata.metadatum[5].metaname" value="rgw-mac-address" />-->\r
-                    <!--<parameter name="metadata.metadatum[5].metaval" value="`$prop.bbs.mac`" />-->\r
-                    <outcome value='failure'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='not-found'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='success'></outcome>\r
-                </save>\r
-                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" \r
-      key="service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id\r
-         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
-         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type \r
-         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" />\r
-                    <outcome value='failure'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='not-found'>\r
-                        <return status='failure'>\r
-                            <parameter name='ack-final' value='Y'/>\r
-                            <parameter name="error-code" value="500" />\r
-                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />\r
-                        </return>\r
-                    </outcome>\r
-                    <outcome value='success'></outcome>\r
-                </save>\r
-            </block>\r
-            <return status='success'>\r
-                <parameter name="ack-final-indicator" value="Y" />\r
-                <parameter name="error-code" value="200" />\r
-                <parameter name="error-message" value="`$error-message`" />\r
-            </return>\r
-        </block>\r
-    </method>\r
+<service-logic
+    xmlns='http://www.onap.org/sdnc/svclogic'
+    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync'>
+        <block atomic="true">
+            <call module='GENERIC-RESOURCE-API' rpc='validate-bbs-vnf-input-parameters' mode='sync' ></call>
+            <set>
+                <parameter name='vnf-input-parameters.' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.`' />
+                <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value='https://172.30.0.55:26335' />
+                <parameter name='prop.bbs.HsiPackage' value='50M' />
+                <parameter name='prop.bbs.HsiType' value='IPoE' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <for index='idx' start='0' end='`$vnf-input-parameters.param_length`' >
+                <block>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'remote_id'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.remote_id' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'ONTSN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.ONTSN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'CVLAN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.CVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                    <switch test="`$vnf-input-parameters.param[$idx].name == 'SVLAN'`">
+                        <outcome value='true'>
+                            <switch test='`$vnf-input-parameters.param[$idx].value`'>
+                                <outcome value=''>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`$vnf-input-parameters.param[$idx].name  +' value is null, please check it.'`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <set>
+                                        <parameter name='prop.bbs.SVLAN' value='`$vnf-input-parameters.param[$idx].value`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </outcome>
+                    </switch>
+                </block>
+            </for>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-token-template.json'`"/>
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>
+                <parameter name="format" value="json"/>
+                <parameter name="httpMethod" value="put"/>
+                <parameter name="responsePrefix" value="token-result"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url+'/rest/plat/smapp/v1/oauth/token'`"/>-->
+                <outcome value='success'>
+                    <switch test='`$token-result.accessSession`'>
+                        <outcome value='Other'>
+                            <set>
+                                <parameter name='prop.sdncRestApi.token_id' value='`$token-result.accessSession`' />
+                            </set>
+                        </outcome>
+                        <outcome value=''>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="Error executing queryTokenID,vaule is null" />
+                            </return>
+                        </outcome>
+                    </switch>
+                </outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error failed to call queryTokenID" />
+                    </return>
+                </outcome>
+            </execute>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-access-connectivity-create.json'`" />
+                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />
+                <parameter name="contentType" value="application/json"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name="responsePrefix" value="service-result"/>
+                <parameter name="customHttpHeaders" value="`'X-Auth-Token=' + $prop.sdncRestApi.token_id`"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/ws/rest/1002/FanOpenAPI/ActiveOnt'`" />-->
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error failed to call  createAccessConnectivityService" />
+                    </return>
+                </outcome>
+                <outcome value='success'>
+                    <switch test="`$service-result.errors.error[0].error-message`">
+                        <outcome value='Other'>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name="error-code" value="500" />
+                                <parameter name="error-message" value="`'Error createAccessConnectivityService return: '+$service-result.errors.error[0].error-message`" />
+                            </return>
+                        </outcome>
+                        <outcome value=''>
+                            <block>
+                                <set>
+                                    <parameter name='prop.bbs.serviceID' value="`$service-result.accessE2Eservice.serviceID`"/>
+                                </set>
+                            </block>
+                        </outcome>
+                    </switch>
+                </outcome>
+            </execute>
+            <block>
+                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
+                    <parameter name="ctx-destination" value="prop.random-data"/>
+                    <outcome value='success'>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                            <parameter name="ctx_memory_result_key" value="prop.random-data-list"/>
+                            <parameter name="original_string" value="`$prop.random-data`"/>
+                            <parameter name="regex" value="-"/>
+                            <outcome value='success'></outcome>
+                        </execute>
+                    </outcome>
+                </execute>
+                <set>
+                    <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>
+                    <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>
+                    <!--<set>-->
+                    <!--<parameter name='vnf-id' value="123456789"/>-->
+                    <!--<parameter name='vnf-name' value="vnf_name"/>-->
+                </set>
+                <record plugin='org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder'>
+                    <parameter name='logger' value='message-log'/>
+                    <parameter name='field1' value='`$vnf-id`'/>
+                    <parameter name='field2' value='`$vnf-name`'/>
+                    <!--<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">-->
+                    <!--   <parameter name="file" value="/root/logx.txt" />-->
+                    <!--   <parameter name="field1" value="deleteAccessConnectivityService success!" />-->
+                    <!--       <parameter name="field2" value='`$topology.networks.network[0].network-types`' />-->
+                </record>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >
+                    <parameter name= "vnf-id" value = "`$vnf-id`"/>
+                    <parameter name=  "vnf-name" value = "`$vnf-name`"/>
+                    <parameter name=  "vnf-type" value = "AccessConnectivity"/>
+                    <parameter name=  "service-id" value = "`$vnf-topology-operation-input.service-information.service-id`"/>
+                    <parameter name=  "prov-status" value = "ACTIVE"/>
+                    <parameter name=  "orchestration-status" value = "Active"/>
+                    <parameter name=  "is-closed-loop-disabled" value = "false" />
+                    <parameter name=  "model-invariant-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`"/>
+                    <parameter name=  "model-version-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`"/>
+                    <parameter name=  "model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save generic-vnf" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="generic-vnf instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
+ key="service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-id  
+       AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type
+         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id"  force="true" pfx="tmp.AnAI-data"
+    >
+                    <parameter name="metadata.metadatum[0].metaname" value="remote-id" />
+                    <parameter name="metadata.metadatum[0].metaval" value="`$prop.bbs.remote_id`" />
+                    <parameter name="metadata.metadatum[1].metaname" value="controller-service-id" />
+                    <parameter name="metadata.metadatum[1].metaval" value="`$prop.bbs.serviceID`" />
+                    <parameter name="metadata.metadatum[2].metaname" value="cvlan" />
+                    <parameter name="metadata.metadatum[2].metaval" value="`$prop.bbs.CVLAN`" />
+                    <parameter name="metadata.metadatum[3].metaname" value="svlan" />
+                    <parameter name="metadata.metadatum[3].metaval" value="`$prop.bbs.SVLAN`" />
+                    <parameter name="metadata.metadatum[4].metaname" value="expected-ont-id" />
+                    <parameter name="metadata.metadatum[4].metaval" value="`$prop.bbs.ONTSN`" />
+                    <!--<parameter name="metadata.metadatum[5].metaname" value="rgw-mac-address" />-->
+                    <!--<parameter name="metadata.metadatum[5].metaval" value="`$prop.bbs.mac`" />-->
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" 
+      key="service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type =  $vnf-topology-operation-input.service-information.subscription-service-type 
+         AND service-instance.service-instance-id =  $vnf-topology-operation-input.service-information.service-instance-id" force="true" pfx="tmp.AnAI-data">
+                    <parameter name="relationship-list.relationship[0].related-to" value="generic-vnf" />
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/generic-vnfs/generic-vnf/' + $vnf-id`" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="generic-vnf.vnf-id" />
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$vnf-id`" />
+                    <outcome value='failure'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="Failure calling AAI to save metadatum" />
+                        </return>
+                    </outcome>
+                    <outcome value='not-found'>
+                        <return status='failure'>
+                            <parameter name='ack-final' value='Y'/>
+                            <parameter name="error-code" value="500" />
+                            <parameter name="error-message" value="metadatum instance does not exist in AAI" />
+                        </return>
+                    </outcome>
+                    <outcome value='success'></outcome>
+                </save>
+            </block>
+            <return status='success'>
+                <parameter name="ack-final-indicator" value="Y" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
index 9d50fee..3b98365 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-access-connectivity-vnf-topology-operation-delete-huawei.xml
@@ -142,6 +142,60 @@
                                 </block>\r
                             </for>\r
                         </for>\r
+                        <for silentFailure='true' index='rix' start='0' end="`$aai.service-instance.metadata.metadatum_length`" >\r
+                            <switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\r
+                                <outcome value='remote-id'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='controller-service-id'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='cvlan'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='svlan'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='expected-ont-id'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </for>\r
                     </block>\r
                 </outcome>\r
             </get-resource>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
index 9df1b38..4aa36b9 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-change-huawei.xml
@@ -18,20 +18,22 @@
                     </return>\r
                 </outcome>\r
                 <outcome value='success'>\r
-                    <switch test="`$service-result.errors.error[0].error-message`">\r
+                    <switch test="`$service-result.status`">\r
                         <outcome value='Other'>\r
                             <return status='failure'>\r
                                 <parameter name='ack-final' value='Y'/>\r
                                 <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />\r
+                                <parameter name="error-message" value="`'Error ChangeInternetProfileInstance return: '+$service-result.status`" />\r
                             </return>\r
                         </outcome>\r
-                        <outcome value=''>\r
+                        <outcome value='ok'>\r
                             <block></block>\r
                         </outcome>\r
                     </switch>\r
                 </outcome>\r
             </execute>\r
+            <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'></call>\r
+            <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync'></call>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
index 27048ab..fb07393 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.xml
@@ -10,6 +10,7 @@
                 <parameter name="contentType" value="application/json"/>\r
                 <parameter name="httpMethod" value="post"/>\r
                 <parameter name="responsePrefix" value="service-result"/>\r
+                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/CreateInternetProfileInstance'`" />-->\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -18,15 +19,15 @@
                     </return>\r
                 </outcome>\r
                 <outcome value='success'>\r
-                    <switch test="`$service-result.errors.error[0].error-message`">\r
+                    <switch test="`$service-result.status`">\r
                         <outcome value='Other'>\r
                             <return status='failure'>\r
                                 <parameter name='ack-final' value='Y'/>\r
                                 <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />\r
+                                <parameter name="error-message" value="`'Error CreateInternetProfileInstance return: '+$service-result.status`" />\r
                             </return>\r
                         </outcome>\r
-                        <outcome value=''>\r
+                        <outcome value='ok'>\r
                             <block></block>\r
                         </outcome>\r
                     </switch>\r
@@ -47,6 +48,9 @@
                 <set>\r
                     <parameter name='vnf-id' value="`$prop.random-data-list[3]`"/>\r
                     <parameter name='vnf-name' value="`'vnf-'+$prop.random-data-list[4]`"/>\r
+                    <!--<set>-->\r
+                    <!--<parameter name='vnf-id' value="123456789"/>-->\r
+                    <!--<parameter name='vnf-name' value="vnf_name"/>-->\r
                 </set>\r
                 <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="generic-vnf" key="generic-vnf.vnf-id = $vnf-id" >\r
                     <parameter name= "vnf-id" value = "`$vnf-id`"/>\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
index 4b2e5fb..cebb55f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-delete-huawei.xml
@@ -4,60 +4,119 @@
     <method rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync'>\r
         <block atomic="true">\r
             <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-common-huawei' mode='sync' ></call>\r
-            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />\r
-                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />\r
-                <parameter name="contentType" value="application/json"/>\r
-                <parameter name="httpMethod" value="post"/>\r
-                <parameter name="responsePrefix" value="service-result"/>\r
+            <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\r
+                <outcome value='delete'>\r
+                    <block atomic='true'>\r
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/bbs-internet-profile-operation.json'`" />\r
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/DeleteInternetProfileInstance'`" />\r
+                            <parameter name="contentType" value="application/json"/>\r
+                            <parameter name="httpMethod" value="post"/>\r
+                            <parameter name="responsePrefix" value="service-result"/>\r
+                            <outcome value='failure'>\r
+                                <return status='failure'>\r
+                                    <parameter name='ack-final' value='Y'/>\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />\r
+                                </return>\r
+                            </outcome>\r
+                            <outcome value='success'>\r
+                                <switch test="`$service-result.status`">\r
+                                    <outcome value='Other'>\r
+                                        <return status='failure'>\r
+                                            <parameter name='ack-final' value='Y'/>\r
+                                            <parameter name="error-code" value="500" />\r
+                                            <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.status`" />\r
+                                        </return>\r
+                                    </outcome>\r
+                                    <outcome value='ok'>\r
+                                        <block></block>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </outcome>\r
+                        </execute>\r
+                    </block>\r
+                </outcome>\r
+            </switch>\r
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+               resource="service-instance" \r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id"\r
+        pfx='aai.service-instance' local-only='false' >\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="Error failed to call DeleteInternetProfileInstance" />\r
+                        <parameter name='error-code' value='' />\r
+                        <parameter name='error-message' value='' />\r
                     </return>\r
                 </outcome>\r
                 <outcome value='success'>\r
-                    <switch test="`$service-result.errors.error[0].error-message`">\r
-                        <outcome value='Other'>\r
-                            <return status='failure'>\r
-                                <parameter name='ack-final' value='Y'/>\r
-                                <parameter name="error-code" value="500" />\r
-                                <parameter name="error-message" value="`'Error DeleteInternetProfileInstance return: '+$service-result.errors.error[0].error-message`" />\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value=''>\r
-                            <block></block>\r
-                        </outcome>\r
-                    </switch>\r
-                </outcome>\r
-            </execute>\r
-            <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >\r
-                <block atomic='true'>\r
-                    <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\r
-                        <outcome value='generic-vnf.vnf-id'>\r
-                            <block atomic='true'>\r
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+                    <block atomic='true'>\r
+                        <for silentFailure='true' index='ridx' start='0' end="`$aai.service-instance.relationship-list.relationship_length`" >\r
+                            <for silentFailure='false' index='rdidx' start='0' end="`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data_length`" >\r
+                                <block atomic='true'>\r
+                                    <switch test='`$aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-key`'>\r
+                                        <outcome value='generic-vnf.vnf-id'>\r
+                                            <block atomic='true'>\r
+                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $aai.service-instance.relationship-list.relationship[$ridx].relationship-data[$rdidx].relationship-value"\r
         pfx='aai.generic-vnf' local-only='false' >\r
-                                    <outcome value='success'>\r
-                                        <block atomic='true'>\r
-                                            <switch test='`$aai.generic-vnf.vnf-type`'>\r
-                                                <outcome value='InternetProfile'>\r
-                                                    <set>\r
-                                                        <parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\r
-                                                    </set>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                        </block>\r
-                                    </outcome>\r
-                                </get-resource>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
-                </block>\r
-            </for>\r
+                                                    <outcome value='success'>\r
+                                                        <block atomic='true'>\r
+                                                            <switch test='`$aai.generic-vnf.vnf-type`'>\r
+                                                                <outcome value='InternetProfile'>\r
+                                                                    <set>\r
+                                                                        <parameter name='prop.bbs.internetProfileVNFId' value='`$aai.generic-vnf.vnf-id`' />\r
+                                                                    </set>\r
+                                                                </outcome>\r
+                                                            </switch>\r
+                                                        </block>\r
+                                                    </outcome>\r
+                                                </get-resource>\r
+                                            </block>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </for>\r
+                        </for>\r
+                        <for silentFailure='true' index='rix' start='0' end="`$aai.service-instance.metadata.metadatum_length`" >\r
+                            <switch test='`$aai.service-instance.metadata.metadatum[$rix].metaname`'>\r
+                                <outcome value='service-type'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='up-speed'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                                <outcome value='down-speed'>\r
+                                    <block atomic='true'>\r
+                                        <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
+        resource="service-instance"\r
+               key="customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id AND\r
+                       service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type AND\r
+                       service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id AND\r
+                       metadatum.metaname = $aai.service-instance.metadata.metadatum[$rix].metaname" ></delete>\r
+                                    </block>\r
+                                </outcome>\r
+                            </switch>\r
+                        </for>\r
+                    </block>\r
+                </outcome>\r
+            </get-resource>\r
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" \r
                resource="generic-vnf" \r
                key="generic-vnf.vnf-id = $prop.bbs.internetProfileVNFId">\r