X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml;h=f6c1c6f85d3ed7c6887f2f940274aa93216c1d1f;hb=8f77d7fe0dd148054ed048642bf87ee7724dc2be;hp=e1b76faf6380c15bbd961ae3c340678dacea2f3f;hpb=5ccb63c95d1fc6b103801d728bf39c820eeff09f;p=sdnc%2Foam.git

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 e1b76faf..f6c1c6f8 100644
--- 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">
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`" />
-                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />
+                <parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`" />
                 <parameter name="restapiUser" value="`$prop.oof.user`" />
                 <parameter name="restapiPassword" value="`$prop.oof.password`" />
                 <parameter name="format" value="json"/>
@@ -29,8 +29,16 @@
             </execute>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
+                    <set>
+                        <parameter name='otn-oof.link-name' value='' />
+                        <parameter name='tmp.aai.cross-link' value='' />
+                        <parameter name='tmp.aai.cross-link.' value='' />
+                        <parameter name='tmp.aai.cross-link.link-role' value='' />
+                    </set>
                     <set>
                         <parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].link`' />
+                        <parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].start_node`' />
+                        <parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].end_node`' />
                     </set>
                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                   resource="logical-link"
@@ -46,13 +54,26 @@
                                                 <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].related-to`'>
                                                     <outcome value='p-interface'>
                                                         <block>
-                                                            <set>
-                                                                <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
-                                                                <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[1].relationship-value`" />
-                                                                <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
-                                                                <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx + 1].relationship-data[0].relationship-value`" />
-                                                            </set>
-                                                            <break/>
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.start-node`'>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.cross-link.src-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                            <parameter name='tmp.src-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                            <switch test='`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value == $otn-oof.end-node`'>
+                                                                <outcome value='true'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.cross-link.dst-ltpId' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[1].relationship-value`" />
+                                                                            <parameter name='tmp.dst-pnf-name' value="`$tmp.aai.cross-link.relationship-list.relationship[$lridx].relationship-data[0].relationship-value`" />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
                                                         </block>
                                                     </outcome>
                                                 </switch>