X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_vnf-topology-operation-unassign.xml;h=32e922e21cfa019cf5fc5135de7f5d0dd106e96a;hb=refs%2Fheads%2Fmaster;hp=725e64f4fce58a4fdce4b9c8c6c75752a7c5a65c;hpb=a577ed21d5cc1d0389e2a7ab0b7b76ec2faf8fb0;p=sdnc%2Foam.git

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 725e64f4..32e922e2 100644
--- 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
@@ -17,106 +17,157 @@
             </switch>
             <switch test='`$service-data.vnfs.vnf_length`'>
                 <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="There are no VNFs in MD-SAL" />
-                    </return>
-                </outcome>
-            </switch>
-            <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
-                <switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`' >
-                    <outcome value='true'>
-                        <set>
-                            <parameter name='vnf-index' value='`$idx`' />
-                        </set>
-                    </outcome>
-                </switch>
-            </for>
-            <switch test='`$vnf-index`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="404" />
-                        <parameter name="error-message" value="'Could not find VNF ' + $vnf-topology-operation-input.vnf-information.vnf-id + ' in MD-SAL'" />
+                    <return status='success'>
+                        <parameter name="ack-final-indicator" value="Y" />
+                        <parameter name="error-code" value="200" />
                     </return>
                 </outcome>
-            </switch>
-            <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`">
-                <outcome value='0'>
-                    <block></block>
-                </outcome>
-                <outcome value=''>
-                    <block></block>
-                </outcome>
                 <outcome value='Other'>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="Cannot delete the VNF because there are VFs defined" />
-                    </return>
-                </outcome>
-            </switch>
-            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from VF_MODEL WHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'
-  pfx='db.vf-model'></get-resource>
-            <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'>
-                                <set>
-                                    <parameter name="service-data.vnfs." value=""/>
-                                </set>
+                        <for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >
+                            <switch test='`$service-data.vnfs.vnf[$idx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`' >
+                                <outcome value='true'>
+                                    <set>
+                                        <parameter name='vnf-index' value='`$idx`' />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </for>
+                        <switch test='`$vnf-index`'>
+                            <outcome value=''>
+                                <return status='success'>
+                                    <parameter name="ack-final-indicator" value="Y" />
+                                    <parameter name="error-code" value="200" />
+                                </return>
                             </outcome>
                             <outcome value='Other'>
                                 <block atomic="true">
-                                    <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >
-                                        <set>
-                                            <parameter name="$tmpidx" value="`$idx - 1`"/>
-                                            <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />
-                                        </set>
-                                    </for>
-                                    <set>
-                                        <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1]." value=""/>
-                                    </set>
-                                    <set>
-                                        <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>
-                                    </set>
+                                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`">
+                                        <outcome value='0'>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value=''>
+                                            <block></block>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Cannot delete the VNF because there are VF modules defined" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                    <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+  key='SELECT * from VF_MODEL WHERE customization_uuid = $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'
+  pfx='db.vf-model'>
+                                        <outcome value='failure'>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                <parameter name="logger" value="message-log"/>
+                                                <parameter name="field1" value="Error reading VF_MODEL table"/>
+                                            </record>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                <parameter name="logger" value="message-log"/>
+                                                <parameter name="field1" value="`'No model found for VNF customization UUID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid`"/>
+                                            </record>
+                                        </outcome>
+                                    </get-resource>
+                                    <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'>
+                                                        <set>
+                                                            <parameter name="service-data.vnfs." value=""/>
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='Other'>
+                                                        <block atomic="true">
+                                                            <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >
+                                                                <block>
+                                                                    <set>
+                                                                        <parameter name="$tmpidx" value="`$idx - 1`"/>
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name="service-data.vnfs.vnf[$tmpidx]." value="" />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />
+                                                                    </set>
+                                                                </block>
+                                                            </for>
+                                                            <set>
+                                                                <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length - 1]." value=""/>
+                                                            </set>
+                                                            <set>
+                                                                <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>
+                                                            </set>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                                <set>
+                                                    <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
+                                                    <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
+                                                    <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
+                                                </set>
+                                                <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
+                                                <return status='success'>
+                                                    <parameter name="ack-final-indicator" value="Y" />
+                                                    <parameter name="error-code" value="200" />
+                                                    <parameter name="error-message" value="`$error-message`" />
+                                                </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'>
+                                                    <switch test='`$service-data.vnfs.vnf_length`'>
+                                                        <outcome value='1'>
+                                                            <set>
+                                                                <parameter name="service-data.vnfs." value=""/>
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value='Other'>
+                                                            <block atomic="true">
+                                                                <for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name="$tmpidx" value="`$idx - 1`"/>
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name="service-data.vnfs.vnf[$tmpidx]." value="" />
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name="service-data.vnfs.vnf[$tmpidx]." value="$service-data.vnfs.vnf[$idx]." />
+                                                                        </set>
+                                                                    </block>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name="service-data.vnfs.vnf[$service-data.vnfs.vnf_length - 1]." value=""/>
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name="service-data.vnfs.vnf_length" value="`$service-data.vnfs.vnf_length - 1`"/>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </outcome>
+                                            </call>
+                                        </outcome>
+                                    </switch>
                                 </block>
                             </outcome>
                         </switch>
-                        <set>
-                            <parameter name='naming-policy-generate-name-input.naming-type' value='VNF' />
-                            <parameter name='naming-policy-generate-name-input.context-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />
-                            <parameter name='naming-policy-generate-name-input.action' value='DELETE' />
-                        </set>
-                        <call module='GENERIC-RESOURCE-API' rpc='naming-policy-generate-name' mode='sync' ></call>
-                        <return status='success'>
-                            <parameter name="ack-final-indicator" value="Y" />
-                            <parameter name="error-code" value="200" />
-                            <parameter name="error-message" value="`$error-message`" />
-                        </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>