From 22d596935f2edeefbe3f0d5acc72cf39e27e17aa Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 4 Nov 2021 11:44:51 -0400
Subject: Adding support for connecting a single ONU port to multiple clouds
 with different vlan-id's. Also fixing a few bugs in cll creation and
 deletion.

Issue-ID: SDNC-1594
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I5e1b117104ef32f5dbb9b83e2c19ba3727789fe5

Former-commit-id: af17de2185bc8e0d1a7f0cb6f965df157c893412
---
 ...logy-operation-cll-helper-find-connectivity.xml | 57 +++++++++++++++++-----
 1 file changed, 46 insertions(+), 11 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
index 6e279384..87498016 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
@@ -9,6 +9,9 @@
             <set>
                 <parameter name='tmp.the-connectivity.' value="" />
             </set>
+            <set>
+                <parameter name='tmp.aai.helper-all-connectivities.' value="" />
+            </set>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                           resource="connectivities"
                           key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
@@ -18,19 +21,51 @@
                     <block atomic="true">
                         <for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >
                             <block atomic='true'>
-                                <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`"/>
+                                </record>
+                                <switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>
                                     <outcome value='true'>
-                                        <block atomic='true'>
-                                            <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                        <block></block>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <block>
+                                            <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`">
+                                                <outcome value='false'>
+                                                    <block></block>
+                                                </outcome>
                                                 <outcome value='true'>
-                                                    <block atomic='true'>
-                                                        <set>
-                                                            <parameter name='found-connectivity' value="true" />
-                                                        </set>
-                                                        <set>
-                                                            <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
-                                                        </set>
-                                                        <break/>
+                                                    <block>
+                                                        <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `">
+                                                            <outcome value='false'>
+                                                                <block></block>
+                                                            </outcome>
+                                                            <outcome value='true'>
+                                                                <block>
+                                                                    <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                                                                    <outcome value='true'>
+                                                                                        <block atomic='true'>
+                                                                                            <set>
+                                                                                                <parameter name='found-connectivity' value="true" />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
+                                                                                            </set>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
                                                     </block>
                                                 </outcome>
                                             </switch>
-- 
cgit 1.2.3-korg