diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-01-29 22:22:22 +0000 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2021-01-29 22:25:43 +0000 |
| commit | 8f77d7fe0dd148054ed048642bf87ee7724dc2be (patch) | |
| tree | 6cbfcf8d317e4cb7f55f272b72e359d083f63fb2 /platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml | |
| parent | 5ccb63c95d1fc6b103801d728bf39c820eeff09f (diff) | |
Adding code in oder to supporting multiple E-Line services per each Transport Slice.
Issue-ID: SDNC-1458
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I1a503db48020ca2f085f4937638cdcd1764fef2d
Former-commit-id: 7189c44abd762ce9459c619e8da16ba46dfc35ff
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml | 37 |
1 files changed, 29 insertions, 8 deletions
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"/>
@@ -30,7 +30,15 @@ <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>
|