Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Add logic to use sync vs async SO response
[sdnc/oam.git] / 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 e0332cc..c96c98a 100644 (file)
--- 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
@@ -6,7 +6,34 @@
             <call module='GENERIC-RESOURCE-API' rpc='validate-vnf-input' mode='sync' ></call>\r
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>\r
                 <outcome value='assign'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-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($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>\r
+                            <outcome value='true'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='false'>\r
+                                <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>\r
+                                    <outcome value='true'>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='vnf-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
+                                        </block>\r
+                                    </outcome>\r
+                                </switch>\r
+                            </outcome>\r
+                        </switch>\r
+                    </block>\r
                 </outcome>\r
                 <outcome value='activate'>\r
                     <block atomic="true">\r
@@ -14,6 +41,22 @@
                             <outcome value='ActivateSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-activate' mode='sync' ></call>\r
                             </outcome>\r
+                            <outcome value='ActivateSDWANDeviceInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-activate' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='ActivateSDWANPortInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-activate' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='ActivateSDWANVpnInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='ActivateSDWANSiteInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
                             <outcome value='Other'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>\r
                             </outcome>\r
@@ -26,6 +69,22 @@
                             <outcome value='DeactivateSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-deactivate' mode='sync' ></call>\r
                             </outcome>\r
+                            <outcome value='DeactivateSDWANDeviceInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-deactivate' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='DeactivateSDWANPortInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-deactivate' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='DeactivateSDWANVpnInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='DeactivateSDWANSiteInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-deactivate' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
                             <outcome value='Other'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-deactivate' mode='sync' ></call>\r
                             </outcome>\r
@@ -41,6 +100,22 @@
                             <outcome value='CreateSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' ></call>\r
                             </outcome>\r
+                            <outcome value='CreateSDWANDeviceInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-create' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='CreateSDWANPortInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-create' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='CreateSDWANVpnInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='CreateSDWANSiteInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
                             <outcome value='Other'>\r
                                 <block></block>\r
                             </outcome>\r
@@ -53,6 +128,22 @@
                             <outcome value='DeleteSiteInstance'>\r
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' ></call>\r
                             </outcome>\r
+                            <outcome value='DeleteSDWANDeviceInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-device-delete' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='DeleteSDWANPortInstance'>\r
+                                <call module='GENERIC-RESOURCE-API' rpc='sdwan-vnf-topology-operation-wanport-delete' mode='sync' ></call>\r
+                            </outcome>\r
+                            <outcome value='DeleteSDWANVpnInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
+                            <outcome value='DeleteSDWANSiteInstance'>\r
+                                <block atomic="true">\r
+                                    <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' ></call>\r
+                                </block>\r
+                            </outcome>\r
                             <outcome value='Other'>\r
                                 <block></block>\r
                             </outcome>\r
SDNC OA&M tools