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
---
 .../main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml  | 1 +
 1 file changed, 1 insertion(+)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
index dda220aa..c9300bd1 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml
@@ -121,6 +121,7 @@
                         <set>
                             <parameter name='generate-unique-name-input.name-table-type' value='SERVICE_INSTANCE' />
                             <parameter name='generate-unique-name-input.supplied-name' value='`$service-topology-operation-input.service-request-input.service-instance-name`' />
+                            <parameter name='generate-unique-name-input.service-instance-id' value='`$service-topology-operation-input.service-information.service-instance-id`' />
                         </set>
                         <call module='GENERIC-RESOURCE-API' rpc='generate-unique-name' mode='sync' >
                             <outcome value='failure'>
-- 
cgit 1.2.3-korg