From 7f70731621bcd7cdb4f4157eba0d66b3638f1519 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat" <kc1472@att.com>
Date: Thu, 4 Oct 2018 18:35:55 +0000
Subject: self-serve dg patch

inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name

Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136
Issue-ID: CCSDK-604
Signed-off-by: Cheung, Pat <kc1472@att.com>

Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815
---
 ...ESOURCE-API_vnf-topology-operation-unassign.xml | 39 +++++++++++-----------
 1 file changed, 20 insertions(+), 19 deletions(-)

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

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
index b3ea3447..1b3ff069 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml
@@ -57,25 +57,9 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources`'>
-                <outcome value='true'>
-                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >
-                        <outcome value='failure'>
-                            <return status='failure'>
-                                <parameter name='error-code' value='500' />
-                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve resources with error: '+ $error-message`" />
-                            </return>
-                        </outcome>
-                        <outcome value='success'>
-                            <return status='success'>
-                                <parameter name="ack-final-indicator" value="Y" />
-                                <parameter name="error-code" value="200" />
-                                <parameter name="error-message" value="`$error-message`" />
-                            </return>
-                        </outcome>
-                    </call>
-                </outcome>
-                <outcome value='Other'>
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>
+            <switch test="`$ss.self-serve-flag`">
+                <outcome value='false'>
                     <block atomic="true">
                         <switch test='`$service-data.vnfs.vnf_length`'>
                             <outcome value='1'>
@@ -113,6 +97,23 @@
                         </return>
                     </block>
                 </outcome>
+                <outcome value='true'>
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >
+                        <outcome value='failure'>
+                            <return status='failure'>
+                                <parameter name='error-code' value='500' />
+                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve resources with error: '+ $error-message`" />
+                            </return>
+                        </outcome>
+                        <outcome value='success'>
+                            <return status='success'>
+                                <parameter name="ack-final-indicator" value="Y" />
+                                <parameter name="error-code" value="200" />
+                                <parameter name="error-message" value="`$error-message`" />
+                            </return>
+                        </outcome>
+                    </call>
+                </outcome>
             </switch>
         </block>
     </method>
-- 
cgit 1.2.3-korg