diff options
| author |   Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2022-04-29 04:24:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-04-29 04:24:39 +0000 |
| commit | bc1efc898fb2cdf122e5239d8ae2da81cdec5e9e (patch) | |
| tree | e9f939bab06b6e9adaa9b913ca5b96859b94fa62 /platform-logic/generic-resource-api/src/main/xml/trans_slicing | |
| parent | 9d8ae6d68ea8427052ec45326e22f3a2ea7ed081 (diff) | |
| parent | 7231f26f523c65f8fa12d0ddc36c7988dacda8a2 (diff) | |
Merge "- Removing model-invariant-id, model-customization-id, and model-version-id from the payload when creating connectivity and vpn-binding in AAI. - Adding an explicit depth=0 in the selflink URL when fetching all pnfs."
Former-commit-id: 79c67d0ec1e2cc7e5707ce82fcd2c520cb70ebb8
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/trans_slicing')
2 files changed, 28 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-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'
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml index 9a8a9179..bc0505d4 100644 --- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.xml +++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-modify.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>
@@ -500,9 +500,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'
@@ -756,9 +756,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'
@@ -998,9 +998,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`' />
@@ -1120,9 +1120,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'
|