self-serve DG 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
index a50fa7d..b3ea344 100755 (executable)
--- 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
@@ -59,68 +59,61 @@
             </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources`'>\r
                 <outcome value='true'>\r
-                    <block atomic="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
-                        </call>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
-            <switch test='`$service-data.vnfs.vnf_length`'>\r
-                <outcome value='1'>\r
-                    <set>\r
-                        <parameter name="service-data.vnfs." value=""/>\r
-                    </set>\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
                     <block atomic="true">\r
-                        <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\r
-                            <set>\r
-                                <parameter name="$tmpidx" value="`$idx - 1`"/>\r
-                                <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />\r
-                            </set>\r
-                        </for>\r
-                        <set>\r
-                            <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1]." value=""/>\r
-                        </set>\r
-                        <set>\r
-                            <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>\r
-                        </set>\r
-                    </block>\r
-                </outcome>\r
-            </switch>\r
-            <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources`'>\r
-                <outcome value='false'>\r
-                    <block atomic="true">\r
-                        <set>\r
-                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
-                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
-                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
-                        </set>\r
-                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\r
-                    </block>\r
-                </outcome>\r
-                <outcome value=''>\r
-                    <block atomic="true">\r
+                        <switch test='`$service-data.vnfs.vnf_length`'>\r
+                            <outcome value='1'>\r
+                                <set>\r
+                                    <parameter name="service-data.vnfs." value=""/>\r
+                                </set>\r
+                            </outcome>\r
+                            <outcome value='Other'>\r
+                                <block atomic="true">\r
+                                    <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\r
+                                        <set>\r
+                                            <parameter name="$tmpidx" value="`$idx - 1`"/>\r
+                                            <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />\r
+                                        </set>\r
+                                    </for>\r
+                                    <set>\r
+                                        <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1]." value=""/>\r
+                                    </set>\r
+                                    <set>\r
+                                        <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>\r
+                                    </set>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
                         <set>\r
                             <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />\r
                             <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\r
                             <parameter name='naming-policy-generate-name-input.action' value='DELETE' />\r
                         </set>\r
                         <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>\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
                     </block>\r
                 </outcome>\r
             </switch>\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
         </block>\r
     </method>\r
 </service-logic>
\ No newline at end of file