From dbc8f5ec2d52866acdefb6d6a9801f9c1d771bb6 Mon Sep 17 00:00:00 2001
From: liboz <libo.zheng@arris.com>
Date: Tue, 30 Jul 2019 13:49:44 -0400
Subject: Fix reuse InstanceName when re-creating a service

Add instance id instead of NULL to context_id when creating entry in
GENERIC_RESOURCE_NAME table, Delete entry directly if no prefix and
name_index involved when rolling back instance name

Issue-ID: SDNC-798
Change-Id: I4c6391bf85e289894fd3019eafe76357b9b1c86c
Signed-off-by: liboz <libo.zheng@arris.com>

Former-commit-id: ae2694d30df3a7f62324ec7e617d23f187debcbb
---
 .../src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml
index 267a2cc0..73938422 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml
@@ -32,7 +32,7 @@
                                 <block atomic="true">
                                     <set>
                                         <parameter name='tmp.gun.sql' value="`'insert into GENERIC_RESOURCE_NAME values ( '
-+ ' $generate-unique-name-input.name-table-type , $generate-unique-name-input.supplied-name , null , null, null )'`" />
++ ' $generate-unique-name-input.name-table-type , $generate-unique-name-input.supplied-name , null , null, $generate-unique-name-input.service-instance-id )'`" />
                                     </set>
                                     <save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key="`$tmp.gun.sql`" pfx='pfx'>
-- 
cgit 1.2.3-korg