X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_vnf-topology-operation.xml;h=9b8f9a0a7f8d751925b1a8690a20a23e7b78b9a1;hb=dd745293c03a55318df2d58a886b77ba9352a5b4;hp=cabcce51e49cbeaef8210a900f30adb4191fb24d;hpb=220ebdca39a85491b22acc7ed9024a348652b1b0;p=sdnc%2Foam.git

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 cabcce51..9b8f9a0a 100644
--- 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>
             <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
-                    <call module='GENERIC-RESOURCE-API' rpc='vnf-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($vnf-topology-operation-input.sdnc-request-header.svc-notification-url) == 0`'>
+                            <outcome value='true'>
+                                <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-assign-sync' mode='sync' ></call>
+                            </outcome>
+                            <outcome value='false'>
+                                <switch test='`$vnf-topology-operation-input.sdnc-request-header.svc-notification-url == $prop.so.ignore-url`'>
+                                    <outcome value='true'>
+                                        <call module='GENERIC-RESOURCE-API' rpc='vnf-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='activate'>
                     <block atomic="true">
@@ -30,6 +57,9 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-activate' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='ActivateSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-activate' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-activate' mode='sync' ></call>
                             </outcome>
@@ -70,6 +100,39 @@
                 <outcome value='create'>
                     <block atomic="true">
                         <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='CreateAccessConnectivityInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-create-huawei' mode='sync' ></call>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name+' is invalid manufacturer,please check!'`" />
+                                                    </return>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                            <outcome value='CreateInternetProfileInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-create-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
                             <outcome value='CreateSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-create' mode='sync' ></call>
                             </outcome>
@@ -89,6 +152,9 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='CreateSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-create' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
@@ -98,6 +164,32 @@
                 <outcome value='delete'>
                     <block atomic="true">
                         <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                            <outcome value='DeleteAccessConnectivityInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-access-connectivity-vnf-topology-operation-delete-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
+                            <outcome value='DeleteInternetProfileInstance'>
+                                <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                    <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                        <outcome value='true'>
+                                            <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                                <outcome value='HUAWEI'>
+                                                    <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-delete-huawei' mode='sync' ></call>
+                                                </outcome>
+                                            </switch>
+                                        </outcome>
+                                    </switch>
+                                </for>
+                            </outcome>
                             <outcome value='DeleteSiteInstance'>
                                 <call module='GENERIC-RESOURCE-API' rpc='site-vnf-topology-operation-delete' mode='sync' ></call>
                             </outcome>
@@ -117,12 +209,32 @@
                                     <call module='GENERIC-RESOURCE-API' rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync' ></call>
                                 </block>
                             </outcome>
+                            <outcome value='DeleteSOTNUnderlayInstance'>
+                                <call module='GENERIC-RESOURCE-API' rpc='sotn-vnf-topology-operation-underlay-delete' mode='sync' ></call>
+                            </outcome>
                             <outcome value='Other'>
                                 <block></block>
                             </outcome>
                         </switch>
                     </block>
                 </outcome>
+                <outcome value='update'>
+                    <switch test='`$vnf-topology-operation-input.request-information.request-action`'>
+                        <outcome value='ChangeInternetProfileInstance'>
+                            <for index='idx' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >
+                                <switch test="`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name == 'manufacturer'`">
+                                    <outcome value='true'>
+                                        <switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].value`'>
+                                            <outcome value='HUAWEI'>
+                                                <call module='GENERIC-RESOURCE-API' rpc='bbs-internet-profile-vnf-topology-operation-change-huawei' mode='sync' ></call>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
+                </outcome>
                 <outcome value='Other'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>