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=b9e143d8494bd08243f1c110858c9733bc57150f;hb=refs%2Fheads%2Fmaster;hp=110c9f617640848f3773734b16956da821c89bee;hpb=514181267234844f79768cef214ab5608ecab391;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 110c9f61..b9e143d8 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'`">
@@ -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' />
@@ -21,10 +21,16 @@
                                                 <parameter name="format" value="json"/>
                                                 <parameter name="httpMethod" value="post"/>
                                                 <parameter name="responsePrefix" value="token-result"/>
-                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                <parameter name="trustStorePassword" value="adminadmin"/>
-                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                <parameter name="disableHostVerification" value="true"/>
+                                                <parameter name="ssl" value="false"/>
                                                 <outcome value='success'>
                                                     <set>
                                                         <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
@@ -43,10 +49,12 @@
                                                         <parameter name="format" value="json"/>
                                                         <parameter name="httpMethod" value="get"/>
                                                         <parameter name="responsePrefix" value="topology"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                        <parameter name="disableHostVerification" value="true"/>
+                                                        <parameter name="ssl" value="false"/>
                                                         <outcome value='failure'>
                                                             <return status='failure'>
                                                                 <parameter name='ack-final' value='Y'/>
@@ -58,12 +66,94 @@
                                                             <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 >= 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>
+                                                                                    <set>
+                                                                                        <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />
+                                                                                        <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+                                                                                        <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />
+                                                                                    </set>
+                                                                                    <switch test="`length($tmpo.client-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.client-id' value='`$network.client-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test="`length($tmpo.te-topo-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test="`length($tmpo.provider-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.provider-id' value='`$network.provider-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test='`$tmpo.te-topo-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>
+                                                                                        <outcome value='11'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                        <outcome value='33'>
+                                                                                            <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>
                                                         </outcome>
                                                     </execute>
@@ -76,10 +166,12 @@
                                                         <parameter name="format" value="json"/>
                                                         <parameter name="httpMethod" value="get"/>
                                                         <parameter name="responsePrefix" value="topology"/>
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                        <parameter name="disableHostVerification" value="true"/>
+                                                        <parameter name="ssl" value="false"/>
                                                         <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                                         <outcome value='failure'>
                                                             <return status='failure'>
@@ -92,12 +184,94 @@
                                                             <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 >= 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>
+                                                                                    <set>
+                                                                                        <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />
+                                                                                        <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+                                                                                        <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />
+                                                                                    </set>
+                                                                                    <switch test="`length($tmpo.client-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.client-id' value='`$network.client-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test="`length($tmpo.te-topo-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test="`length($tmpo.provider-id) == 0`">
+                                                                                        <outcome value='true'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='tmpo.provider-id' value='`$network.provider-id`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                    <switch test='`$tmpo.te-topo-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>
+                                                                                        <outcome value='11'>
+                                                                                            <block>
+                                                                                                <set>
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+                                                                                                </set>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                        <outcome value='33'>
+                                                                                            <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>
                                                         </outcome>
                                                     </execute>
@@ -209,14 +383,14 @@
                                                 <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
+                                                          key='SELECT controller_id
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
+                                                          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>
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
                                                 </outcome>
                                                 <outcome value='failure'>
                                                     <return status='failure'>
@@ -241,14 +415,14 @@ pfx='dbcontrollerid'>
                                                 <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
+                                                          key='SELECT controller_id
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE
 WHERE controller_id = $controllerid'
-pfx='dbcontrollerid'>
+                                                          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>
+                                                            resource="SQL"
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
                                                 </outcome>
                                                 <outcome value='failure'>
                                                     <return status='failure'>