Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Cross-domain topology discovery for ACTN, bug fixing.
[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 a80f871..81e8bd2 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
@@ -64,94 +64,68 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
-                                                                <switch test='`$topology.networks.network_length`'>\r
-                                                                    <outcome value='2'>\r
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>\r
-                                                                            <outcome value='ethernet-topology'>\r
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>\r
-                                                                                    <outcome value='otn-topology'>\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='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
+                                                                                <switch test='`$network.te-topology-id`'>\r
+                                                                                    <outcome value='11'>\r
                                                                                         <block>\r
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                                                <parameter name="field2" value="networks_length" />\r
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                                                <parameter name="field4" value="network-type-is" />\r
+                                                                                                <parameter name="field5" value="OTN" />\r
+                                                                                            </record>\r
                                                                                             <set>\r
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />\r
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />\r
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                             </set>\r
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                                         </block>\r
                                                                                     </outcome>\r
-                                                                                    <outcome value='Other'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='error-code' value='' />\r
-                                                                                            <parameter name='error-message' value='' />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                </switch>\r
-                                                                            </outcome>\r
-                                                                            <outcome value='otn-topology'>\r
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>\r
-                                                                                    <outcome value='ethernet-topology'>\r
+                                                                                    <outcome value='33'>\r
                                                                                         <block>\r
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                                                <parameter name="field2" value="networks_length" />\r
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                                                <parameter name="field4" value="network-type-is" />\r
+                                                                                                <parameter name="field5" value="ETH" />\r
+                                                                                            </record>\r
                                                                                             <set>\r
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />\r
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />\r
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                             </set>\r
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                                         </block>\r
                                                                                     </outcome>\r
-                                                                                    <outcome value='Other'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='error-code' value='' />\r
-                                                                                            <parameter name='error-message' value='' />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
                                                                                 </switch>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
+                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                    <parameter name="field6" value="network-otn-is" />\r
+                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />\r
+                                                                                    <parameter name="field8" value="network-eth-is" />\r
+                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />\r
+                                                                                </record>\r
+                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
+                                                                            </block>\r
+                                                                        </for>\r
                                                                     </outcome>\r
-                                                                </switch>\r
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                              resource="network-resources"\r
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >\r
-                                                                    <outcome value='success'>\r
-                                                                        <switch test='tmp.aai.network-resources_length'>\r
-                                                                            <outcome value='4'>\r
-                                                                                <block atomic='true'>\r
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >\r
-                                                                                        <block>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='otnidx' value='0' />\r
-                                                                                            </set>\r
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>\r
-                                                                                                <outcome value='otn-topology'>\r
-                                                                                                    <block>\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />\r
-                                                                                                        </set>\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />\r
-                                                                                                        </set>\r
-                                                                                                    </block>\r
-                                                                                                </outcome>\r
-                                                                                            </switch>\r
-                                                                                        </block>\r
-                                                                                    </for>\r
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>\r
-                                                                                </block>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='not-found'>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='error-code' value='' />\r
-                                                                            <parameter name='error-message' value='' />\r
-                                                                        </return>\r
+                                                                    <outcome value='false'>\r
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                            <parameter name="field2" value="networks_length" />\r
+                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                        </record>\r
                                                                     </outcome>\r
-                                                                    <outcome value='Other'>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='error-code' value='' />\r
-                                                                            <parameter name='error-message' value='' />\r
-                                                                        </return>\r
-                                                                    </outcome>\r
-                                                                </get-resource>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
@@ -186,94 +160,68 @@
                                                                         <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
-                                                                <switch test='`$topology.networks.network_length`'>\r
-                                                                    <outcome value='2'>\r
-                                                                        <switch test='`$topology.networks.network[0].network-types`'>\r
-                                                                            <outcome value='ethernet-topology'>\r
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>\r
-                                                                                    <outcome value='otn-topology'>\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='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
+                                                                                <switch test='`$network.te-topology-id`'>\r
+                                                                                    <outcome value='11'>\r
                                                                                         <block>\r
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                                                <parameter name="field2" value="networks_length" />\r
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                                                <parameter name="field4" value="network-type-is" />\r
+                                                                                                <parameter name="field5" value="OTN" />\r
+                                                                                            </record>\r
                                                                                             <set>\r
-                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />\r
-                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />\r
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                             </set>\r
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                                         </block>\r
                                                                                     </outcome>\r
-                                                                                    <outcome value='Other'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='error-code' value='' />\r
-                                                                                            <parameter name='error-message' value='' />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
-                                                                                </switch>\r
-                                                                            </outcome>\r
-                                                                            <outcome value='otn-topology'>\r
-                                                                                <switch test='`$topology.networks.network[1].network-types`'>\r
-                                                                                    <outcome value='ethernet-topology'>\r
+                                                                                    <outcome value='33'>\r
                                                                                         <block>\r
+                                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                                <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                                <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                                                <parameter name="field2" value="networks_length" />\r
+                                                                                                <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                                                <parameter name="field4" value="network-type-is" />\r
+                                                                                                <parameter name="field5" value="ETH" />\r
+                                                                                            </record>\r
                                                                                             <set>\r
-                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />\r
-                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />\r
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                             </set>\r
-                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                                         </block>\r
                                                                                     </outcome>\r
-                                                                                    <outcome value='Other'>\r
-                                                                                        <return status='failure'>\r
-                                                                                            <parameter name='error-code' value='' />\r
-                                                                                            <parameter name='error-message' value='' />\r
-                                                                                        </return>\r
-                                                                                    </outcome>\r
                                                                                 </switch>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
+                                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                                    <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                                    <parameter name="field6" value="network-otn-is" />\r
+                                                                                    <parameter name="field7" value="`$network-otn.te-topology-id`" />\r
+                                                                                    <parameter name="field8" value="network-eth-is" />\r
+                                                                                    <parameter name="field9" value="`$network-eth.te-topology-id`" />\r
+                                                                                </record>\r
+                                                                                <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
+                                                                            </block>\r
+                                                                        </for>\r
                                                                     </outcome>\r
-                                                                </switch>\r
-                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
-                                                                              resource="network-resources"\r
-                                                                              pfx='tmp.aai.network-resources' local-only='false' >\r
-                                                                    <outcome value='success'>\r
-                                                                        <switch test='tmp.aai.network-resources_length'>\r
-                                                                            <outcome value='4'>\r
-                                                                                <block atomic='true'>\r
-                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >\r
-                                                                                        <block>\r
-                                                                                            <set>\r
-                                                                                                <parameter name='otnidx' value='0' />\r
-                                                                                            </set>\r
-                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>\r
-                                                                                                <outcome value='otn-topology'>\r
-                                                                                                    <block>\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />\r
-                                                                                                        </set>\r
-                                                                                                        <set>\r
-                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />\r
-                                                                                                        </set>\r
-                                                                                                    </block>\r
-                                                                                                </outcome>\r
-                                                                                            </switch>\r
-                                                                                        </block>\r
-                                                                                    </for>\r
-                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>\r
-                                                                                </block>\r
-                                                                            </outcome>\r
-                                                                        </switch>\r
-                                                                    </outcome>\r
-                                                                    <outcome value='not-found'>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='error-code' value='' />\r
-                                                                            <parameter name='error-message' value='' />\r
-                                                                        </return>\r
+                                                                    <outcome value='false'>\r
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                                                                            <parameter name="file" value="/opt/onap/logSdncDiscovery.txt" />\r
+                                                                            <parameter name="field1" value="__TIMESTAMP__" />\r
+                                                                            <parameter name="field2" value="networks_length" />\r
+                                                                            <parameter name="field3" value="`$topology.networks.network_length`" />\r
+                                                                        </record>\r
                                                                     </outcome>\r
-                                                                    <outcome value='Other'>\r
-                                                                        <return status='failure'>\r
-                                                                            <parameter name='error-code' value='' />\r
-                                                                            <parameter name='error-message' value='' />\r
-                                                                        </return>\r
-                                                                    </outcome>\r
-                                                                </get-resource>\r
+                                                                </switch>\r
                                                             </block>\r
                                                         </outcome>\r
                                                     </execute>\r
SDNC OA&M tools