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=ebed9d63ff191370fe51436f9485539a02b9680a;hb=03a1b2b63cf77790d357e15f2cd20a197ec6d26f;hp=a80f8710650d2b7a2bc41bfefcc0d16df4fad296;hpb=0a8e7414c87424bd9bf0616d14bce525c9a16e24;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 a80f8710..ebed9d63 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
@@ -9,7 +9,7 @@
                         <outcome value='Update'>
                             <block>
                                 <switch test="`$prop.sdncRestApi.type`">
-                                    <outcome value='SOTN'>
+                                    <outcome value='WAN'>
                                         <block atomic="true">
                                             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                                                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
@@ -58,100 +58,48 @@
                                                             <block atomic="true">
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >
                                                                     <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='' />
+                                                                        </set>
                                                                         <set>
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
                                                                         </set>
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length`'>
-                                                                    <outcome value='2'>
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>
-                                                                            <outcome value='ethernet-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='otn-topology'>
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
-                                                                                            </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                            <outcome value='otn-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='ethernet-topology'>
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
-                                                                                            </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </outcome>
-                                                                </switch>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                              resource="network-resources"
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <switch test='tmp.aai.network-resources_length'>
-                                                                            <outcome value='4'>
-                                                                                <block atomic='true'>
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='otnidx' value='0' />
-                                                                                            </set>
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
-                                                                                                <outcome value='otn-topology'>
-                                                                                                    <block>
-                                                                                                        <set>
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
-                                                                                                        </set>
-                                                                                                        <set>
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
-                                                                                                        </set>
-                                                                                                    </block>
-                                                                                                </outcome>
-                                                                                            </switch>
-                                                                                        </block>
-                                                                                    </for>
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
+                                                                <switch test='`$topology.networks.network_length >= 2`'>
+                                                                    <outcome value='true'>
+                                                                        <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-identifier.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>
-                                                                            </outcome>
-                                                                        </switch>
+                                                                            </for>
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                        </block>
                                                                     </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
+                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -180,100 +128,48 @@
                                                             <block atomic="true">
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >
                                                                     <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='' />
+                                                                        </set>
                                                                         <set>
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
                                                                         </set>
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
                                                                     </block>
                                                                 </for>
-                                                                <switch test='`$topology.networks.network_length`'>
-                                                                    <outcome value='2'>
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>
-                                                                            <outcome value='ethernet-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='otn-topology'>
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
-                                                                                            </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                            <outcome value='otn-topology'>
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>
-                                                                                    <outcome value='ethernet-topology'>
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
-                                                                                            </set>
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='Other'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </outcome>
-                                                                </switch>
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                              resource="network-resources"
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >
-                                                                    <outcome value='success'>
-                                                                        <switch test='tmp.aai.network-resources_length'>
-                                                                            <outcome value='4'>
-                                                                                <block atomic='true'>
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
-                                                                                        <block>
-                                                                                            <set>
-                                                                                                <parameter name='otnidx' value='0' />
-                                                                                            </set>
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
-                                                                                                <outcome value='otn-topology'>
-                                                                                                    <block>
-                                                                                                        <set>
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
-                                                                                                        </set>
-                                                                                                        <set>
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
-                                                                                                        </set>
-                                                                                                    </block>
-                                                                                                </outcome>
-                                                                                            </switch>
-                                                                                        </block>
-                                                                                    </for>
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
+                                                                <switch test='`$topology.networks.network_length >= 2`'>
+                                                                    <outcome value='true'>
+                                                                        <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-identifier.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>
-                                                                            </outcome>
-                                                                        </switch>
-                                                                    </outcome>
-                                                                    <outcome value='not-found'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
+                                                                            </for>
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                        </block>
                                                                     </outcome>
-                                                                    <outcome value='Other'>
-                                                                        <return status='failure'>
-                                                                            <parameter name='error-code' value='' />
-                                                                            <parameter name='error-message' value='' />
-                                                                        </return>
-                                                                    </outcome>
-                                                                </get-resource>
+                                                                </switch>
                                                             </block>
                                                         </outcome>
                                                     </execute>
@@ -376,8 +272,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>