diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2022-05-09 21:24:15 -0400 |
|---|---|---|
| committer | Hesam Rahimi <hesam.rahimi@huawei.com> | 2022-05-09 21:24:15 -0400 |
| commit | 645b21298c9a4aff5f3f625eabb586fff40db732 (patch) | |
| tree | 7a0d2a3a2b86f2770827b6d8839de7fec351ced9 /platform-logic/generic-resource-api/src/main/xml | |
| parent | a3fc5687fdd9b8d89fa36019d6e61eb2d22f8c27 (diff) | |
Making sure not to use the same CLL instance name for all endpoints' description attribute.
Issue-ID: SDNC-1694
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I26fed9419a7ff1d717450498b7dc9c5a3b5bf2ea
Former-commit-id: 7e37cf7938d1e11d341fcfa2285132e797a50196
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
4 files changed, 25 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-w-Protection.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml index 4f20a3fd..aeb3873e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.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,6 +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='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' />--> 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' />--> diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml index cb7e715f..f4a46c8e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml @@ -1024,6 +1024,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
<parameter name='type' value='leaf' />
<parameter name='data-source' value='`$gfp`' />
+ <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'
@@ -1091,6 +1092,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
<parameter name='type' value='root' />
<parameter name='data-source' value='`$gfp`' />
+ <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'
@@ -1110,6 +1112,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />
<parameter name='type' value='secondary-root' />
<parameter name='data-source' value='`$gfp`' />
+ <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />
</save>
<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
@@ -1443,6 +1446,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
<parameter name='type' value='leaf' />
<parameter name='data-source' value='`$gfp`' />
+ <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />
</save>
<switch test="`$found-connectivity`">
<outcome value='false'>
@@ -1643,6 +1647,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
<parameter name='type' value='leaf' />
<parameter name='data-source' value='`$gfp`' />
+ <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml index d2cbb936..d9000d0b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml @@ -1007,7 +1007,9 @@ <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' /> <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' /> <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' /> + <parameter name='type' value='leaf' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </save> <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' @@ -1073,7 +1075,9 @@ <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' /> <parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' /> <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' /> + <parameter name='type' value='root' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </save> <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' @@ -1093,6 +1097,7 @@ <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' /> <parameter name='type' value='secondary-root' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </save> <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT--> <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'> @@ -1351,7 +1356,9 @@ <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' /> <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' /> <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' /> + <parameter name='type' value='leaf' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </update> <switch test='`$tmp.aai.leafuni.data-source > $gfp`'> <outcome value='false'> @@ -1791,7 +1798,9 @@ <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' /> <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' /> <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' /> + <parameter name='type' value='leaf' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </save> <switch test="`$found-connectivity`"> <outcome value='false'> @@ -1990,7 +1999,9 @@ <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' /> <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' /> <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' /> + <parameter name='type' value='leaf' /> <parameter name='data-source' value='`$gfp`' /> + <parameter name='data-owner' value='`$tmp.aai.service-instance.service-instance-id`' /> </save> <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' |