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=fa9cbd959a7c8424461842aa2775df6f706bbeb1;hb=refs%2Fchanges%2F73%2F123673%2F1;hp=dae4b9b9408f237b3d25294e0e697ca65c3276a0;hpb=b33ca08f0c5b42372f588b3ba6d47e05138cc30e;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 dae4b9b9..fa9cbd95 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,13 +6,33 @@
             <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'>
-                    <block atomic="true">
-                        <set>
-                            <parameter name='skip-mdsal-update' value='Y' />
-                        </set>
-                        <set>
-                            <parameter name='ack-final' value='N' />
-                        </set>
+                    <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>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </outcome>
+                        </switch>
                     </block>
                 </outcome>
                 <outcome value='unassign'>
@@ -45,6 +65,12 @@
                             <outcome value='CreateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-create' mode='sync' ></call>
                             </outcome>
+                            <outcome value='CreateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-create' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='CreateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -69,6 +95,12 @@
                             <outcome value='ActivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-activate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='ActivateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-activate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='ActivateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-activate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-activate' mode='sync' ></call>
                             </outcome>
@@ -93,6 +125,12 @@
                             <outcome value='DeactivateSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-deactivate' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeactivateSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-deactivate' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='DeactivateSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-deactivate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vf-module-topology-operation-deactivate' mode='sync' ></call>
                             </outcome>
@@ -117,6 +155,12 @@
                             <outcome value='DeleteSDWANPortInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='sdwan-vf-operation-wanport-delete' mode='sync' ></call>
                             </outcome>
+                            <outcome value='DeleteSOTNUniInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-uni-delete' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='DeleteSOTNL2VpnInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vf-operation-l2vpn-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>