From a599fa4e74ee243fb1a99b8544648af074b27d4e Mon Sep 17 00:00:00 2001
From: "prakash.e" <prakash.e@huawei.com>
Date: Wed, 17 Apr 2019 21:49:22 +0530
Subject: SDWAN LanPort DGs are called in parent DG

Fixed in vf-module-topology-operation DG by calling
SDWALanPort DGs for create,activate,deactivate and
delete svc-actions

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

Former-commit-id: 083d8457edba7f889bedb3992d4f64098790a652
---
 ...C-RESOURCE-API_vf-module-topology-operation.xml | 39 ++++++++++------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
index eab88b48..fb12ca3e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml
@@ -16,19 +16,25 @@
                 </outcome>
                 <outcome value='create'>
                     <block atomic="true">
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                            <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
+                            <parameter name="field1" value="__TIMESTAMP__"/>
+                            <parameter name="field2" value="request-action"/>
+                            <parameter name="field3" value='`$vf-module-topology-operation-input.request-information.request-action`'/>
+                        </record>
                         <switch test='`$vf-module-topology-operation-input.request-information.request-action`'>
                             <outcome value='CreateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>
                             </outcome>
-                            <outcome value='CreateSDWANLanPortInstance'>
-                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' ></call>
-                            </outcome>
                             <outcome value='CreateSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>
                             </outcome>
                             <outcome value='CreateSDWANDeviceInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-create' mode='sync' ></call>
                             </outcome>
+                            <outcome value='CreateSDWANLanPortInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='CreateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' ></call>
                             </outcome>
@@ -44,15 +50,15 @@
                             <outcome value='ActivateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>
                             </outcome>
-                            <outcome value='ActivateSDWANLanPortInstance'>
-                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' ></call>
-                            </outcome>
                             <outcome value='ActivateSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>
                             </outcome>
                             <outcome value='ActivateSDWANDeviceInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-activate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='ActivateSDWANLanPortInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-activate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='ActivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' ></call>
                             </outcome>
@@ -68,15 +74,15 @@
                             <outcome value='DeactivateSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>
                             </outcome>
-                            <outcome value='DeactivateSDWANLanPortInstance'>
-                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' ></call>
-                            </outcome>
                             <outcome value='DeactivateSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>
                             </outcome>
                             <outcome value='DeactivateSDWANDeviceInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-deactivate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeactivateSDWANLanPortInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-deactivate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='DeactivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' ></call>
                             </outcome>
@@ -92,15 +98,15 @@
                             <outcome value='DeleteSDWANVpnInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>
                             </outcome>
-                            <outcome value='DeleteSDWANLanPortInstance'>
-                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
-                            </outcome>
                             <outcome value='DeleteSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>
                             </outcome>
                             <outcome value='DeleteSDWANDeviceInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DleteSDWANLanPortInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='DeleteSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' ></call>
                             </outcome>
@@ -110,15 +116,6 @@
                         </switch>
                     </block>
                 </outcome>
-                <outcome value='update'>
-                    <block atomic="true">
-                        <switch test='`$vf-module-topology-operation-input.request-information.request-action`'>
-                            <outcome value='SdwanBandwidthChange'>
-                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' ></call>
-                            </outcome>
-                        </switch>
-                    </block>
-                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
-- 
cgit 1.2.3-korg