diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-11-11 16:01:57 +0000 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2020-11-12 03:51:50 +0000 |
| commit | 1d98b77f5794ce6f2ec457ae5cc73a5d4601491a (patch) | |
| tree | fc4caa524e1d6a1929408dbcbfe3485f3dfa7336 /platform-logic/generic-resource-api/src/main/xml/trans_slicing | |
| parent | be9c4ac3e4723913ba37f2acc11a14e77165b332 (diff) | |
- Changing POST operation to PATCH for OTN Tunnel creation.
- Adding Transport Slicing DGs into graph.versions
- Fixing template files for OTN tunnel creation
Issue-ID: SDNC-1413
Change-Id: I3ddabd4c0d361a4e0d5e98caf86e9bb361b41b63
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Former-commit-id: 97afd8c7495cf23e8819cb666be9ccbe4f968f68
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/trans_slicing')
4 files changed, 37 insertions, 28 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml index c3b48106..3af9347e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml @@ -43,6 +43,9 @@ pfx="tmp.aai.vpn-binding" >
<outcome value='success'>
<block atomic="true">
+ <set>
+ <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+ </set>
<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
<outcome value='Other'>
<block atomic="true">
@@ -149,7 +152,7 @@ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
+ <parameter name="httpMethod" value="patch"/>
<parameter name="responsePrefix" value="otn-oof"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -160,7 +163,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
</return>
</outcome>
<outcome value='success'>
@@ -185,7 +188,7 @@ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
+ <parameter name="httpMethod" value="patch"/>
<parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
<parameter name="responsePrefix" value="vpn-result"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
@@ -196,7 +199,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing Create ethernet service rest api" />
</return>
</outcome>
<outcome value='success'>
@@ -231,7 +234,7 @@ <parameter name='src-tpn-id' value='1' />
<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
- <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+ <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
@@ -324,7 +327,7 @@ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
+ <parameter name="httpMethod" value="patch"/>
<parameter name="responsePrefix" value="otn-oof"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -335,7 +338,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
</return>
</outcome>
<outcome value='success'>
@@ -371,7 +374,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing Create ethernet service rest api" />
</return>
</outcome>
<outcome value='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml index 33e7facb..02312230 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml @@ -123,6 +123,10 @@ <block>
<set>
<parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />
+ <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
+ </set>
+ <set>
+ <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />
</set>
</block>
</outcome>
@@ -710,6 +714,7 @@ <parameter name='src-access-ltp-id' value='' />
<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />
<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />
+ <parameter name='route-distinguisher' value='`$gfp`' />
<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
<parameter name='operational-status' value='Created' />
<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
@@ -745,6 +750,7 @@ <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->
<parameter name='dst-access-ltp-id' value='' />
+ <parameter name='route-distinguisher' value='`$gfp`' />
<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />
<parameter name='operational-status' value='Created' />
<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
@@ -766,7 +772,7 @@ <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />
<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
<parameter name='otn-dest-node' value='`$domain-A.node-id`' />
- <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+ <parameter name='bw-odu' value="`'0,' + $gfp`" />
<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->
<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />
<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
@@ -788,7 +794,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing OOF api" />
+ <parameter name="error-message" value="Error executing slice creation api for domain A" />
</return>
</outcome>
<outcome value='success'>
@@ -797,11 +803,11 @@ </execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
+ <parameter name="httpMethod" value="patch"/>
<parameter name="responsePrefix" value="otn-oof"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -812,7 +818,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing OOF api" />
+ <parameter name="error-message" value="Error executing UNI Coloring for domain A" />
</return>
</outcome>
<outcome value='success'>
@@ -824,7 +830,7 @@ <parameter name='otn-source-node' value='`$domain-B.node-id`' />
<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->
- <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />
+ <parameter name='bw-odu' value="`'0,' + $gfp`" />
<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />
<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->
<parameter name='dst-ttp-id' value='' />
@@ -848,7 +854,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing OOF api" />
+ <parameter name="error-message" value="Error executing slice creation api for domain B" />
</return>
</outcome>
<outcome value='success'>
@@ -857,11 +863,11 @@ </execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="post"/>
+ <parameter name="httpMethod" value="patch"/>
<parameter name="responsePrefix" value="otn-oof"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -872,7 +878,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing OOF api" />
+ <parameter name="error-message" value="Error executing UNI coloring for domain B" />
</return>
</outcome>
<outcome value='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml index 2517645d..3fe38029 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml @@ -128,9 +128,9 @@ </get-resource>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
- <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
- <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`" />
+ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+ <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
<parameter name="format" value="json"/>
<parameter name="httpMethod" value="delete"/>
<parameter name="responsePrefix" value="otn-oof"/>
@@ -143,7 +143,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
</return>
</outcome>
<outcome value='success'>
@@ -151,7 +151,7 @@ </outcome>
</execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.connectivity-id`" />
<!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
<!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
@@ -168,7 +168,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing delete ethernet service rest api" />
</return>
</outcome>
<outcome value='success'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml index 648929a6..b6ddc9ad 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.xml @@ -135,7 +135,7 @@ <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
<parameter name="format" value="json"/>
- <parameter name="httpMethod" value="delete"/>
+ <parameter name="httpMethod" value="post"/>
<parameter name="responsePrefix" value="otn-oof"/>
<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
<parameter name="trustStorePassword" value="adminadmin"/>
@@ -146,7 +146,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing Create vpn rest api" />
+ <parameter name="error-message" value="Error executing deallocate transport slice rest api" />
</return>
</outcome>
<outcome value='success'>
@@ -155,7 +155,7 @@ </execute>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />-->
- <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id + '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:tp-slice-id' `" />
+ <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id + '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `" />
<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
<parameter name="format" value="json"/>
@@ -170,7 +170,7 @@ <return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error executing OOF api" />
+ <parameter name="error-message" value="Error executing decoloring UNI rest api" />
</return>
</outcome>
<outcome value='success'>
|