Self serve fix for Casablanca

[sdnc/oam.git] / 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
old mode 100755 (executable)
new mode 100644 (file)
index b3ea344..725e64f
--- 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,12 @@
                     </return>\r
                 </outcome>\r
             </switch>\r
-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources`'>\r
-                <outcome value='true'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >\r
-                        <outcome value='failure'>\r
-                            <return status='failure'>\r
-                                <parameter name='error-code' value='500' />\r
-                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve resources with error: '+ $error-message`" />\r
-                            </return>\r
-                        </outcome>\r
-                        <outcome value='success'>\r
-                            <return status='success'>\r
-                                <parameter name="ack-final-indicator" value="Y" />\r
-                                <parameter name="error-code" value="200" />\r
-                                <parameter name="error-message" value="`$error-message`" />\r
-                            </return>\r
-                        </outcome>\r
-                    </call>\r
-                </outcome>\r
-                <outcome value='Other'>\r
+            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+  key='SELECT * from VF_MODEL WHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\r
+  pfx='db.vf-model'></get-resource>\r
+            <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-forking-logic' mode='sync' ></call>\r
+            <switch test="`$ss.self-serve-flag`">\r
+                <outcome value='false'>\r
                     <block atomic="true">\r
                         <switch test='`$service-data.vnfs.vnf_length`'>\r
                             <outcome value='1'>\r
@@ -113,6 +100,23 @@
                         </return>\r
                     </block>\r
                 </outcome>\r
+                <outcome value='true'>\r
+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-unassign' mode='sync' >\r
+                        <outcome value='failure'>\r
+                            <return status='failure'>\r
+                                <parameter name='error-code' value='500' />\r
+                                <parameter name='error-message' value="`'Encountered error while unassigning self-serve resources with error: '+ $error-message`" />\r
+                            </return>\r
+                        </outcome>\r
+                        <outcome value='success'>\r
+                            <return status='success'>\r
+                                <parameter name="ack-final-indicator" value="Y" />\r
+                                <parameter name="error-code" value="200" />\r
+                                <parameter name="error-message" value="`$error-message`" />\r
+                            </return>\r
+                        </outcome>\r
+                    </call>\r
+                </outcome>\r
             </switch>\r
         </block>\r
     </method>\r