From 36b54b31d97fd230a18aefe0af76cbdefd95a89d Mon Sep 17 00:00:00 2001
From: Rahul_cool <rahul.tamrkar@huawei.com>
Date: Fri, 3 Apr 2020 17:44:54 +0530
Subject: 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
---
 ...ofile-vnf-topology-operation-create-huawei.json | 532 +++++++++++----------
 1 file changed, 273 insertions(+), 259 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_bbs-internet-profile-vnf-topology-operation-create-huawei.json')

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