X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_vf-module-topology-operation.xml;h=dc7dc371e406902dd803fa6a99e5c59f3a00e2b8;hb=bf19b18511c382add95d33526e0706b7858f276f;hp=eab88b48cbc742c921840c90f1678f1701d4b4cf;hpb=b477ae268d7035bb15a33085f3fbda7f1da453ed;p=sdnc%2Foam.git

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..dc7dc371 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
@@ -6,7 +6,35 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vf-module-input' mode='sync' ></call>
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>
+                    <block>
+                        <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                            <parameter name='contextPrefix' value='prop' />
+                        </execute>
+                        <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>
+                            <outcome value='true'>
+                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='false'>
+                                <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>
+                                    <outcome value='true'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <block atomic="true">
+                                            <set>
+                                                <parameter name='skip-mdsal-update' value='Y' />
+                                            </set>
+                                            <set>
+                                                <parameter name='ack-final' value='N' />
+                                            </set>
+                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='unassign'>
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' ></call>
@@ -16,19 +44,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'>
+                            <outcome value='CreateSDWANSiteInstance'>
                                 <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 +78,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'>
+                            <outcome value='ActivateSDWANSiteInstance'>
                                 <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 +102,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'>
+                            <outcome value='DeactivateSDWANSiteInstance'>
                                 <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 +126,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'>
+                            <outcome value='DeleteSDWANSiteInstance'>
                                 <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='DeleteSDWANLanPortInstance'>
+                                <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>
@@ -116,6 +150,9 @@
                             <outcome value='SdwanBandwidthChange'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' ></call>
                             </outcome>
+                            <outcome value='Other'>
+                                <block></block>
+                            </outcome>
                         </switch>
                     </block>
                 </outcome>