X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fxml%2FDataChange_esr-thirdparty-sdnc-discovery.xml;h=98585dbd46c029ffbf5ade73d62e6cd267db8e26;hb=550fe5b30603ff6da993acc5aeea83d1096433eb;hp=81e8bd2062ec664ad0f327f385b110c0ffdea463;hpb=7dc3fff566f520cd9adc5bcbd373a2a76f6910a9;p=sdnc%2Foam.git

diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 81e8bd20..98585dbd 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -1,6 +1,6 @@
 <service-logic
-    xmlns='http://www.onap.org/sdnc/svclogic'
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>
     <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
         <block atomic="true">
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">
@@ -66,64 +66,35 @@
                                                                 </for>
                                                                 <switch test='`$topology.networks.network_length >= 2`'>
                                                                     <outcome value='true'>
-                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
-                                                                                </set>
-                                                                                <switch test='`$network.te-topology-id`'>
-                                                                                    <outcome value='11'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="OTN" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='33'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="ETH" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                    <parameter name="field6" value="network-otn-is" />
-                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
-                                                                                    <parameter name="field8" value="network-eth-is" />
-                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
-                                                                                </record>
-                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                            </block>
-                                                                        </for>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                            <parameter name="field1" value="__TIMESTAMP__" />
-                                                                            <parameter name="field2" value="networks_length" />
-                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                        </record>
+                                                                        <block atomic='true'>
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='network.' value='' />
+                                                                                    </set>
+                                                                                    <set>
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
+                                                                                    </set>
+                                                                                    <switch test='`$network.te-topology-id`'>
+                                                                                        <outcome value='1'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                        <outcome value='2'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </block>
+                                                                            </for>
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                        </block>
                                                                     </outcome>
                                                                 </switch>
                                                             </block>
@@ -162,64 +133,35 @@
                                                                 </for>
                                                                 <switch test='`$topology.networks.network_length >= 2`'>
                                                                     <outcome value='true'>
-                                                                        <for index='netidx' start='0' end='`$topology.networks.network_length`' >
-                                                                            <block>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
-                                                                                </set>
-                                                                                <switch test='`$network.te-topology-id`'>
-                                                                                    <outcome value='11'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="OTN" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='33'>
-                                                                                        <block>
-                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                                <parameter name="field1" value="__TIMESTAMP__" />
-                                                                                                <parameter name="field2" value="networks_length" />
-                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                                                <parameter name="field4" value="network-type-is" />
-                                                                                                <parameter name="field5" value="ETH" />
-                                                                                            </record>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                                    <parameter name="field6" value="network-otn-is" />
-                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />
-                                                                                    <parameter name="field8" value="network-eth-is" />
-                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />
-                                                                                </record>
-                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                            </block>
-                                                                        </for>
-                                                                    </outcome>
-                                                                    <outcome value='false'>
-                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />
-                                                                            <parameter name="field1" value="__TIMESTAMP__" />
-                                                                            <parameter name="field2" value="networks_length" />
-                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />
-                                                                        </record>
+                                                                        <block atomic='true'>
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='network.' value='' />
+                                                                                    </set>
+                                                                                    <set>
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
+                                                                                    </set>
+                                                                                    <switch test='`$network.te-topology-id`'>
+                                                                                        <outcome value='1'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                        <outcome value='2'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </block>
+                                                                            </for>
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                        </block>
                                                                     </outcome>
                                                                 </switch>
                                                             </block>
@@ -324,8 +266,82 @@
                                 </switch>
                             </block>
                         </outcome>
-                        <outcome value='delete'>
-                            <block atomic="true"></block>
+                        <outcome value='Delete'>
+                            <block atomic="true">
+                                <switch test="`$prop.sdncRestApi.type`">
+                                    <outcome value='MSA'>
+                                        <block atomic='true'>
+                                            <set>
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+                                            </set>
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+                                                          key='SELECT controller_id
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE controller_id = $controllerid'
+                                                          pfx='dbcontrollerid'>
+                                                <outcome value='success'>
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='TAPI'>
+                                        <block>
+                                            <set>
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+                                            </set>
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
+                                                          key='SELECT controller_id
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
+WHERE controller_id = $controllerid'
+                                                          pfx='dbcontrollerid'>
+                                                <outcome value='success'>
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Failure in getting controller-id from DB" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='not-found'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />
+                                                    </return>
+                                                </outcome>
+                                            </get-resource>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </outcome>
                     </switch>
                 </outcome>