X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml;h=8e743ff6b15c88bbc26f8e97740792d0c46677c5;hb=7231f26f523c65f8fa12d0ddc36c7988dacda8a2;hp=4c336b635580709a8672bdf183abe4b540876da1;hpb=e701f57f223a51ff2e7b469332ff207ce4b09b4e;p=sdnc%2Foam.git

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 4c336b63..8e743ff6 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
@@ -35,12 +35,12 @@
                             <block>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="pnfs"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/pnfs?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"
                                               local-only="false"
                                               pfx="ccsdkTopopnfs" ></get-resource>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="logical-links"
-                                              key="selflink = 'https://aai.onap:8443/aai/v21/network/logical-links?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'"
                                               local-only="false"
                                               pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
@@ -386,9 +386,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -642,9 +642,9 @@
                                                                                                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                 <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -888,9 +888,9 @@
                                                                                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                                                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                                                                                 <parameter name='operational-status' value='Created' />
-                                                                                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                                                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                                                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -1011,9 +1011,9 @@
                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                        <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                        <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                        <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                        <!--<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                        <!--<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />-->
                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                     </save>
                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'