diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 89 insertions, 78 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml index c1e677ba..ec76dae8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml @@ -74,87 +74,98 @@ key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
AND depth = '0'"
pfx='tmp.aai.generic-vnf' local-only='false' >
- <block>
- <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
- <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
- <outcome value='uni'>
- <block atomic="true">
- <set>
- <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
- <parameter name="regex" value="nodeId"/>
- <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
- <outcome value='success'>
- <set>
- <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
- <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
- </set>
- </outcome>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='error-code' value='' />
- <parameter name='error-message' value="An error occured while splitting sna1_route" />
- </return>
- </outcome>
- </execute>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="pnf"
- key="`pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name AND depth = '0'`"
- pfx='tmp.aai.pnf' local-only='false' >
- <outcome value='success'>
- <block>
+ <outcome value='success'>
+ <block>
+ <for silentFailure='true' index='vidx' start='0' end='`$tmp.aai.generic-vnf.relationship-list.relationship_length`' >
+ <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+ <outcome value='uni'>
+ <block atomic="true">
+ <set>
+ <parameter name='`tmp.unis.uni[$vidx].tpId`' value="`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].relationship-data[0].relationship-value`" />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`tmp.unis.uni[$vidx].tpId`'/>
+ <parameter name="regex" value="nodeId"/>
+ <parameter name="tmp.unis.uni[$vidx].pnf-name" value=""/>
+ <outcome value='success'>
<set>
- <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+ <parameter name='prop.lan.ip-address' value='`$ipandMask[0]`' />
+ <parameter name='prop.lan.prefixLength' value='`$ipandMask[1]`' />
</set>
- <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
- <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
- <outcome value='thirdparty-controller'>
- <block atomic="true">
- <set>
- <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
- </set>
- </block>
- </outcome>
- <outcome value='network-resource'>
- <block atomic="true">
- <set>
- <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
- </set>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value="An error occured while splitting sna1_route" />
+ </return>
+ </outcome>
+ </execute>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="pnf"
+ key="'pnf.pnf-name = $tmp.unis.uni[$vidx].pnf-name'
+ AND depth = '0'"
+ pfx='tmp.aai.pnf' local-only='false' >
+ <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+ <!-- resource="generic-vnf" -->
+ <!-- key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id' -->
+ <!-- AND depth = '0'"-->
+ <!-- pfx='tmp.aai.generic-vnf' local-only='false' >-->
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='`$tmp.unis.uni[$vidx].node-id`' value="`$tmp.aai.pnf.pnf-id`" />
+ </set>
+ <for silentFailure='true' index='ridx' start='0' end='`$tmp.aai.pnf.relationship-list.relationship_length`' >
+ <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$vidx].related-to`'>
+ <outcome value='thirdparty-controller'>
+ <block atomic="true">
+ <set>
+ <parameter name='`$tmp.unis.uni[$vidx].thirdparty-sdnc-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='network-resource'>
+ <block atomic="true">
+ <set>
+ <parameter name='`$tmp.unis.uni[$vidx].network-id`' value="`$tmp.aai.pnf.relationship-list.relationship[$ridx].relationship-data[0].relationship-value`" />
+ </set>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="network-resource"
- key="`network-resource.network-id = $tmp.unis.uni[$vidx].network-id AND depth = '0'`"
+ key="'network-resource.network-id = $tmp.unis.uni[$vidx].network-id'
+ AND depth = '0'"
pfx='tmp.aai.network-resource' local-only='false' >
- <outcome value='success'>
- <set>
- <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
- <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
- <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
- <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
- <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
- </set>
- </outcome>
- </get-resource>
- </block>
- </outcome>
- </switch>
- </for>
- </block>
- </outcome>
- </get-resource>
- </block>
+ <outcome value='success'>
+ <set>
+ <parameter name="`$tmp.unis.uni[$vidx].network-id`" value="`$tmp.aai.network-resource.network-id`" />
+ <parameter name="`$tmp.unis.uni[$vidx].provider-id`" value="`$tmp.aai.network-resource.provider-id`" />
+ <parameter name="`$tmp.unis.uni[$vidx].client-id`" value="`$tmp.aai.network-resource.client-id`" />
+ <parameter name="`$tmp.unis.uni[$vidx].te-topo-id`" value="`$tmp.aai.network-resource.te-topo-id`" />
+ <parameter name="`$tmp.unis.uni[$vidx].network-type`" value="`$tmp.aai.network-resource.network-type`" />
+ </set>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ </block>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$tmp.unis.uni_length < 2`' >
+ <outcome value='true'>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
</outcome>
</switch>
- </for>
- <switch test='`$tmp.unis.uni_length < 2`' >
- <outcome value='true'>
- <return status='success'>
- <parameter name='' value='' />
- </return>
- </outcome>
- </switch>
- </block>
+ </block>
+ </outcome>
</get-resource>
<call module='GENERIC-RESOURCE-API' rpc='sotn-get-otn-tunnel-path-from-oof' mode='sync' ></call>
<for index='vidx' start='0' end='`$tmp.unis.uni_length`' >
diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml index a549708d..e582fb7e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml @@ -129,11 +129,11 @@ key="'generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
AND depth = '0'"
pfx='tmp.aai.generic-vnf' local-only='false' >
- <block>
+ <outcome value='success'>
<set>
- <parameter name="tmp.relationship_length" value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>
+ <parameter name='tmp.relationship_length' value='`$tmp.aai.generic-vnf.relationship-list.relation_length`'/>
</set>
- </block>
+ </outcome>
</get-resource>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf:relationship-list'
key='generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id'
|