From: prakash.e <prakash.e@huawei.com>
Date: Fri, 31 May 2019 11:25:54 +0000 (+0530)
Subject: Fix for sdnc aai relationship
X-Git-Tag: 1.6.1~26
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=ce632e9e17e0581b2c32beb1aa04a3effd436408

Fix for sdnc aai relationship

Fix for sdnc aai relationship for generic vnf resource and service instance.

Issue-ID: SDNC-780
Signed-off-by: prakash.e <prakash.e@huawei.com>
Change-Id: I5db4e0a7f243a1be15e95221250e6e84e91e5509

Former-commit-id: 4a1c826efda07f3bb20f1531ca97c7a4726f4d96
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
index 85cd16ff..cd538413 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.json
@@ -1,36 +1,36 @@
 [
     {
-        "id": "91da6f32.2ced7",
+        "id": "e09dc00b.609ab",
         "type": "method",
         "name": "method vnf-topology-operation-vpn-site-resource-create",
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 271.0104064941406,
-        "y": 185.9999923435971,
-        "z": "dbd46c1f.195f5",
+        "x": 291.00390625,
+        "y": 217.99999130051583,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "3735ac23.817b64"
+                "a001279f.7137b8"
             ]
         ]
     },
     {
-        "id": "312112f7.2d48de",
+        "id": "78874136.c3f8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 147.581787109375,
-        "y": 37.99999976158142,
-        "z": "dbd46c1f.195f5",
+        "x": 167.57528686523438,
+        "y": 69.99999871850014,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "1748f570.5068bb"
+                "170ecd1f.10f193"
             ]
         ]
     },
     {
-        "id": "1748f570.5068bb",
+        "id": "170ecd1f.10f193",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -38,465 +38,465 @@
         "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": 249.86749267578125,
-        "y": 96.2381038395688,
-        "z": "dbd46c1f.195f5",
+        "x": 269.8609924316406,
+        "y": 128.2381027964875,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "91da6f32.2ced7"
+                "e09dc00b.609ab"
             ]
         ]
     },
     {
-        "id": "3735ac23.817b64",
+        "id": "a001279f.7137b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 251.24845123291016,
-        "y": 357.6666640965268,
-        "z": "dbd46c1f.195f5",
+        "x": 271.24195098876953,
+        "y": 389.6666630534455,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "66587be7.1fa444",
-                "a22f6305.02259",
-                "476531fa.dda8b",
-                "39075706.c01f38",
-                "14e1d1a2.1874ee",
-                "25011a4c.02d6d6",
-                "4c11cb80.4d3124",
-                "1d89ddb9.e37322",
-                "d6dc0995.ddb998",
-                "ae963bb8.b0bb08",
-                "8d6ea2db.f2c5d8",
-                "a6ce5913.ef9af",
-                "fb6b70fa.8a9a6"
+                "35fdba67.5f3b96",
+                "a6b60223.ccb01",
+                "ac671607.c309e8",
+                "a4915ef5.39d4c",
+                "bd07125c.dcc05",
+                "316ae104.544bae",
+                "82137890.04e3b8",
+                "ce749c5a.befe5",
+                "f4ba80c2.8e31",
+                "12d7eb35.4736c5",
+                "59546928.265f38",
+                "e172576e.f62ef8",
+                "69faa522.fdf42c"
             ]
         ]
     },
     {
-        "id": "a22f6305.02259",
+        "id": "a6b60223.ccb01",
         "type": "set",
         "name": "set vnf-level-oper-status to Created",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
         "comments": "",
-        "x": 673.395263671875,
-        "y": 721.6705968379974,
-        "z": "dbd46c1f.195f5",
+        "x": 693.3887634277344,
+        "y": 753.6705957949162,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "66587be7.1fa444",
+        "id": "35fdba67.5f3b96",
         "type": "set",
         "name": "copy input data to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",
         "comments": "",
-        "x": 665.2484512329102,
-        "y": 616.666848897934,
-        "z": "dbd46c1f.195f5",
+        "x": 685.2419509887695,
+        "y": 648.6668478548527,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "14e1d1a2.1874ee",
+        "id": "bd07125c.dcc05",
         "type": "execute",
         "name": "execute generate-vnf-index",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 653.5819549560547,
-        "y": 566.3334329128265,
-        "z": "dbd46c1f.195f5",
+        "x": 673.5754547119141,
+        "y": 598.3334318697453,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ae963bb8.b0bb08",
+        "id": "12d7eb35.4736c5",
         "type": "set",
         "name": "set vnf-index to service data",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-id`' />\n",
         "comments": "",
-        "x": 664.58203125,
-        "y": 673.3334367275238,
-        "z": "dbd46c1f.195f5",
+        "x": 684.5755310058594,
+        "y": 705.3334356844425,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "476531fa.dda8b",
+        "id": "ac671607.c309e8",
         "type": "switchNode",
         "name": "switch service-data.vnfs.vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 680.5817718505859,
-        "y": 236.3333556652069,
-        "z": "dbd46c1f.195f5",
+        "x": 700.5752716064453,
+        "y": 268.3333546221256,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "ca401c47.9c85b",
-                "c9cc10cf.5154b"
+                "1edc6f41.babd91",
+                "aca7f913.f18ff8"
             ]
         ]
     },
     {
-        "id": "ca401c47.9c85b",
+        "id": "1edc6f41.babd91",
         "type": "other",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 915.2961578369141,
-        "y": 231.47617602348328,
-        "z": "dbd46c1f.195f5",
+        "x": 935.2896575927734,
+        "y": 263.476174980402,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "6401cbd2.e53fc4"
+                "3bb49f12.e3c97"
             ]
         ]
     },
     {
-        "id": "6401cbd2.e53fc4",
+        "id": "3bb49f12.e3c97",
         "type": "set",
         "name": "set vnf-index=0",
         "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
         "comments": "",
-        "x": 1075.5818634033203,
-        "y": 231.47626757621765,
-        "z": "dbd46c1f.195f5",
+        "x": 1095.5753631591797,
+        "y": 263.47626653313637,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "c9cc10cf.5154b",
+        "id": "aca7f913.f18ff8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 911.7246971130371,
-        "y": 264.7620074748993,
-        "z": "dbd46c1f.195f5",
+        "x": 931.7181968688965,
+        "y": 296.762006431818,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "e78d606c.5025f"
+                "58fe99a5.580988"
             ]
         ]
     },
     {
-        "id": "2f520d06.0faf82",
+        "id": "ca5c1eba.d40a1",
         "type": "set",
         "name": "set vnf-index = vnf_length",
         "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
         "comments": "",
-        "x": 1304.5819396972656,
-        "y": 243.0477330684662,
-        "z": "dbd46c1f.195f5",
+        "x": 1324.575439453125,
+        "y": 275.0477320253849,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "fec4dc30.b6a09",
+        "id": "40fa464c.c22b08",
         "type": "for",
         "name": "for each existing VNF",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293.0105590820312,
-        "y": 278.04770493507385,
-        "z": "dbd46c1f.195f5",
+        "x": 1313.0040588378906,
+        "y": 310.04770389199257,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "c1fa87b1.a47458"
+                "bd02694a.5072f8"
             ]
         ]
     },
     {
-        "id": "e78d606c.5025f",
+        "id": "58fe99a5.580988",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1046.438980102539,
-        "y": 266.76197695732117,
-        "z": "dbd46c1f.195f5",
+        "x": 1066.4324798583984,
+        "y": 298.7619759142399,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "2f520d06.0faf82",
-                "fec4dc30.b6a09"
+                "ca5c1eba.d40a1",
+                "40fa464c.c22b08"
             ]
         ]
     },
     {
-        "id": "c1fa87b1.a47458",
+        "id": "bd02694a.5072f8",
         "type": "switchNode",
         "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
         "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1686.2962951660156,
-        "y": 278.61918902397156,
-        "z": "dbd46c1f.195f5",
+        "x": 1706.289794921875,
+        "y": 310.6191879808903,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "826e3f48.b128f"
+                "cac73e5e.acb18"
             ]
         ]
     },
     {
-        "id": "826e3f48.b128f",
+        "id": "cac73e5e.acb18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1967.5819969177246,
-        "y": 277.19059443473816,
-        "z": "dbd46c1f.195f5",
+        "x": 1987.575496673584,
+        "y": 309.1905933916569,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "b86791b.2510f7"
+                "61212c2f.b0bcf4"
             ]
         ]
     },
     {
-        "id": "3995a6f4.c8ea1a",
+        "id": "14393cc8.e466c3",
         "type": "comment",
         "name": "make sure this vnf-id doesn't exist already",
         "info": "",
         "comments": "",
-        "x": 1655.4389114379883,
-        "y": 242.19058108329773,
-        "z": "dbd46c1f.195f5",
+        "x": 1675.4324111938477,
+        "y": 274.19058004021645,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "39075706.c01f38",
+        "id": "a4915ef5.39d4c",
         "type": "set",
         "name": "set new vnf_length",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
         "comments": "",
-        "x": 625.5819549560547,
-        "y": 514.3334295749664,
-        "z": "dbd46c1f.195f5",
+        "x": 645.5754547119141,
+        "y": 546.3334285318851,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "25011a4c.02d6d6",
+        "id": "316ae104.544bae",
         "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": 612.581916809082,
-        "y": 984.5969483852386,
-        "z": "dbd46c1f.195f5",
+        "x": 632.5754165649414,
+        "y": 1016.5969473421574,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "d6dc0995.ddb998",
+        "id": "f4ba80c2.8e31",
         "type": "save",
         "name": "save service relationship in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      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/' + $prop.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=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      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/' + $prop.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=\"`$prop.vnf-id`\" />\n\n\n<!--key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--key='service-instance.service-instance-id = $service-data.service-instance-id -->\n",
         "comments": "",
         "outputs": 1,
-        "x": 675.2486877441406,
-        "y": 931.5968415737152,
-        "z": "dbd46c1f.195f5",
+        "x": 695.2421875,
+        "y": 963.5968405306339,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c11cb80.4d3124",
+        "id": "82137890.04e3b8",
         "type": "set",
         "name": "set vnf-index and vnf-object-path",
         "xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />",
         "comments": "",
-        "x": 666.5819473266602,
-        "y": 762.5968673229218,
-        "z": "dbd46c1f.195f5",
+        "x": 686.5754470825195,
+        "y": 794.5968662798405,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "b86791b.2510f7",
+        "id": "61212c2f.b0bcf4",
         "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=\"`'VNF id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
         "comments": "",
-        "x": 2096.153366088867,
-        "y": 328.1906087398529,
-        "z": "dbd46c1f.195f5",
+        "x": 2116.1468658447266,
+        "y": 360.1906076967716,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "1d89ddb9.e37322",
+        "id": "ce749c5a.befe5",
         "type": "save",
         "name": "save AnAI - vnf-instance.orchestration-status",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-id\" >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\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`\"/>",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey='generic-vnf.vnf-id = $prop.vnf-id' >\n<parameter name=\"orchestration-status\" value=\"Created\" />\n<parameter name=\"in-maint\" value = \"true\" />\n<parameter name=\"vnf-type\" value='`$prop.vnfName`' />\n<parameter name=\"vnf-name\" value = \"`$prop.vnfName`\"/>\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": 721.5562515258789,
-        "y": 872.2470843791962,
-        "z": "dbd46c1f.195f5",
+        "x": 741.5497512817383,
+        "y": 904.2470833361149,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f26d49c8.d35f88",
+        "id": "34539936.d8aa16",
         "type": "comment",
         "name": "TODO: change AAI models",
         "info": "",
         "comments": "",
-        "x": 655.192512512207,
-        "y": 831.9743001461029,
-        "z": "dbd46c1f.195f5",
+        "x": 675.1860122680664,
+        "y": 863.9742991030216,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "d87f26c1.85e508",
+        "id": "c5a6107f.3d2a",
         "type": "execute",
         "name": "execute split parameterName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.75,
-        "y": 325.75,
-        "z": "dbd46c1f.195f5",
+        "x": 1101.7434997558594,
+        "y": 357.7499989569187,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c94a6245.0a51b",
+        "id": "f4dc5fe.611b2a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 885.4937973022461,
-        "y": 330.0018730163574,
-        "z": "dbd46c1f.195f5",
+        "x": 905.4872970581055,
+        "y": 362.00187197327614,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "d87f26c1.85e508",
-                "1354d63c.ef6932"
+                "c5a6107f.3d2a",
+                "19bb7944.207ac7"
             ]
         ]
     },
     {
-        "id": "8d6ea2db.f2c5d8",
+        "id": "59546928.265f38",
         "type": "for",
         "name": "for loop idx - VNF input parameters",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.7154541015625,
-        "y": 332.4462890625,
-        "z": "dbd46c1f.195f5",
+        "x": 690.7089538574219,
+        "y": 364.4462880194187,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "c94a6245.0a51b"
+                "f4dc5fe.611b2a"
             ]
         ]
     },
     {
-        "id": "a6ce5913.ef9af",
+        "id": "e172576e.f62ef8",
         "type": "set",
         "name": "set vnf-request-input.",
         "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
         "comments": "",
-        "x": 627.715087890625,
-        "y": 402.77099609375,
-        "z": "dbd46c1f.195f5",
+        "x": 647.7085876464844,
+        "y": 434.7709950506687,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "1354d63c.ef6932",
+        "id": "19bb7944.207ac7",
         "type": "set",
         "name": "set parameterName",
         "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
         "comments": "",
-        "x": 1058.75,
-        "y": 371.75,
-        "z": "dbd46c1f.195f5",
+        "x": 1078.7434997558594,
+        "y": 403.7499989569187,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     },
     {
-        "id": "fb6b70fa.8a9a6",
+        "id": "69faa522.fdf42c",
         "type": "for",
         "name": "for each sdwan-get-request-input-param",
         "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 683.75,
-        "y": 454.75,
-        "z": "dbd46c1f.195f5",
+        "x": 703.7434997558594,
+        "y": 486.7499989569187,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "1b7219c7.3675ce"
+                "53fd8a48.24dea4"
             ]
         ]
     },
     {
-        "id": "1b7219c7.3675ce",
+        "id": "53fd8a48.24dea4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 909.982666015625,
-        "y": 453.09375,
-        "z": "dbd46c1f.195f5",
+        "x": 929.9761657714844,
+        "y": 485.0937489569187,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "9ce04d06.518268"
+                "509306d5.d7d638"
             ]
         ]
     },
     {
-        "id": "9ce04d06.518268",
+        "id": "509306d5.d7d638",
         "type": "switchNode",
         "name": "switch vnf name",
         "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1066.482666015625,
-        "y": 451.09381103515625,
-        "z": "dbd46c1f.195f5",
+        "x": 1086.4761657714844,
+        "y": 483.09380999207497,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "61770f57.83d8c8"
+                "8d04bb1d.476798"
             ]
         ]
     },
     {
-        "id": "61770f57.83d8c8",
+        "id": "8d04bb1d.476798",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1227.4830322265625,
-        "y": 451.0938720703125,
-        "z": "dbd46c1f.195f5",
+        "x": 1247.4765319824219,
+        "y": 483.0938710272312,
+        "z": "304cf6f.a47ab0a",
         "wires": [
             [
-                "4601daba.0ca18c"
+                "933c4e9d.c3ff2"
             ]
         ]
     },
     {
-        "id": "4601daba.0ca18c",
+        "id": "933c4e9d.c3ff2",
         "type": "set",
         "name": "set vnf name",
         "xml": "<set>\n<parameter name='prop.vnfName' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1385.483154296875,
-        "y": 449.69390869140625,
-        "z": "dbd46c1f.195f5",
+        "x": 1405.4766540527344,
+        "y": 481.69390764832497,
+        "z": "304cf6f.a47ab0a",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
index 4b288933..ceff5bad 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml
@@ -83,7 +83,7 @@
             </set>
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf"   
-		key="generic-vnf.vnf-id = $prop.vnf-id" >
+		key='generic-vnf.vnf-id = $prop.vnf-id' >
                 <parameter name="orchestration-status" value="Created" />
                 <parameter name="in-maint" value = "true" />
                 <parameter name="vnf-type" value='`$prop.vnfName`' />
@@ -93,7 +93,7 @@
                 <parameter name="model-customization-id" value = "`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`"/>
             </save>
             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' 
-      key='service-instance.service-instance-id = $service-data.service-instance-id
+      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id
          AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id 
          AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' 
       force="true" pfx="tmp.AnAI-data">