Deactivate flow modification for DCI

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_network-topology-operation.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
index 00848f9..13e2583 100755 (executable)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml
@@ -65,59 +65,59 @@
                     </switch>\r
                 </outcome>\r
                 <outcome value="deactivate">\r
-                    <switch test="`$network-topology-operation-input.request-information.request-action`">\r
-                        <outcome value="DeActivateDCINetworkInstance">\r
-                            <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync" />\r
-                        </outcome>\r
-                        <outcome value="other">\r
-                            <block atomic="true">\r
-                                <switch test="`$service-data.networks.network_length`">\r
-                                    <outcome value="">\r
-                                        <return status="failure">\r
-                                            <parameter name="ack-final" value="Y" />\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />\r
-                                        </return>\r
+                    <block atomic="true">\r
+                        <switch test="`$service-data.networks.network_length`">\r
+                            <outcome value="">\r
+                                <return status="failure">\r
+                                    <parameter name="ack-final" value="Y" />\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />\r
+                                </return>\r
+                            </outcome>\r
+                            <outcome value="Other">\r
+                                <block atomic="true">\r
+                                    <for index="nidx" start="0" end="`$service-data.networks.network_length`">\r
+                                        <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">\r
+                                            <outcome value="true">\r
+                                                <set>\r
+                                                    <parameter name="tmp.nidx" value="`$nidx`" />\r
+                                                    <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />\r
+                                                </set>\r
+                                            </outcome>\r
+                                        </switch>\r
+                                    </for>\r
+                                    <switch test="`$tmp.nidx`">\r
+                                        <outcome value="">\r
+                                            <return status="failure">\r
+                                                <parameter name="ack-final" value="Y" />\r
+                                                <parameter name="error-code" value="500" />\r
+                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </switch>\r
+                                </block>\r
+                            </outcome>\r
+                        </switch>\r
+                        <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">\r
+                            <outcome value="Created">\r
+                                <switch test="`$network-topology-operation-input.request-information.request-action`">\r
+                                    <outcome value="DeActivateDCINetworkInstance">\r
+                                        <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync" />\r
                                     </outcome>\r
                                     <outcome value="Other">\r
-                                        <block atomic="true">\r
-                                            <for index="nidx" start="0" end="`$service-data.networks.network_length`">\r
-                                                <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">\r
-                                                    <outcome value="true">\r
-                                                        <set>\r
-                                                            <parameter name="tmp.nidx" value="`$nidx`" />\r
-                                                            <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />\r
-                                                        </set>\r
-                                                    </outcome>\r
-                                                </switch>\r
-                                            </for>\r
-                                            <switch test="`$tmp.nidx`">\r
-                                                <outcome value="">\r
-                                                    <return status="failure">\r
-                                                        <parameter name="ack-final" value="Y" />\r
-                                                        <parameter name="error-code" value="500" />\r
-                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />\r
-                                                    </return>\r
-                                                </outcome>\r
-                                            </switch>\r
-                                        </block>\r
-                                    </outcome>\r
-                                </switch>\r
-                                <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">\r
-                                    <outcome value="Created">\r
                                         <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-deactivate" mode="sync" />\r
                                     </outcome>\r
-                                    <outcome value="Other">\r
-                                        <return status="failure">\r
-                                            <parameter name="ack-final" value="Y" />\r
-                                            <parameter name="error-code" value="500" />\r
-                                            <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />\r
-                                        </return>\r
-                                    </outcome>\r
                                 </switch>\r
-                            </block>\r
-                        </outcome>\r
-                    </switch>\r
+                            </outcome>\r
+                            <outcome value="Other">\r
+                                <return status="failure">\r
+                                    <parameter name="ack-final" value="Y" />\r
+                                    <parameter name="error-code" value="500" />\r
+                                    <parameter name="error-message" value="`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`" />\r
+                                </return>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value="unassign">\r
                     <block atomic="true">\r