From 5c164baf5662bc8ce115746004762096b0ae28d7 Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Fri, 10 Aug 2018 23:54:16 +0530
Subject: SOTN siteInstance DGs

SOTN siteInstance vnf topology operation DGs

Change-Id: I7018aa0c56db60d1bca0a3b234820b3128d0c111
Issue-ID: SDNC-356
Signed-off-by: Prakash E <prakash.e@huawei.com>

Former-commit-id: f5b2457c6f66e4e357fe469df370d1ce8b4f0cd9
---
 ...GENERIC-RESOURCE-API_vnf-topology-operation.xml | 77 ++++++++++++----------
 1 file changed, 41 insertions(+), 36 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
index 481a7a89..e0332cc6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation.xml
@@ -9,50 +9,55 @@
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign' mode='sync' ></call>
                 </outcome>
                 <outcome value='activate'>
-                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
-                        <outcome value='ActivateSiteInstance'>
-                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-activate' mode='sync' ></call>
-                        </outcome>
-                        <outcome value='Other'>
-                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
-                        </outcome>
-                    </switch>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='ActivateSiteInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='Other'>
+                                <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='deactivate'>
-                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
-                        <outcome value='DeActivateSiteInstance'>
-                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-deactivate' mode='sync' ></call>
-                        </outcome>
-                        <outcome value='Other'>
-                            <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' ></call>
-                        </outcome>
-                    </switch>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeactivateSiteInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='Other'>
+                                <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' ></call>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='unassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-unassign' mode='sync' ></call>
                 </outcome>
-                <outcome value='changeassign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-changeassign' mode='sync' ></call>
-                </outcome>
                 <outcome value='create'>
-                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
-                        <outcome value='CreateSiteInstance'>
-                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-create' mode='sync' ></call>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block></block>
-                        </outcome>
-                    </switch>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateSiteInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block></block>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='delete'>
-                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
-                        <outcome value='DeleteSiteInstance'>
-                            <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-delete' mode='sync' ></call>
-                        </outcome>
-                        <outcome value='Other'>
-                            <block></block>
-                        </outcome>
-                    </switch>
+                    <block atomic="true">
+                        <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteSiteInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='Other'>
+                                <block></block>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
@@ -69,4 +74,4 @@
             </return>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
cgit 1.2.3-korg