Bug fixing required for integration testing with PCE.

[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 d61c494..446a74a 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
@@ -33,16 +33,26 @@
                         <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
@@ -721,6 +731,9 @@
                                                                                                         <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
@@ -828,18 +841,22 @@
                                                                                                             </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
@@ -878,13 +895,7 @@
                                                                                                                 <!-- 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