Adding code in oder to supporting multiple E-Line services per each Transport Slice.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index e1b76fa..f6c1c6f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -5,7 +5,7 @@
         <block atomic="true">\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />\r
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />\r
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`" />\r
                 <parameter name="restapiUser" value="`$prop.oof.user`" />\r
                 <parameter name="restapiPassword" value="`$prop.oof.password`" />\r
                 <parameter name="format" value="json"/>\r
@@ -29,8 +29,16 @@
             </execute>\r
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >\r
                 <block atomic="true">\r
+                    <set>\r
+                        <parameter name='otn-oof.link-name' value='' />\r
+                        <parameter name='tmp.aai.cross-link' value='' />\r
+                        <parameter name='tmp.aai.cross-link.' value='' />\r
+                        <parameter name='tmp.aai.cross-link.link-role' value='' />\r
+                    </set>\r
                     <set>\r
                         <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />\r
+                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />\r
+                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />\r
                     </set>\r
                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
                                   resource="logical-link"\r
@@ -46,13 +54,26 @@
                                                 <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>\r
                                                     <outcome value='p-interface'>\r
                                                         <block>\r
-                                                            <set>\r
-                                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />\r
-                                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />\r
-                                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />\r
-                                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />\r
-                                                            </set>\r
-                                                            <break/>\r
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>\r
+                                                                <outcome value='true'>\r
+                                                                    <block atomic="true">\r
+                                                                        <set>\r
+                                                                            <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />\r
+                                                                            <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />\r
+                                                                        </set>\r
+                                                                    </block>\r
+                                                                </outcome>\r
+                                                            </switch>\r
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>\r
+                                                                <outcome value='true'>\r
+                                                                    <block atomic="true">\r
+                                                                        <set>\r
+                                                                            <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />\r
+                                                                            <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />\r
+                                                                        </set>\r
+                                                                    </block>\r
+                                                                </outcome>\r
+                                                            </switch>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r