Fix async logic

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_vf-module-topology-operation.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 fb12ca3..dc7dc37 100644 (file)
--- 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>\r
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='assign'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign' mode='sync' ></call>\r
+                    <block>\r
+                        <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                            <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                            <parameter name='contextPrefix' value='prop' />\r
+                        </execute>\r
+                        <switch test='`length($vf-module-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
+                            <outcome value='true'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='false'>\r
+                                <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\r
+                                    <outcome value='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-sync' mode='sync' ></call>\r
+                                    </outcome>\r
+                                    <outcome value='false'>\r
+                                        <block atomic="true">\r
+                                            <set>\r
+                                                <parameter name='skip-mdsal-update' value='Y' />\r
+                                            </set>\r
+                                            <set>\r
+                                                <parameter name='ack-final' value='N' />\r
+                                            </set>\r
+                                            <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-assign-async' mode='sync' ></call>\r
+                                        </block>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value='unassign'>\r
                     <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-unassign' mode='sync' ></call>\r
@@ -26,7 +54,7 @@
                             <outcome value='CreateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-create' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='CreateSiteInstance'>\r
+                            <outcome value='CreateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-create' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='CreateSDWANDeviceInstance'>\r
@@ -50,7 +78,7 @@
                             <outcome value='ActivateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-activate' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='ActivateSiteInstance'>\r
+                            <outcome value='ActivateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-activate' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='ActivateSDWANDeviceInstance'>\r
@@ -74,7 +102,7 @@
                             <outcome value='DeactivateSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-deactivate' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='DeactivateSiteInstance'>\r
+                            <outcome value='DeactivateSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-deactivate' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='DeactivateSDWANDeviceInstance'>\r
@@ -98,13 +126,13 @@
                             <outcome value='DeleteSDWANVpnInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-vpn-delete' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='DeleteSiteInstance'>\r
+                            <outcome value='DeleteSDWANSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-site-delete' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='DeleteSDWANDeviceInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-device-delete' mode='sync' ></call>\r
                             </outcome>\r
-                            <outcome value='DleteSDWANLanPortInstance'>\r
+                            <outcome value='DeleteSDWANLanPortInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-lanport-delete' mode='sync' ></call>\r
                             </outcome>\r
                             <outcome value='DeleteSDWANPortInstance'>\r
@@ -116,6 +144,18 @@
                         </switch>\r
                     </block>\r
                 </outcome>\r
+                <outcome value='update'>\r
+                    <block atomic="true">\r
+                        <switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\r
+                            <outcome value='SdwanBandwidthChange'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-bandwidth-policy-change' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='Other'>\r
+                                <block></block>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
+                </outcome>\r
                 <outcome value='Other'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r