Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Passing a correct OTN tunnel ID and a correct Ethernet Service ID for deletion.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
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 33e7fac..4c6b84b 100644 (file)
--- 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>\r
                                                                                                 <set>\r
                                                                                                     <parameter name='maximum-bandwidth' value="`$tmp.aai.network-policy.max-bandwidth`" />\r
+                                                                                                    <parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\r
+                                                                                                </set>\r
+                                                                                                <set>\r
+                                                                                                    <parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\r
                                                                                                 </set>\r
                                                                                             </block>\r
                                                                                         </outcome>\r
@@ -158,6 +162,12 @@
                                                                                         </outcome>\r
                                                                                         <outcome value='success'>\r
                                                                                             <block>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>\r
+                                                                                                </execute>\r
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
+                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>\r
+                                                                                                </execute>\r
                                                                                                 <set>\r
                                                                                                     <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />\r
                                                                                                 </set>\r
@@ -335,13 +345,14 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\r
                                                                                                                             <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\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='' />\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='vpn-type' value='`$prop.sotn.vpnType`' />\r
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />\r
@@ -590,13 +601,14 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
                                                                                                                               key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\r
                                                                                                                             <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\r
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\r
                                                                                                                             <parameter name='operational-status' value='Created' />\r
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\r
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\r
                                                                                                                             <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\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='' />\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='vpn-type' value='`$prop.sotn.vpnType`' />\r
                                                                                                                             <parameter name='CIR' value='`$prop.sotn.cir`' />\r
@@ -698,7 +710,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-A.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-A.client-id`' />\r
@@ -710,6 +722,7 @@
                                                                                                     <parameter name='src-access-ltp-id' value='' />\r
                                                                                                     <parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\r
                                                                                                     <parameter name='dst-access-ltp-id' value='`$domain-A.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
@@ -733,7 +746,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\r
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\r
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\r
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\r
                                                                                                     <parameter name='access-provider-id' value='`$domain-B.provider-id`' />\r
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\r
                                                                                                     <parameter name='access-client-id' value='`$domain-B.client-id`' />\r
@@ -745,6 +758,7 @@
                                                                                                     <parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
                                                                                                     <!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\r
                                                                                                     <parameter name='dst-access-ltp-id' value='' />\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
@@ -766,7 +780,7 @@
                                                                                                     <parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\r
                                                                                                     <parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\r
                                                                                                     <parameter name='otn-dest-node' value='`$domain-A.node-id`' />\r
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />\r
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />\r
                                                                                                     <!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\r
                                                                                                     <parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\r
                                                                                                     <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
@@ -788,7 +802,7 @@
                                                                                                         <return status='failure'>\r
                                                                                                             <parameter name='ack-final' value='Y'/>\r
                                                                                                             <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />\r
+                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain A" />\r
                                                                                                         </return>\r
                                                                                                     </outcome>\r
                                                                                                     <outcome value='success'>\r
@@ -797,11 +811,11 @@
                                                                                                 </execute>\r
                                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                    <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' `" />\r
+                                                                                                    <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' `" />\r
                                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />\r
                                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />\r
                                                                                                     <parameter name="format" value="json"/>\r
-                                                                                                    <parameter name="httpMethod" value="post"/>\r
+                                                                                                    <parameter name="httpMethod" value="patch"/>\r
                                                                                                     <parameter name="responsePrefix" value="otn-oof"/>\r
                                                                                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                                                                                                     <parameter name="trustStorePassword" value="adminadmin"/>\r
@@ -812,7 +826,7 @@
                                                                                                         <return status='failure'>\r
                                                                                                             <parameter name='ack-final' value='Y'/>\r
                                                                                                             <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />\r
+                                                                                                            <parameter name="error-message" value="Error executing UNI Coloring for domain A" />\r
                                                                                                         </return>\r
                                                                                                     </outcome>\r
                                                                                                     <outcome value='success'>\r
@@ -824,7 +838,7 @@
                                                                                                     <parameter name='otn-source-node' value='`$domain-B.node-id`' />\r
                                                                                                     <parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\r
                                                                                                     <!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\r
-                                                                                                    <parameter name='bw-odu' value="`'0,' + $maximum-bandwidth /1000 *2 /3 `" />\r
+                                                                                                    <parameter name='bw-odu' value="`'0,' + $gfp`" />\r
                                                                                                     <parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\r
                                                                                                     <!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\r
                                                                                                     <parameter name='dst-ttp-id' value='' />\r
@@ -848,7 +862,7 @@
                                                                                                         <return status='failure'>\r
                                                                                                             <parameter name='ack-final' value='Y'/>\r
                                                                                                             <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />\r
+                                                                                                            <parameter name="error-message" value="Error executing slice creation api for domain B" />\r
                                                                                                         </return>\r
                                                                                                     </outcome>\r
                                                                                                     <outcome value='success'>\r
@@ -857,11 +871,11 @@
                                                                                                 </execute>\r
                                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`" />\r
-                                                                                                    <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' `" />\r
+                                                                                                    <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' `" />\r
                                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />\r
                                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />\r
                                                                                                     <parameter name="format" value="json"/>\r
-                                                                                                    <parameter name="httpMethod" value="post"/>\r
+                                                                                                    <parameter name="httpMethod" value="patch"/>\r
                                                                                                     <parameter name="responsePrefix" value="otn-oof"/>\r
                                                                                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>\r
                                                                                                     <parameter name="trustStorePassword" value="adminadmin"/>\r
@@ -872,7 +886,7 @@
                                                                                                         <return status='failure'>\r
                                                                                                             <parameter name='ack-final' value='Y'/>\r
                                                                                                             <parameter name="error-code" value="500" />\r
-                                                                                                            <parameter name="error-message" value="Error executing OOF api" />\r
+                                                                                                            <parameter name="error-message" value="Error executing UNI coloring for domain B" />\r
                                                                                                         </return>\r
                                                                                                     </outcome>\r
                                                                                                     <outcome value='success'>\r
SDNC OA&M tools