From a26adc924eba86198fbf91e0932023fb2f79bb0d Mon Sep 17 00:00:00 2001
From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Thu, 5 Oct 2017 19:55:42 +0530
Subject: Deactivate flow modification for DCI

Changes includes:
1) Save network information SDNC's MD-SAL data store
2) Send network-id & network-object-path in network-topology-operation-output
3) Deactivation based on stored network-id

Change-Id: I4498d33e9e7921e047bfe9dff8c9801153f5f5f4
Issue-Id: SDNC-113
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 4d38cecf0f03e1244ca0c605c5802632b36f3b82
---
 ...RIC-RESOURCE-API_network-topology-operation.xml | 96 +++++++++++-----------
 1 file changed, 48 insertions(+), 48 deletions(-)

(limited to '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 00848f98..13e2583a 100755
--- 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>
                 </outcome>
                 <outcome value="deactivate">
-                    <switch test="`$network-topology-operation-input.request-information.request-action`">
-                        <outcome value="DeActivateDCINetworkInstance">
-                            <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync" />
-                        </outcome>
-                        <outcome value="other">
-                            <block atomic="true">
-                                <switch test="`$service-data.networks.network_length`">
-                                    <outcome value="">
-                                        <return status="failure">
-                                            <parameter name="ack-final" value="Y" />
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                        </return>
+                    <block atomic="true">
+                        <switch test="`$service-data.networks.network_length`">
+                            <outcome value="">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                </return>
+                            </outcome>
+                            <outcome value="Other">
+                                <block atomic="true">
+                                    <for index="nidx" start="0" end="`$service-data.networks.network_length`">
+                                        <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
+                                            <outcome value="true">
+                                                <set>
+                                                    <parameter name="tmp.nidx" value="`$nidx`" />
+                                                    <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
+                                                </set>
+                                            </outcome>
+                                        </switch>
+                                    </for>
+                                    <switch test="`$tmp.nidx`">
+                                        <outcome value="">
+                                            <return status="failure">
+                                                <parameter name="ack-final" value="Y" />
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                                            </return>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                        </switch>
+                        <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
+                            <outcome value="Created">
+                                <switch test="`$network-topology-operation-input.request-information.request-action`">
+                                    <outcome value="DeActivateDCINetworkInstance">
+                                        <call module="GENERIC-RESOURCE-API" rpc="dci-connects-network-topology-operation-deactivate" mode="sync" />
                                     </outcome>
                                     <outcome value="Other">
-                                        <block atomic="true">
-                                            <for index="nidx" start="0" end="`$service-data.networks.network_length`">
-                                                <switch test="`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`">
-                                                    <outcome value="true">
-                                                        <set>
-                                                            <parameter name="tmp.nidx" value="`$nidx`" />
-                                                            <parameter name="ctx.network-data." value="`$service-data.networks.network[$nidx].`" />
-                                                        </set>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                            <switch test="`$tmp.nidx`">
-                                                <outcome value="">
-                                                    <return status="failure">
-                                                        <parameter name="ack-final" value="Y" />
-                                                        <parameter name="error-code" value="500" />
-                                                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-                                                    </return>
-                                                </outcome>
-                                            </switch>
-                                        </block>
-                                    </outcome>
-                                </switch>
-                                <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`">
-                                    <outcome value="Created">
                                         <call module="GENERIC-RESOURCE-API" rpc="network-topology-operation-deactivate" mode="sync" />
                                     </outcome>
-                                    <outcome value="Other">
-                                        <return status="failure">
-                                            <parameter name="ack-final" value="Y" />
-                                            <parameter name="error-code" value="500" />
-                                            <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`" />
-                                        </return>
-                                    </outcome>
                                 </switch>
-                            </block>
-                        </outcome>
-                    </switch>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="ack-final" value="Y" />
+                                    <parameter name="error-code" value="500" />
+                                    <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`" />
+                                </return>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value="unassign">
                     <block atomic="true">
-- 
cgit 1.2.3-korg