<outcome value='false'></outcome>\r
<outcome value='true'>\r
<block>\r
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+ resource="pnfs"\r
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"\r
+ local-only="false"\r
+ pfx="ccsdkTopopnfs" ></get-resource>\r
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+ resource="logical-links"\r
+ key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"\r
+ local-only="false"\r
+ pfx="ccsdkTopologicalLinks" ></get-resource>\r
<set>\r
<parameter name='tmp.arr' value='' />\r
<parameter name='tmp.arridx' value='0' />\r
<parameter name='tmp.arr_length' value='0' />\r
<parameter name='otn-tunnel-slice' value='' />\r
<parameter name='otn-tunnel-slice_length' value='0' />\r
- <parameter name='tmp.slicevpns' value='' />\r
- <parameter name='tmp.slicevpns_length' value='0' />\r
- <parameter name='tmp.slicevpnuuids' value='' />\r
- <parameter name='tmp.slicevpnuuids.' value='' />\r
+ <!--<parameter name='tmp.slicevpns' value='' />-->\r
+ <!--<parameter name='tmp.slicevpns_length' value='0' />-->\r
+ <!--<parameter name='tmp.slicevpnuuids' value='' />-->\r
+ <!--<parameter name='tmp.slicevpnuuids.' value='' />-->\r
</set>\r
<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\r
<set>\r
<parameter name="ctx-destination" value="prop.otn-tunnel-name"/>\r
</execute>\r
<set>\r
- <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />\r
+ <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->\r
+ <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />\r
</set>\r
<set>\r
- <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />-->\r
- <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />\r
+ <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />\r
+ <!--<parameter name='network-route-A' value="`$tmp.aai.logical-link.link-id`" />-->\r
</set>\r
<set>\r
<parameter name='network-route-B' value="`$tmp.aai.logical-link.link-name2`" />\r
<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\r
<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
- <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\r
- <parameter name='CIR' value='`$prop.sotn.cir`' />\r
- <parameter name='EIR' value='`$prop.sotn.eir`' />\r
- <parameter name='CBS' value='`$prop.sotn.cbs`' />\r
- <parameter name='EBS' value='`$prop.sotn.ebs`' />\r
+ <parameter name='cir' value='`$gfp *1000000`' />\r
+ <parameter name='eir' value='`$gfp *1000000`' />\r
+ <parameter name='cbs' value='`$prop.sotn.cbs`' />\r
+ <parameter name='ebs' value='`$prop.sotn.ebs`' />\r
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\r
<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\r
- <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\r
- <parameter name='CIR' value='`$prop.sotn.cir`' />\r
- <parameter name='EIR' value='`$prop.sotn.eir`' />\r
- <parameter name='CBS' value='`$prop.sotn.cbs`' />\r
- <parameter name='EBS' value='`$prop.sotn.ebs`' />\r
+ <parameter name='cir' value='`$gfp *1000000`' />\r
+ <parameter name='eir' value='`$gfp *1000000`' />\r
+ <parameter name='cbs' value='`$prop.sotn.cbs`' />\r
+ <parameter name='ebs' value='`$prop.sotn.ebs`' />\r
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
<parameter name='prop.ethsrvType' value='`$network-route-A`' />\r
</set>\r
<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' ></call>\r
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\r
+ <parameter name="filename" value="`$filenamemm`" />\r
+ </execute>\r
<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >\r
<block atomic='true'>\r
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
</get-resource>\r
<switch test='`$otnidx == 0`'>\r
<outcome value='true'>\r
- <set>\r
- <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
- <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
- </set>\r
+ <block>\r
+ <set>\r
+ <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
+ <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\r
+ </set>\r
+ </block>\r
</outcome>\r
<outcome value='false'>\r
<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\r
<outcome value='true'>\r
- <set>\r
- <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
- <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
- </set>\r
+ <block>\r
+ <set>\r
+ <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\r
+ <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
+ </set>\r
+ </block>\r
</outcome>\r
<outcome value='false'>\r
<set>\r
<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\r
<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\r
<parameter name='route-distinguisher' value='`$gfp`' />\r
- <parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\r
<parameter name='operational-status' value='Created' />\r
<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\r
<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\r
<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\r
<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\r
<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\r
+ <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\r
+ <parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />\r
<outcome value='success'>\r
- <block>\r
- <set>\r
- <parameter name='`tmp.slicevpns[$tmp.slicevpns_length]`' value="`$prop.vpn-binding-otnidx-uuid`" />\r
- <parameter name='tmp.slicevpns_length' value="`$tmp.slicevpns_length + 1`" />\r
- <parameter name='`tmp.slicevpnuuids[$prop.vpn-binding-otnidx-uuid]`' value="`$prop.vpn-binding-otnidx-uuid`" />\r
- </set>\r
- </block>\r
+ <block></block>\r
</outcome>\r
</save>\r
<switch test='`$otnidx == 0`'>\r
<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\r
<!--<parameter name='access-ltp-id' value='``' />-->\r
<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->\r
- <parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\r
+ <!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\r
+ <parameter name='bandwidth-profile-name' value='`$gfp`' />\r
<parameter name='vpn-type' value='dummy' />\r
- <!--<parameter name='CIR' value='`$prop.sotn.cir`' />-->\r
- <!--<parameter name='EIR' value='`$prop.sotn.eir`' />-->\r
- <!--<parameter name='CBS' value='`$prop.sotn.cbs`' />-->\r
- <!--<parameter name='EBS' value='`$prop.sotn.ebs`' />-->\r
+ <parameter name='cir' value='`$gfp *1000000`' />\r
+ <parameter name='eir' value='`$gfp *1000000`' />\r
+ <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\r
+ <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\r
<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\r
<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\r
<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\r
<block atomic="true">\r
<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
<block atomic='true'>\r
- <switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">\r
+ <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->\r
+ <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\r
+ <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.aai.service-instance.service-instance-id `">\r
<outcome value='true'>\r
<block atomic='true'>\r
<set>\r