From c418b3b687063a5f75ffef9782d4111449c11f32 Mon Sep 17 00:00:00 2001
From: Ahila <ahila.pandaram@wipro.com>
Date: Mon, 12 Apr 2021 18:22:39 +0530
Subject: RAN Slice DG-ModifyAllocate & SO callback fixes

Issue-ID: CCSDK-3244

Signed-off-by: Ahila <ahila.pandaram@wipro.com>
Change-Id: I3ce241263d3d838dc3046fd6e8086cdd9861c1d4
---
 .../main/xml/ran-slice-api_instantiateRANSlice.xml | 105 ++++++++++++++-------
 1 file changed, 72 insertions(+), 33 deletions(-)

(limited to 'platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml')

diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml
index 956018be..87c9c461 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSlice.xml
@@ -141,17 +141,30 @@
                                 <parameter name='tmp.RRMPolicyRatioID.NRCellCU' value="`'NRCellCU-' + $payloadJson.input.sliceProfile.sliceProfileId  + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" />
                                 <parameter name='prop.ranNetwork.RRMPolicyRatioMemberID' value='`$prop.ranNetwork.RRMPolicyRatioMemberID + 1`' />
                             </set>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mcc"/>
-                                <parameter name="begin-index" value="0" />
-                                <parameter name="end-index" value="3" />
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mnc"/>
-                                <parameter name="begin-index" value="4" />
-                            </execute>
+                            <switch test='`$tmp.payload.pLMNId`'>
+                                <outcome value=''>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="It is allocate-modify flow. PLMNId is null"/>
+                                    </record>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <block atomic="true">
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mcc"/>
+                                            <parameter name="begin-index" value="0" />
+                                            <parameter name="end-index" value="3" />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mnc"/>
+                                            <parameter name="begin-index" value="4" />
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
                                 <parameter name="level" value="info" />
@@ -189,17 +202,30 @@
                                 <parameter name='tmp.RRMPolicyRatioID.NRCellCU' value="`'NRCellCU-' + $payloadJson.input.sliceProfile.sliceProfileId  + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" />
                                 <parameter name='prop.ranNetwork.RRMPolicyRatioMemberID' value='`$prop.ranNetwork.RRMPolicyRatioMemberID + 1`' />
                             </set>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mcc"/>
-                                <parameter name="begin-index" value="0" />
-                                <parameter name="end-index" value="3" />
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mnc"/>
-                                <parameter name="begin-index" value="4" />
-                            </execute>
+                            <switch test='`$tmp.payload.pLMNId`'>
+                                <outcome value=''>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="It is allocate-modify flow. PLMNId is null"/>
+                                    </record>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <block atomic="true">
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mcc"/>
+                                            <parameter name="begin-index" value="0" />
+                                            <parameter name="end-index" value="3" />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mnc"/>
+                                            <parameter name="begin-index" value="4" />
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
                                 <parameter name="level" value="info" />
@@ -237,17 +263,30 @@
                                 <parameter name='tmp.RRMPolicyRatioID.NRCellCU' value="`'NRCellCU-' + $payloadJson.input.sliceProfile.sliceProfileId  + '-' + $payloadJson.input.sliceProfile.coverageAreaList[0]`" />
                                 <parameter name='prop.ranNetwork.RRMPolicyRatioMemberID' value='`$prop.ranNetwork.RRMPolicyRatioMemberID + 1`' />
                             </set>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mcc"/>
-                                <parameter name="begin-index" value="0" />
-                                <parameter name="end-index" value="3" />
-                            </execute>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
-                                <parameter name="string" value="`$tmp.payload.pLMNId`" />
-                                <parameter name="result" value="tmp.mnc"/>
-                                <parameter name="begin-index" value="4" />
-                            </execute>
+                            <switch test='`$tmp.payload.pLMNId`'>
+                                <outcome value=''>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="It is allocate-modify flow. PLMNId is null"/>
+                                    </record>
+                                </outcome>
+                                <outcome value='Other'>
+                                    <block atomic="true">
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mcc"/>
+                                            <parameter name="begin-index" value="0" />
+                                            <parameter name="end-index" value="3" />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                                            <parameter name="string" value="`$tmp.payload.pLMNId`" />
+                                            <parameter name="result" value="tmp.mnc"/>
+                                            <parameter name="begin-index" value="4" />
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSlice.log" />
                                 <parameter name="level" value="info" />
-- 
cgit 1.2.3-korg