Fix reuse InstanceName when re-creating a service

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_rollback-generated-names.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_rollback-generated-names.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_rollback-generated-names.xml
index d36c406..41a6468 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_rollback-generated-names.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_rollback-generated-names.xml
@@ -47,12 +47,17 @@
                     </set>\r
                 </outcome>\r
                 <outcome value='SERVICE_INSTANCE'>\r
-                    <set>\r
-                        <parameter name='rollback-generated-names.index-table-name' \r
+                    <block>\r
+                        <set>\r
+                            <parameter name='rollback-generated-names.index-table-name' \r
        value='SERVICE_INSTANCE_NAME_INDEX' />\r
-                        <parameter name='rollback-generated-names.index-table.name-prefix-column' \r
+                            <parameter name='rollback-generated-names.index-table.name-prefix-column' \r
        value='service_instance_name_prefix' />\r
-                    </set>\r
+                        </set>\r
+                        <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+       key='DELETE from GENERIC_RESOURCE_NAME WHERE type = $rollback-generated-names-input.naming-type  \r
+               AND context_id = $rollback-generated-names-input.context-id AND prefix IS NULL AND name_index IS NULL'></delete>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value='VNF_INSTANCE'>\r
                     <set>\r