Support for "Modify" operation of a given Transport Slice.

[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 b2bf06c..d61c494 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
@@ -178,11 +178,12 @@
                                                                                                         <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
@@ -366,12 +367,12 @@
                                                                                                                                 <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
@@ -622,12 +623,12 @@
                                                                                                                                 <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
@@ -867,7 +868,6 @@
                                                                                                                 <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
@@ -875,6 +875,8 @@
                                                                                                                 <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
@@ -986,12 +988,13 @@
                                                                                                                                         <!--<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
@@ -1096,7 +1099,9 @@
                                         <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