From 029d12b0e7a0a8e631f166e3ff6ff53d0c2a35af Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Fri, 31 May 2019 16:55:54 +0530
Subject: 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
(cherry picked from commit ce632e9e17e0581b2c32beb1aa04a3effd436408 [formerly 4a1c826efda07f3bb20f1531ca97c7a4726f4d96])

Former-commit-id: fd1d598146d80a958349144015292d969ed086a1
---
 ...C-RESOURCE-API_vnf-topology-operation-vpn-site-resource-create.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

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">
-- 
cgit 1.2.3-korg