diff options
| author |   Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2022-05-10 14:44:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-05-10 14:44:51 +0000 |
| commit | 49fb47f938b8196f68cb4fb6804045850887d58e (patch) | |
| tree | c8a1305ff9e497b054f6f3aa7001344ce71bb0bd /platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml | |
| parent | e54d78b487fd118a6f53e0493e0e17aacb3b2ca9 (diff) | |
| parent | 645b21298c9a4aff5f3f625eabb586fff40db732 (diff) | |
Merge "Making sure not to use the same CLL instance name for all endpoints' description attribute."
Former-commit-id: 1019e164d28fddc912c32156d4565ab3c0c3a8c4
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml index 61661e21..49a61aab 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml @@ -609,6 +609,8 @@ <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' /> <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' /> <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' /> + <!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />--> + <parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' /> <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' /> </set> <set> @@ -768,7 +770,7 @@ <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' /> <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' /> <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' /> - <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' /> + <!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />--> <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />--> <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />--> <!--<parameter name='index-number' value='0' />--> @@ -958,6 +960,8 @@ <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' /> <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' /> <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' /> + <!--<parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.service-instance.service-instance-id`' />--> + <parameter name='`ethernet-srv-end-points-list[$epidx].service-instance-id-or-cll-id`' value='`$tmp.aai.uni.data-owner`' /> <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' /> </set> <set> @@ -1117,7 +1121,7 @@ <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' /> <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' /> <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' /> - <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' /> + <!--<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />--> <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />--> <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />--> <!--<parameter name='index-number' value='0' />--> |