Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Chore: Add gerrit maven verify GHA workflow
[sdnc/oam.git] / platform-logic / datachange / src / main / xml / DataChange_esr-thirdparty-sdnc-discovery.xml
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 110c9f6..b9e143d 100644 (file)
--- 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\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
     <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\r
         <block atomic="true">\r
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">\r
@@ -9,7 +9,7 @@
                         <outcome value='Update'>\r
                             <block>\r
                                 <switch test="`$prop.sdncRestApi.type`">\r
-                                    <outcome value='SOTN'>\r
+                                    <outcome value='WAN'>\r
                                         <block atomic="true">\r
                                             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
                                                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
@@ -21,10 +21,16 @@
                                                 <parameter name="format" value="json"/>\r
                                                 <parameter name="httpMethod" value="post"/>\r
                                                 <parameter name="responsePrefix" value="token-result"/>\r
-                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                <parameter name="disableHostVerification" value="true"/>\r
+                                                <parameter name="ssl" value="false"/>\r
                                                 <outcome value='success'>\r
                                                     <set>\r
                                                         <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\r
@@ -43,10 +49,12 @@
                                                         <parameter name="format" value="json"/>\r
                                                         <parameter name="httpMethod" value="get"/>\r
                                                         <parameter name="responsePrefix" value="topology"/>\r
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                        <parameter name="disableHostVerification" value="true"/>\r
+                                                        <parameter name="ssl" value="false"/>\r
                                                         <outcome value='failure'>\r
                                                             <return status='failure'>\r
                                                                 <parameter name='ack-final' value='Y'/>\r
@@ -58,12 +66,94 @@
                                                             <block atomic="true">\r
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                     <block>\r
+                                                                        <set>\r
+                                                                            <parameter name='network.' value='' />\r
+                                                                        </set>\r
                                                                         <set>\r
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <block atomic='true'>\r
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >\r
+                                                                                <block>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='network.' value='' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />\r
+                                                                                        <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />\r
+                                                                                        <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />\r
+                                                                                    </set>\r
+                                                                                    <switch test="`length($tmpo.client-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.client-id' value='`$network.client-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`length($tmpo.te-topo-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`length($tmpo.provider-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.provider-id' value='`$network.provider-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test='`$tmpo.te-topo-id`'>\r
+                                                                                        <outcome value='1'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='2'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='11'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='33'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </block>\r
+                                                                            </for>\r
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
@@ -76,10 +166,12 @@
                                                         <parameter name="format" value="json"/>\r
                                                         <parameter name="httpMethod" value="get"/>\r
                                                         <parameter name="responsePrefix" value="topology"/>\r
-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
-                                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
-                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->\r
+                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->\r
+                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->\r
+                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->\r
+                                                        <parameter name="disableHostVerification" value="true"/>\r
+                                                        <parameter name="ssl" value="false"/>\r
                                                         <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
                                                         <outcome value='failure'>\r
                                                             <return status='failure'>\r
@@ -92,12 +184,94 @@
                                                             <block atomic="true">\r
                                                                 <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                     <block>\r
+                                                                        <set>\r
+                                                                            <parameter name='network.' value='' />\r
+                                                                        </set>\r
                                                                         <set>\r
                                                                             <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <block atomic='true'>\r
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >\r
+                                                                                <block>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='network.' value='' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                    </set>\r
+                                                                                    <set>\r
+                                                                                        <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />\r
+                                                                                        <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />\r
+                                                                                        <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />\r
+                                                                                    </set>\r
+                                                                                    <switch test="`length($tmpo.client-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.client-id' value='`$network.client-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`length($tmpo.te-topo-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test="`length($tmpo.provider-id) == 0`">\r
+                                                                                        <outcome value='true'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='tmpo.provider-id' value='`$network.provider-id`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                    <switch test='`$tmpo.te-topo-id`'>\r
+                                                                                        <outcome value='1'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='2'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='11'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                        <outcome value='33'>\r
+                                                                                            <block>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
+                                                                                                </set>\r
+                                                                                            </block>\r
+                                                                                        </outcome>\r
+                                                                                    </switch>\r
+                                                                                </block>\r
+                                                                            </for>\r
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
+                                                                        </block>\r
+                                                                    </outcome>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
@@ -209,14 +383,14 @@
                                                 <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
                                             </set>\r
                                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-key='SELECT controller_id\r
+                                                          key='SELECT controller_id\r
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
 WHERE controller_id = $controllerid'\r
-pfx='dbcontrollerid'>\r
+                                                          pfx='dbcontrollerid'>\r
                                                 <outcome value='success'>\r
                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
-    resource="SQL"\r
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
+                                                            resource="SQL"\r
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
                                                 </outcome>\r
                                                 <outcome value='failure'>\r
                                                     <return status='failure'>\r
@@ -241,14 +415,14 @@ pfx='dbcontrollerid'>
                                                 <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
                                             </set>\r
                                             <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
-key='SELECT controller_id\r
+                                                          key='SELECT controller_id\r
 from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
 WHERE controller_id = $controllerid'\r
-pfx='dbcontrollerid'>\r
+                                                          pfx='dbcontrollerid'>\r
                                                 <outcome value='success'>\r
                                                     <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
-    resource="SQL"\r
-    key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
+                                                            resource="SQL"\r
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\r
                                                 </outcome>\r
                                                 <outcome value='failure'>\r
                                                     <return status='failure'>\r
SDNC OA&M tools