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
---
 .../xml/ran-slice-api_activateRANSliceInstance.xml |   10 +-
 .../main/xml/ran-slice-api_instantiateRANSlice.xml |  105 +-
 .../ran-slice-api_instantiateRANSliceAllocate.xml  |   30 +-
 ...slice-api_instantiateRANSliceModifyAllocate.xml | 1852 ++++++++++++++------
 ...an-slice-api_instantiateRANSliceReconfigure.xml |   12 +-
 .../ran-slice-api_terminateRANSliceInstance.xml    |   34 +-
 6 files changed, 1400 insertions(+), 643 deletions(-)

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

diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_activateRANSliceInstance.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_activateRANSliceInstance.xml
index c77357cf..e85db3d3 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_activateRANSliceInstance.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_activateRANSliceInstance.xml
@@ -129,7 +129,7 @@
                                 <parameter name="responsePrefix" value="so-callback-activate-response"/>
                                 <parameter name='contentType' value='application/json' />
                                 <parameter name='format' value='json' />
-                                <parameter name='accept' value='application/json' />
+                                <parameter name='accept' value='*/*' />
                                 <parameter name="convertResponse" value="true"/>
                                 <outcome value='failure'>
                                     <block>
@@ -392,7 +392,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-activate-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -585,7 +585,7 @@
                                                                     <parameter name="responsePrefix" value="so-callback-activate-response"/>
                                                                     <parameter name='contentType' value='application/json' />
                                                                     <parameter name='format' value='json' />
-                                                                    <parameter name='accept' value='application/json' />
+                                                                    <parameter name='accept' value='*/*' />
                                                                     <parameter name="convertResponse" value="true"/>
                                                                     <outcome value='failure'>
                                                                         <block>
@@ -779,7 +779,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-activate-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -868,7 +868,7 @@
                     <parameter name="responsePrefix" value="so-callback-activate-response"/>
                     <parameter name='contentType' value='application/json' />
                     <parameter name='format' value='json' />
-                    <parameter name='accept' value='application/json' />
+                    <parameter name='accept' value='*/*' />
                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                     <outcome value='failure'>
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" />
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceAllocate.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceAllocate.xml
index 46228255..3d5f6768 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceAllocate.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceAllocate.xml
@@ -64,7 +64,7 @@
                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                     <parameter name='contentType' value='application/json' />
                                     <parameter name='format' value='json' />
-                                    <parameter name='accept' value='application/json' />
+                                    <parameter name='accept' value='*/*' />
                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                     <outcome value='failure'>
@@ -168,7 +168,7 @@
                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                         <parameter name='contentType' value='application/json' />
                                         <parameter name='format' value='json' />
-                                        <parameter name='accept' value='application/json' />
+                                        <parameter name='accept' value='*/*' />
                                         <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                         <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                         <outcome value='failure'>
@@ -422,7 +422,7 @@
                                             <parameter name="responsePrefix" value="so-callback-response"/>
                                             <parameter name='contentType' value='application/json' />
                                             <parameter name='format' value='json' />
-                                            <parameter name='accept' value='application/json' />
+                                            <parameter name='accept' value='*/*' />
                                             <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                             <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                             <outcome value='failure'>
@@ -719,7 +719,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                             <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                             <outcome value='failure'>
@@ -864,7 +864,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                             <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                             <outcome value='failure'>
@@ -948,7 +948,7 @@
                                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                                         <parameter name='contentType' value='application/json' />
                                                                         <parameter name='format' value='json' />
-                                                                        <parameter name='accept' value='application/json' />
+                                                                        <parameter name='accept' value='*/*' />
                                                                         <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                         <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                         <outcome value='failure'>
@@ -1022,7 +1022,7 @@
                                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                                         <parameter name='contentType' value='application/json' />
                                                                         <parameter name='format' value='json' />
-                                                                        <parameter name='accept' value='application/json' />
+                                                                        <parameter name='accept' value='*/*' />
                                                                         <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                         <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                         <outcome value='failure'>
@@ -1288,7 +1288,7 @@
                                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                                     <parameter name='contentType' value='application/json' />
                                                     <parameter name='format' value='json' />
-                                                    <parameter name='accept' value='application/json' />
+                                                    <parameter name='accept' value='*/*' />
                                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                     <outcome value='failure'>
@@ -1432,7 +1432,7 @@
                                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                                     <parameter name='contentType' value='application/json' />
                                                     <parameter name='format' value='json' />
-                                                    <parameter name='accept' value='application/json' />
+                                                    <parameter name='accept' value='*/*' />
                                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                     <outcome value='failure'>
@@ -1512,7 +1512,7 @@
                                                 <parameter name="responsePrefix" value="so-callback-response"/>
                                                 <parameter name='contentType' value='application/json' />
                                                 <parameter name='format' value='json' />
-                                                <parameter name='accept' value='application/json' />
+                                                <parameter name='accept' value='*/*' />
                                                 <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                 <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                 <outcome value='failure'>
@@ -1595,7 +1595,7 @@
                                                 <parameter name="responsePrefix" value="so-callback-response"/>
                                                 <parameter name='contentType' value='application/json' />
                                                 <parameter name='format' value='json' />
-                                                <parameter name='accept' value='application/json' />
+                                                <parameter name='accept' value='*/*' />
                                                 <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                 <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                 <outcome value='failure'>
@@ -1915,7 +1915,7 @@
                                                                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                                                                     <parameter name='contentType' value='application/json' />
                                                                                     <parameter name='format' value='json' />
-                                                                                    <parameter name='accept' value='application/json' />
+                                                                                    <parameter name='accept' value='*/*' />
                                                                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                                     <outcome value='failure'>
@@ -2234,7 +2234,7 @@
                                                                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                                                                     <parameter name='contentType' value='application/json' />
                                                                                     <parameter name='format' value='json' />
-                                                                                    <parameter name='accept' value='application/json' />
+                                                                                    <parameter name='accept' value='*/*' />
                                                                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                                                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                                                                     <outcome value='failure'>
@@ -2351,7 +2351,7 @@
                                     <parameter name="responsePrefix" value="so-callback-response"/>
                                     <parameter name='contentType' value='application/json' />
                                     <parameter name='format' value='json' />
-                                    <parameter name='accept' value='application/json' />
+                                    <parameter name='accept' value='*/*' />
                                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                                     <outcome value='failure'>
@@ -2422,7 +2422,7 @@
                         <parameter name="responsePrefix" value="so-callback-response"/>
                         <parameter name='contentType' value='application/json' />
                         <parameter name='format' value='json' />
-                        <parameter name='accept' value='application/json' />
+                        <parameter name='accept' value='*/*' />
                         <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                         <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                         <outcome value='failure'>
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceModifyAllocate.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceModifyAllocate.xml
index be9ad2de..21571e92 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceModifyAllocate.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceModifyAllocate.xml
@@ -4,6 +4,15 @@
     <method rpc='instantiateRANSliceModifyAllocate' mode='sync'>
         <block atomic='true'>
             <block atomic='true'>
+                <set>
+                    <parameter name='tmp.payload.globalCustomerId' value='`$payloadJson.input.globalCustomerId`'/>
+                </set>
+                <set>
+                    <parameter name='tmp.serviceType' value='`$payloadJson.input.serviceType`'/>
+                </set>
+                <set>
+                    <parameter name='tmp.sNSSAI' value='`$tmp.payload.sNSSAI`'/>
+                </set>
                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                     <parameter name="source" value="`$prop.restapi.configdb.getNearRTRICByNSSI`"/>
                     <parameter name="outputPath" value="tmp.configdb.getNearRTRICByNSSI.url"/>
@@ -56,7 +65,7 @@
                                     <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                     <parameter name='contentType' value='application/json' />
                                     <parameter name='format' value='json' />
-                                    <parameter name='accept' value='application/json' />
+                                    <parameter name='accept' value='*/*' />
                                     <parameter name="convertResponse" value="true"/>
                                     <outcome value='failure'>
                                         <block>
@@ -95,6 +104,211 @@
                     </outcome>
                 </execute>
             </block>
+            <block atomic='true'>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$prop.restapi.configdb.getplmn`"/>
+                    <parameter name="outputPath" value="tmp.configdb.getPLMNId.url"/>
+                    <parameter name="target" value="{sliceProfileId}"/>
+                    <parameter name="replacement" value="`$tmp.payload.sliceProfileId`"/>
+                </execute>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Get PLMN from SliceProfileId URL: "/>
+                    <parameter name="field2" value="`$tmp.configdb.getPLMNId.url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.getPLMNId.url`"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="getPLMN-configdb-response"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='format' value='json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Successfully Obtained PLMNId info from ConfigDB"/>
+                                <parameter name="field2" value="`$getPLMN-configdb-response`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                            </execute>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from ConfigDB. Aborting RPC executiopn'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from ConfigDB. Aborting RPC executiopn'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <set>
+                    <parameter name='tmp.pLMNId' value='`$getPLMN-configdb-response.plmnId`'/>
+                </set>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='substring'>
+                    <parameter name="string" value="`$tmp.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.pLMNId`" />
+                    <parameter name="result" value="tmp.mnc"/>
+                    <parameter name="begin-index" value="4" />
+                </execute>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="`$tmp.pLMNId`"/>
+                    <parameter name="field2" value="`$tmp.mcc`"/>
+                    <parameter name="field3" value="`$tmp.mnc`"/>
+                </record>
+            </block>
+            <block atomic='true'>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$prop.restapi.aai.fetchSliceProfile`"/>
+                    <parameter name="outputPath" value="tmp.aai.fetchSliceProfile.url"/>
+                    <parameter name="target" value="{global-customer-id}"/>
+                    <parameter name="replacement" value="`$tmp.payload.globalCustomerId`"/>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$tmp.aai.fetchSliceProfile.url`"/>
+                    <parameter name="outputPath" value="tmp.aai.fetchSliceProfile.url"/>
+                    <parameter name="target" value="{service-type}"/>
+                    <parameter name="replacement" value="`$tmp.serviceType`"/>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$tmp.aai.fetchSliceProfile.url`"/>
+                    <parameter name="outputPath" value="tmp.aai.fetchSliceProfile.url"/>
+                    <parameter name="target" value="{service-instance-id}"/>
+                    <parameter name="replacement" value="`$tmp.payload.RANNFNSSIId`"/>
+                </execute>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$tmp.aai.fetchSliceProfile.url`"/>
+                    <parameter name="outputPath" value="tmp.aai.fetchSliceProfile.url"/>
+                    <parameter name="target" value="{profile-id}"/>
+                    <parameter name="replacement" value="`$tmp.payload.sliceProfileId`"/>
+                </execute>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Get coverageAreaTAList URL: "/>
+                    <parameter name="field2" value="`$tmp.aai.fetchSliceProfile.url`"/>
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$prop.org.onap.ccsdk.sli.adaptors.aai.uri + $tmp.aai.fetchSliceProfile.url`"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="get-coverageAreaTAList-response"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='format' value='json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='success'>
+                        <block atomic='true'>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Successfully Retrieved coverageAreaTAList"/>
+                                <parameter name="field2" value="`$get-coverageAreaTAList-response`"/>
+                            </record>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                            </execute>
+                        </block>
+                    </outcome>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from AAI. Aborting RPC executiopn'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from ConfigDB. Aborting RPC executiopn'/>
+                            </return>
+                        </block>
+                    </outcome>
+                </execute>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="`$tmp.pLMNId`"/>
+                    <parameter name="field2" value="`$tmp.mcc`"/>
+                    <parameter name="field3" value="`$tmp.mnc`"/>
+                </record>
+            </block>
+            <block atomic='true'>
+                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                    <parameter name="source" value="`$prop.restapi.configdb.getListOfCells`"/>
+                    <parameter name="outputPath" value="tmp.configdb.getListOfCells.url"/>
+                    <parameter name="target" value="{trackingArea}"/>
+                    <parameter name="replacement" value="`$tmp.payload.trackingArea`"/>
+                </execute>
+                <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="URL for configDB Get getListOfCells for tracking area"/>
+                    <parameter name='field2' value="`$prop.configdb.url + $tmp.configdb.getListOfCells.url`" />
+                    <parameter name='field3' value="`$tmp.payload.trackingArea`" />
+                </record>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.getListOfCells.url`"/>
+                    <parameter name="httpMethod" value="GET"/>
+                    <parameter name="responsePrefix" value="getListofCells-configdb-response"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='format' value='json' />
+                    <parameter name='accept' value='application/json' />
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from ConfigDB. Aborting RPC executiopn'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error Getting Info from ConfigDB. Aborting RPC executiopn'/>
+                            </return>
+                        </block>
+                    </outcome>
+                    <outcome value='success'>
+                        <block>
+                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                <parameter name="level" value="info" />
+                                <parameter name="field1" value="Successfully Obtained List of Cells from ConfigDB"/>
+                                <parameter name="field2" value="`$getListofCells-configdb-response._length`"/>
+                                <parameter name="field3" value="List of Cells in the Tracking Area Relevant for RAN Slice Instantiation "/>
+                            </record>
+                            <for index='idx' start='0' end='`$getListofCells-configdb-response._length `' >
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                    <parameter name='outputPath' value='tmp.trackingarea.cell' />
+                                    <parameter name='source' value="`'getListofCells-configdb-response.[' + $idx + ']'`" />
+                                </execute>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="`$tmp.trackingarea.cell`"/>
+                                </record>
+                            </for>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                            </execute>
+                        </block>
+                    </outcome>
+                </execute>
+            </block>
             <for index='idy' start='0' end='`$getNFNSSIRIC-configdb-response._length`' >
                 <block atomic='true'>
                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
@@ -107,6 +321,7 @@
                     </execute>
                     <set>
                         <parameter name='tmp.ranNFNSSIListEntry' value="`$payloadJson.input.RANNFNSSIId`"/>
+                        <parameter name='tmp.payload.pLMNId' value="`$tmp.pLMNId`"/>
                     </set>
                     <set>
                         <parameter name='tmp.nearRTRIC.uLThptPerSlice1' value='`$payloadJson.input.sliceProfile.uLThptPerSlice * 1.1`' />
@@ -198,31 +413,24 @@
                             </execute>
                             <for index='idcu' start='0' end='`$tmp.cellCUList_length`' >
                                 <block atomic='true'>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                        <parameter name='outputPath' value='tmp.pLMNInfoList_length' />
-                                        <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBCUCPList['+ $idz +'].cellCUList['+ $idcu +'].pLMNInfoList_length '`" />
-                                    </execute>
-                                    <for index='id-cuplmn' start='0' end='`$tmp.pLMNInfoList_length`' >
+                                    <for index='id-ta' start='0' end='`$getListofCells-configdb-response._length`' >
                                         <block atomic='true'>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                <parameter name='outputPath' value='tmp.configDBSNSSAI' />
-                                                <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBCUCPList['+ $idz +'].cellCUList['+ $idcu +'].pLMNInfoList['+ $id-cuplmn +'].sNSSAI.sNSSAI'`" />
+                                                <parameter name='outputPath' value='tmp.cellCULocalId' />
+                                                <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBCUCPList['+ $idz +'].cellCUList['+ $idcu +'].cellLocalId'`" />
                                             </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="sNSSAI - getNFNSSIRIC-configdb-response"/>
-                                                <parameter name="field2" value="`$tmp.configDBSNSSAI`"/>
-                                                <parameter name="field3" value="sNSSAI from request"/>
-                                                <parameter name="field4" value="`$tmp.sNSSAI`"/>
-                                            </record>
-                                            <switch test='`$tmp.configDBSNSSAI == $tmp.sNSSAI`'>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='tmp.cellCU2' />
+                                                <parameter name='source' value="`'getListofCells-configdb-response.[' + $id-ta + ']'`" />
+                                            </execute>
+                                            <switch test='`$tmp.cellCULocalId == $tmp.cellCU2`'>
                                                 <outcome value='true'>
                                                     <block atomic='true'>
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                             <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                             <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="CellCU is applicable for the NSSAI "/>
+                                                            <parameter name="field1" value="`$tmp.cellCULocalId`"/>
+                                                            <parameter name="field2" value="CellCU is applicable for the NSSAI "/>
                                                         </record>
                                                         <switch test='`$prop.ransim-mounted`'>
                                                             <outcome value='false'>
@@ -250,10 +458,6 @@
                                                                 </block>
                                                             </outcome>
                                                         </switch>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                            <parameter name='outputPath' value='tmp.cellCULocalId' />
-                                                            <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBCUCPList['+ $idz +'].cellCUList['+ $idcu +'].cellLocalId'`" />
-                                                        </execute>
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                                             <parameter name="source" value="`$tmp.patchPLMNInfoListEntry.url`"/>
                                                             <parameter name="outputPath" value="tmp.patchPLMNInfoListEntry.url"/>
@@ -335,7 +539,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -369,17 +573,30 @@
                                                                 </block>
                                                             </outcome>
                                                         </execute>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setPropertiesForList'>
+                                                            <parameter name='prefixKey' value='tmp.CUCPList.response' />
+                                                            <parameter name='keyName' value='gNBCUName' />
+                                                            <parameter name='keyValue' value="`$tmp.CUCPName`"/>
+                                                        </execute>
                                                         <block atomic='true'>
                                                             <set>
                                                                 <parameter name='tmp.maxNumberOfConnsPercellCU' value='`$tmp.payload.maxNumberofConns / $tmp.cellCUList_length`' />
+                                                            </set>
+                                                            <set>
                                                                 <parameter name='tmp.rRMPolicyDedicatedRatio.CellCU1' value='`$tmp.maxNumberOfConnsPercellCU * 100`' />
+                                                            </set>
+                                                            <set>
                                                                 <parameter name='tmp.rRMPolicyDedicatedRatio_SliceProfile' value='`$tmp.rRMPolicyDedicatedRatio.CellCU1 / $prop.nrcellcu.maxNumberOfConnsPerCell`' />
                                                             </set>
                                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                                 <parameter name="level" value="info" />
-                                                                <parameter name="field1" value="RRMPolicyRatio for this profile is - "/>
-                                                                <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio.CellCU`"/>
+                                                                <parameter name="field1" value="RRMPolicyRatio temp1 - "/>
+                                                                <parameter name="field2" value="`$tmp.maxNumberOfConnsPercellCU`"/>
+                                                                <parameter name="field3" value="RRMPolicyRatio temp2 - "/>
+                                                                <parameter name="field4" value="`$tmp.rRMPolicyDedicatedRatio.CellCU1`"/>
+                                                                <parameter name="field5" value="RRMPolicyRatio for this profile is - "/>
+                                                                <parameter name="field6" value="`$tmp.rRMPolicyDedicatedRatio_SliceProfile`"/>
                                                             </record>
                                                             <switch test='`$prop.ransim-mounted`'>
                                                                 <outcome value='false'>
@@ -465,7 +682,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -502,10 +719,9 @@
                                                                     </block>
                                                                 </outcome>
                                                             </execute>
-                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                                <parameter name='outputPath' value='tmp.rrmPolicyRatioList_length' />
-                                                                <parameter name='source' value="`'get-rrmpolicyratio-response.attributes.RRMPolicyRatio_length '`" />
-                                                            </execute>
+                                                            <set>
+                                                                <parameter name='tmp.rrmPolicyRatioList_length' value='`$get-rrmpolicyratio-response.attributes.RRMPolicyRatio_length`'/>
+                                                            </set>
                                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                                 <parameter name="level" value="info" />
@@ -514,10 +730,21 @@
                                                             </record>
                                                             <for index='idcu-rrm' start='0' end='`$tmp.rrmPolicyRatioList_length`' >
                                                                 <block atomic='true'>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.rrmPolicyDedicatedRatiocellCU_old' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
+                                                                    </execute>
                                                                     <set>
-                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_cellCU' value="`'$get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
-                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_CellCU_updated' value="`$tmp.rrmPolicyDedicatedRatio_cellCU + $tmp.rRMPolicyDedicatedRatio_SliceProfile`" />
+                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_CellCU_new' value='`$tmp.rrmPolicyDedicatedRatiocellCU_old + $tmp.rRMPolicyDedicatedRatio_SliceProfile`' />
                                                                     </set>
+                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                        <parameter name="level" value="info" />
+                                                                        <parameter name="field1" value="Existing RRMPolicyRatio for CellCU is - "/>
+                                                                        <parameter name="field2" value="`$tmp.rrmPolicyDedicatedRatiocellCU_old`"/>
+                                                                        <parameter name="field3" value="Updated RRMPolicyRatio for CellCU is - "/>
+                                                                        <parameter name="field4" value="`$tmp.rrmPolicyDedicatedRatio_CellCU_new`"/>
+                                                                    </record>
                                                                     <switch test='`$prop.ransim-mounted`'>
                                                                         <outcome value='false'>
                                                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
@@ -544,17 +771,38 @@
                                                                             </block>
                                                                         </outcome>
                                                                     </switch>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio.url`"/>
+                                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio.url"/>
+                                                                        <parameter name="target" value="{idGNBCUCPFunction}"/>
+                                                                        <parameter name="replacement" value="`$tmp.CUCPName`"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio.url`"/>
+                                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio.url"/>
+                                                                        <parameter name="target" value="{idNRCellCU}"/>
+                                                                        <parameter name="replacement" value="`$tmp.cellCULocalId`"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.rrmPolicyMembers' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm+ ']'.attributes.rRMPolicyMemberList_length'`" />
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.RRMPolicyRatio_id' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm+'].id'`" />
+                                                                    </execute>
                                                                     <set>
-                                                                        <parameter name='tmp.RRMPolicyRatio_id' value="`'$get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm+'].id'`" />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='tmp.RRMPolicyMember_id' value="`'$get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $idcu-rrm+ ']'.attributes.rRMPolicyMemberList_length+1`" />
+                                                                        <parameter name='tmp.RRMPolicyMember_id' value='`$tmp.rrmPolicyMembers+1`'/>
                                                                     </set>
                                                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                                         <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                                         <parameter name="level" value="info" />
-                                                                        <parameter name="field1" value="Updated RRMPolicyRatio for CellCU is - "/>
-                                                                        <parameter name="field2" value="`$tmp.rrmPolicyDedicatedRatio_updated`"/>
+                                                                        <parameter name="field1" value="RRMPolicyRatio_id is - "/>
+                                                                        <parameter name="field2" value="`$tmp.RRMPolicyRatio_id`"/>
+                                                                        <parameter name="field3" value="RRMPolicyMember_id - "/>
+                                                                        <parameter name="field4" value="`$tmp.RRMPolicyMember_id`"/>
+                                                                        <parameter name="field5" value="RRMPolicyRatio update URL is - "/>
+                                                                        <parameter name="field6" value="`$tmp.getRRMPolicyRatio.url`"/>
                                                                     </record>
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                         <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-RRMPolicyRatio-NRCellCU.json'`" />
@@ -573,6 +821,19 @@
                                                                                     <parameter name="level" value="info" />
                                                                                     <parameter name="field1" value="Successfully Patched - cellCU RRMpolicyRatio"/>
                                                                                 </record>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='failure'>
+                                                                            <block atomic='true'>
+                                                                                <set>
+                                                                                    <parameter name='error-code' value='500'/>
+                                                                                    <parameter name='error-message' value='Error patching cellCU RRMPolicyRatio. Aborting RPC executiopn'/>
+                                                                                </set>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name='error-code' value='500'/>
+                                                                                    <parameter name='error-message' value='Error updating NRCellDU - RRMPolicyRAtio. Aborting RPC executiopn'/>
+                                                                                </return>
                                                                                 <block atomic='true'>
                                                                                     <set>
                                                                                         <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
@@ -598,7 +859,7 @@
                                                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                         <parameter name='contentType' value='application/json' />
                                                                                         <parameter name='format' value='json' />
-                                                                                        <parameter name='accept' value='application/json' />
+                                                                                        <parameter name='accept' value='*/*' />
                                                                                         <parameter name="convertResponse" value="true"/>
                                                                                         <outcome value='failure'>
                                                                                             <block>
@@ -622,24 +883,40 @@
                                                                                 </block>
                                                                             </block>
                                                                         </outcome>
-                                                                        <outcome value='failure'>
-                                                                            <block atomic='true'>
-                                                                                <set>
-                                                                                    <parameter name='error-code' value='500'/>
-                                                                                    <parameter name='error-message' value='Error patching cellCU RRMPolicyRatio. Aborting RPC executiopn'/>
-                                                                                </set>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name='error-code' value='500'/>
-                                                                                    <parameter name='error-message' value='Error updating NRCellDU - RRMPolicyRAtio. Aborting RPC executiopn'/>
-                                                                                </return>
-                                                                            </block>
-                                                                        </outcome>
                                                                     </execute>
                                                                 </block>
                                                             </for>
                                                         </block>
                                                         <block atomic='true'>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="Config DB update"/>
+                                                            </record>
+                                                            <set>
+                                                                <parameter name='tmp.cellLocalId' value='`$tmp.cellCULocalId`'/>
+                                                                <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                                                                <parameter name='tmp.maxNumberOfConns' value='`$tmp.payload.maxNumberofConns`'/>
+                                                                <parameter name='tmp.gNBCUCPList.gNBCUName' value='`$tmp.CUCPName`'/>
+                                                                <parameter name='tmp.gNBCUCPList.gNBId' value='`$tmp.gNBId`'/>
+                                                                <parameter name='tmp.gNBCUCPList.nFType' value='RRC Connected Users'/>
+                                                            </set>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="cellLocalId"/>
+                                                                <parameter name="field2" value="`$tmp.cellLocalId`"/>
+                                                                <parameter name="field3" value="pLMNId"/>
+                                                                <parameter name="field4" value="`$tmp.payload.pLMNId`"/>
+                                                                <parameter name="field5" value="maxNumberOfConns"/>
+                                                                <parameter name="field6" value="`$tmp.maxNumberOfConns`"/>
+                                                                <parameter name="field7" value="gNBCUName"/>
+                                                                <parameter name="field8" value="`$tmp.gNBCUCPList.gNBCUName`"/>
+                                                                <parameter name="field9" value="gNBId"/>
+                                                                <parameter name="field10" value="`$tmp.gNBCUCPList.gNBId`"/>
+                                                                <parameter name="field11" value="nFType"/>
+                                                                <parameter name="field12" value="`$tmp.gNBCUCPList.nFType`"/>
+                                                            </record>
                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                 <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updategNBCUCP`"/>
                                                                 <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updategNBCUCP.json'`" />
@@ -685,7 +962,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -719,52 +996,124 @@
                                                                     </block>
                                                                 </outcome>
                                                             </execute>
+                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                <parameter name="source" value="`$prop.restapi.configdb.getRRMPolicyRatio`"/>
+                                                                <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                                                <parameter name="target" value="{resourceType}"/>
+                                                                <parameter name="replacement" value="RRC Connected Users"/>
+                                                            </execute>
+                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                <parameter name="source" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                                <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                                                <parameter name="target" value="{resourceId}"/>
+                                                                <parameter name="replacement" value="`$tmp.cellCULocalId`"/>
+                                                            </execute>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="get RRMPolicyby Resource URL"/>
+                                                                <parameter name="field2" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                            </record>
                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRRMPolicy`"/>
-                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRRMPolicy-CUCP.json'`" />
-                                                                <parameter name="httpMethod" value="PUT"/>
-                                                                <parameter name="responsePrefix" value="update-gNBCUCP-rrmpolicy-configdb-response"/>
+                                                                <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                                <parameter name="httpMethod" value="GET"/>
+                                                                <parameter name="responsePrefix" value="getrrmpolicyratioinfo-configdb-response"/>
                                                                 <parameter name='contentType' value='application/json' />
                                                                 <parameter name='format' value='json' />
                                                                 <parameter name='accept' value='application/json' />
-                                                                <parameter name="convertResponse" value="true"/>
                                                                 <outcome value='failure'>
                                                                     <block atomic='true'>
                                                                         <set>
                                                                             <parameter name='error-code' value='500'/>
-                                                                            <parameter name='error-message' value='Error in updating RRMPolicyRatio - NRCellCU. Aborting RPC executiopn'/>
+                                                                            <parameter name='error-message' value='Error in retrieving RRMPolicyRatio. Aborting RPC executiopn'/>
                                                                         </set>
                                                                         <return status='failure'>
                                                                             <parameter name='ack-final' value='Y'/>
                                                                             <parameter name='error-code' value='500'/>
-                                                                            <parameter name='error-message' value='Error updating NRCellCU-RRMPolicyRatio in ConfigDB. Aborting RPC executiopn'/>
+                                                                            <parameter name='error-message' value='Error in Fetching RRMPolicyRatio - CellCU. Aborting RPC executiopn'/>
                                                                         </return>
-                                                                        <block atomic='true'>
-                                                                            <set>
-                                                                                <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
-                                                                                <parameter name="tmp.status" value="`$error-code`"/>
-                                                                                <parameter name="tmp.reason" value="`$error-message`"/>
-                                                                                <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
-                                                                                <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
-                                                                            </set>
-                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
-                                                                                <parameter name="level" value="info" />
-                                                                                <parameter name="field1" value="URL for SO Callback Response"/>
-                                                                                <parameter name='field2' value="`$tmp.so.callbackURL`" />
-                                                                                <parameter name='field3' value="`$tmp.status`" />
-                                                                                <parameter name='field4' value="`$tmp.reason`" />
-                                                                                <parameter name='field5' value="`$tmp.requestID`" />
-                                                                                <parameter name='field6' value="`$tmp.action`" />
-                                                                            </record>
-                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
-                                                                                <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic='true'>
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                            <parameter name="level" value="info" />
+                                                                            <parameter name="field1" value="Successfully Retrieved - RRMPolicyRatio"/>
+                                                                        </record>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                            <set>
+                                                                <parameter name='tmp.rRMPolicyDedicatedRatio.CellCU' value='`$tmp.rrmPolicyDedicatedRatio_CellCU_new`'/>
+                                                                <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                                                                <parameter name='tmp.payload.sNSSAI' value='`$tmp.sNSSAI`'/>
+                                                                <parameter name='prop.configDB.rrmPolicyID' value='`$getrrmpolicyratioinfo-configdb-response.rrmPolicyID`'/>
+                                                                <parameter name='tmp.resourceID' value='`$tmp.cellCULocalId`'/>
+                                                            </set>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="rRMPolicyDedicatedRatio"/>
+                                                                <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio.CellCU`"/>
+                                                                <parameter name="field3" value="pLMNId"/>
+                                                                <parameter name="field4" value="`$tmp.payload.pLMNId`"/>
+                                                                <parameter name="field5" value="sNSSAI"/>
+                                                                <parameter name="field6" value="`$tmp.sNSSAI`"/>
+                                                                <parameter name="field7" value="rrmPolicyID"/>
+                                                                <parameter name="field8" value="`$prop.configDB.rrmPolicyID`"/>
+                                                                <parameter name="field9" value="resourceID"/>
+                                                                <parameter name="field10" value="`$tmp.resourceID`"/>
+                                                            </record>
+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRRMPolicy`"/>
+                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRRMPolicy-CUCP.json'`" />
+                                                                <parameter name="httpMethod" value="PUT"/>
+                                                                <parameter name="responsePrefix" value="update-gNBCUCP-rrmpolicy-configdb-response"/>
+                                                                <parameter name='contentType' value='application/json' />
+                                                                <parameter name='format' value='json' />
+                                                                <parameter name='accept' value='application/json' />
+                                                                <parameter name="convertResponse" value="true"/>
+                                                                <outcome value='failure'>
+                                                                    <block atomic='true'>
+                                                                        <set>
+                                                                            <parameter name='error-code' value='500'/>
+                                                                            <parameter name='error-message' value='Error in updating RRMPolicyRatio - NRCellCU. Aborting RPC executiopn'/>
+                                                                        </set>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name='error-code' value='500'/>
+                                                                            <parameter name='error-message' value='Error updating NRCellCU-RRMPolicyRatio in ConfigDB. Aborting RPC executiopn'/>
+                                                                        </return>
+                                                                        <block atomic='true'>
+                                                                            <set>
+                                                                                <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                                                                <parameter name="tmp.status" value="`$error-code`"/>
+                                                                                <parameter name="tmp.reason" value="`$error-message`"/>
+                                                                                <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                                                                <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
+                                                                            </set>
+                                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
+                                                                                <parameter name="level" value="info" />
+                                                                                <parameter name="field1" value="URL for SO Callback Response"/>
+                                                                                <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                                                                <parameter name='field3' value="`$tmp.status`" />
+                                                                                <parameter name='field4' value="`$tmp.reason`" />
+                                                                                <parameter name='field5' value="`$tmp.requestID`" />
+                                                                                <parameter name='field6' value="`$tmp.action`" />
+                                                                            </record>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                                                                <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
                                                                                 <parameter name="httpMethod" value="POST"/>
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -817,7 +1166,7 @@
                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                         <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                         <parameter name="level" value="info" />
-                        <parameter name="field1" value="Number of CUCP List Entries "/>
+                        <parameter name="field1" value="Number of CUUP List Entries "/>
                         <parameter name="field2" value="`$tmp.CUUPList_length`"/>
                         <parameter name="field3" value="for the NearRTRIC"/>
                         <parameter name="field4" value="`$tmp.nearRTRICId`"/>
@@ -834,397 +1183,373 @@
                                 <parameter name="field1" value="idGNBCUUPFunction "/>
                                 <parameter name="field2" value="`$tmp.idGNBCUUPFunction`"/>
                             </record>
-                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                <parameter name='outputPath' value='tmp.pLMNInfoList' />
-                                <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBCUUPList['+ $id-cuup +'].pLMNInfoList_length'`" />
-                            </execute>
-                            <for index='id-plmn' start='0' end='`$tmp.pLMNInfoList`'>
-                                <block atomic='true'>
-                                    <switch test='`$prop.ransim-mounted`'>
-                                        <outcome value='false'>
+                            <block atomic='true'>
+                                <switch test='`$prop.ransim-mounted`'>
+                                    <outcome value='false'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.patchPLMNInfoListEntry.ToGNBCUUP`"/>
+                                            <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
+                                            <parameter name="target" value="{idNearRTRIC}"/>
+                                            <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
+                                        </execute>
+                                    </outcome>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                <parameter name="source" value="`$prop.restapi.patchPLMNInfoListEntry.ToGNBCUUP`"/>
+                                                <parameter name="source" value="`$prop.restapi.patchPLMNInfoListEntry.ToGNBCUUP.ransim-mounted`"/>
                                                 <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
                                                 <parameter name="target" value="{idNearRTRIC}"/>
                                                 <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
                                             </execute>
-                                        </outcome>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$prop.restapi.patchPLMNInfoListEntry.ToGNBCUUP.ransim-mounted`"/>
-                                                    <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
-                                                    <parameter name="target" value="{idNearRTRIC}"/>
-                                                    <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
-                                                    <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
-                                                    <parameter name="target" value="{mountName}"/>
-                                                    <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
-                                                </execute>
-                                            </block>
-                                        </outcome>
-                                    </switch>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                        <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
-                                        <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
-                                        <parameter name="target" value="{idGNBCUUPFunction}"/>
-                                        <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
-                                    </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-sNSSAI-NRCellCU.json'`" />
-                                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.patchPLMNInfoList-CUUP.url`"/>
-                                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                                        <parameter name="httpMethod" value="PATCH"/>
-                                        <parameter name="responsePrefix" value="patch-gNBCUUP-PLMNInfoList-response"/>
-                                        <parameter name='contentType' value='application/yang.patch+json' />
-                                        <parameter name='accept' value='application/yang.patch-status+json'/>
-                                        <parameter name='format' value='json' />
-                                        <outcome value='failure'>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
+                                                <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
+                                                <parameter name="target" value="{mountName}"/>
+                                                <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                    <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
+                                    <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
+                                    <parameter name="target" value="{idGNBCUUPFunction}"/>
+                                    <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                    <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
+                                    <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
+                                    <parameter name="target" value="{mcc}"/>
+                                    <parameter name="replacement" value="`$tmp.mcc`"/>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                    <parameter name="source" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
+                                    <parameter name="outputPath" value="tmp.patchPLMNInfoList-CUUP.url"/>
+                                    <parameter name="target" value="{mnc}"/>
+                                    <parameter name="replacement" value="`$tmp.mnc`"/>
+                                </execute>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="patch CUUP NSSAI parameters"/>
+                                    <parameter name="field2" value="`$tmp.nearRTRICId`"/>
+                                    <parameter name="field3" value="`$tmp.idGNBCUUPFunction`"/>
+                                    <parameter name="field4" value="`$tmp.mcc`"/>
+                                    <parameter name="field5" value="`$tmp.mnc`"/>
+                                    <parameter name="field6" value="`$tmp.patchPLMNInfoList-CUUP.url`"/>
+                                </record>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-sNSSAI-NRCellCU.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.patchPLMNInfoList-CUUP.url`"/>
+                                    <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                    <parameter name="httpMethod" value="PATCH"/>
+                                    <parameter name="responsePrefix" value="patch-gNBCUUP-PLMNInfoList-response"/>
+                                    <parameter name='contentType' value='application/yang.patch+json' />
+                                    <parameter name='accept' value='application/yang.patch-status+json'/>
+                                    <parameter name='format' value='json' />
+                                    <outcome value='failure'>
+                                        <block atomic='true'>
                                             <block atomic='true'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
-                                                        <parameter name="tmp.status" value="`$error-code`"/>
-                                                        <parameter name="tmp.reason" value="`$error-message`"/>
-                                                        <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
-                                                        <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
-                                                    </set>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
-                                                        <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="URL for SO Callback Response"/>
-                                                        <parameter name='field2' value="`$tmp.so.callbackURL`" />
-                                                        <parameter name='field3' value="`$tmp.status`" />
-                                                        <parameter name='field4' value="`$tmp.reason`" />
-                                                        <parameter name='field5' value="`$tmp.requestID`" />
-                                                        <parameter name='field6' value="`$tmp.action`" />
-                                                    </record>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
-                                                        <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
-                                                        <parameter name="httpMethod" value="POST"/>
-                                                        <parameter name="responsePrefix" value="so-callback-modify-response"/>
-                                                        <parameter name='contentType' value='application/json' />
-                                                        <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
-                                                        <parameter name="convertResponse" value="true"/>
-                                                        <outcome value='failure'>
-                                                            <block>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="Error sending SO Response" />
-                                                                </return>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block>
-                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                                    <parameter name="level" value="info" />
-                                                                    <parameter name="field1" value="SO Response Sent "/>
-                                                                </record>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
                                                 <set>
-                                                    <parameter name='error-code' value='500'/>
-                                                    <parameter name='error-message' value='Error patching CUUP PLMNInfoList. Aborting RPC executiopn'/>
+                                                    <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                                    <parameter name="tmp.status" value="`$error-code`"/>
+                                                    <parameter name="tmp.reason" value="`$error-message`"/>
+                                                    <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                                    <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
                                                 </set>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name='error-code' value='500'/>
-                                                    <parameter name='error-message' value='Error patching CUUP PLMNInfo. Aborting RPC executiopn'/>
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='success'>
-                                            <block atomic='true'>
                                                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
                                                     <parameter name="level" value="info" />
-                                                    <parameter name="field1" value="Successfully Patched - gNBCUUP PLMNInfo List"/>
+                                                    <parameter name="field1" value="URL for SO Callback Response"/>
+                                                    <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                                    <parameter name='field3' value="`$tmp.status`" />
+                                                    <parameter name='field4' value="`$tmp.reason`" />
+                                                    <parameter name='field5' value="`$tmp.requestID`" />
+                                                    <parameter name='field6' value="`$tmp.action`" />
                                                 </record>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                                    <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                                    <parameter name="httpMethod" value="POST"/>
+                                                    <parameter name="responsePrefix" value="so-callback-modify-response"/>
+                                                    <parameter name='contentType' value='application/json' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='accept' value='*/*' />
+                                                    <parameter name="convertResponse" value="true"/>
+                                                    <outcome value='failure'>
+                                                        <block>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error sending SO Response" />
+                                                            </return>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="SO Response Sent "/>
+                                                            </record>
+                                                        </block>
+                                                    </outcome>
+                                                </execute>
                                             </block>
-                                        </outcome>
-                                    </execute>
-                                    <set>
-                                        <parameter name='tmp.maxNumberOfDRBsPerNSSAI' value='`$tmp.payload.maxNumberofConns*4`' />
-                                        <parameter name='tmp.maxNumberOfDRBsPerCUUP' value='`$tmp.maxNumberOfDRBsPerNSSAI /$tmp.CUUPList_length`' />
-                                        <parameter name='tmp.rRMPolicyDedicatedRatio1' value='`$tmp.maxNumberOfDRBsPerCUUP*100`' />
-                                        <parameter name='tmp.rRMPolicyDedicatedRatio-CUUP' value='`$tmp.rRMPolicyDedicatedRatio1/$prop.cuupfunction.maxNumberOfDRBsPerCUUP`' />
-                                    </set>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                        <parameter name="level" value="info" />
-                                        <parameter name="field1" value="RRMPolicyRatio for this profile is - "/>
-                                        <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio-CUUP`"/>
-                                    </record>
-                                    <switch test='`$prop.ransim-mounted`'>
-                                        <outcome value='false'>
+                                            <set>
+                                                <parameter name='error-code' value='500'/>
+                                                <parameter name='error-message' value='Error patching CUUP PLMNInfoList. Aborting RPC executiopn'/>
+                                            </set>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name='error-code' value='500'/>
+                                                <parameter name='error-message' value='Error patching CUUP PLMNInfo. Aborting RPC executiopn'/>
+                                            </return>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block atomic='true'>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                <parameter name="level" value="info" />
+                                                <parameter name="field1" value="Successfully Patched - gNBCUUP PLMNInfo List"/>
+                                            </record>
+                                        </block>
+                                    </outcome>
+                                </execute>
+                                <set>
+                                    <parameter name='tmp.maxNumberOfDRBsPerNSSAI' value='`$tmp.payload.maxNumberofConns*4`' />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.maxNumberOfDRBsPerCUUP' value='`$tmp.maxNumberOfDRBsPerNSSAI /$tmp.CUUPList_length`' />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.rRMPolicyDedicatedRatio1' value='`$tmp.maxNumberOfDRBsPerCUUP*100`' />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.rRMPolicyDedicatedRatio-CUUP' value='`$tmp.rRMPolicyDedicatedRatio1/$prop.cuupfunction.maxNumberOfDRBsPerCUUP`' />
+                                </set>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="RRMPolicyRatio for this profile is - "/>
+                                    <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio-CUUP`"/>
+                                </record>
+                                <switch test='`$prop.ransim-mounted`'>
+                                    <outcome value='false'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP`"/>
+                                            <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                            <parameter name="target" value="{idNearRTRIC}"/>
+                                            <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
+                                        </execute>
+                                    </outcome>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP`"/>
+                                                <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted`"/>
                                                 <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
                                                 <parameter name="target" value="{idNearRTRIC}"/>
                                                 <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
                                             </execute>
-                                        </outcome>
-                                        <outcome value='true'>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                                <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                                <parameter name="target" value="{mountName}"/>
+                                                <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                    <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                    <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                    <parameter name="target" value="{idGNBCUUPFunction}"/>
+                                    <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setPropertiesForList'>
+                                    <parameter name='prefixKey' value='tmp.CUUPList.response' />
+                                    <parameter name='keyName' value='gNBCUUPId' />
+                                    <parameter name='keyValue' value="`$tmp.idGNBCUUPFunction`"/>
+                                </execute>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                    <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                    <parameter name="httpMethod" value="GET"/>
+                                    <parameter name="responsePrefix" value="get-rrmpolicyratio-cuup-response"/>
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='accept' value='application/json' />
+                                    <parameter name="convertResponse" value="true"/>
+                                    <outcome value='failure'>
+                                        <block atomic='true'>
                                             <block atomic='true'>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted`"/>
-                                                    <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                                    <parameter name="target" value="{idNearRTRIC}"/>
-                                                    <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
-                                                </execute>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                    <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
-                                                    <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                                    <parameter name="target" value="{mountName}"/>
-                                                    <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                                <set>
+                                                    <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                                    <parameter name="tmp.status" value="`$error-code`"/>
+                                                    <parameter name="tmp.reason" value="`$error-message`"/>
+                                                    <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                                    <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
+                                                </set>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
+                                                    <parameter name="level" value="info" />
+                                                    <parameter name="field1" value="URL for SO Callback Response"/>
+                                                    <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                                    <parameter name='field3' value="`$tmp.status`" />
+                                                    <parameter name='field4' value="`$tmp.reason`" />
+                                                    <parameter name='field5' value="`$tmp.requestID`" />
+                                                    <parameter name='field6' value="`$tmp.action`" />
+                                                </record>
+                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                                    <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                                    <parameter name="httpMethod" value="POST"/>
+                                                    <parameter name="responsePrefix" value="so-callback-modify-response"/>
+                                                    <parameter name='contentType' value='application/json' />
+                                                    <parameter name='format' value='json' />
+                                                    <parameter name='accept' value='*/*' />
+                                                    <parameter name="convertResponse" value="true"/>
+                                                    <outcome value='failure'>
+                                                        <block>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error sending SO Response" />
+                                                            </return>
+                                                        </block>
+                                                    </outcome>
+                                                    <outcome value='success'>
+                                                        <block>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="SO Response Sent "/>
+                                                            </record>
+                                                        </block>
+                                                    </outcome>
                                                 </execute>
                                             </block>
-                                        </outcome>
-                                    </switch>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
-                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                        <parameter name="target" value="{idGNBCUUPFunction}"/>
-                                        <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
-                                    </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                        <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.getRRMPolicyRatio-CUUP.url`"/>
-                                        <parameter name="restapiUser" value="`$prop.controller.user`" />
-                                        <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                                        <parameter name="httpMethod" value="GET"/>
-                                        <parameter name="responsePrefix" value="get-rrmpolicyratio-cuup-response"/>
-                                        <parameter name='contentType' value='application/json' />
-                                        <parameter name='format' value='json' />
-                                        <parameter name='accept' value='application/json' />
-                                        <parameter name="convertResponse" value="true"/>
-                                        <outcome value='failure'>
-                                            <block atomic='true'>
-                                                <block atomic='true'>
-                                                    <set>
-                                                        <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
-                                                        <parameter name="tmp.status" value="`$error-code`"/>
-                                                        <parameter name="tmp.reason" value="`$error-message`"/>
-                                                        <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
-                                                        <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
-                                                    </set>
-                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
-                                                        <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="URL for SO Callback Response"/>
-                                                        <parameter name='field2' value="`$tmp.so.callbackURL`" />
-                                                        <parameter name='field3' value="`$tmp.status`" />
-                                                        <parameter name='field4' value="`$tmp.reason`" />
-                                                        <parameter name='field5' value="`$tmp.requestID`" />
-                                                        <parameter name='field6' value="`$tmp.action`" />
-                                                    </record>
-                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
-                                                        <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
-                                                        <parameter name="httpMethod" value="POST"/>
-                                                        <parameter name="responsePrefix" value="so-callback-modify-response"/>
-                                                        <parameter name='contentType' value='application/json' />
-                                                        <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
-                                                        <parameter name="convertResponse" value="true"/>
-                                                        <outcome value='failure'>
-                                                            <block>
-                                                                <return status='failure'>
-                                                                    <parameter name='ack-final' value='Y'/>
-                                                                    <parameter name="error-code" value="500" />
-                                                                    <parameter name="error-message" value="Error sending SO Response" />
-                                                                </return>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='success'>
-                                                            <block>
-                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                                    <parameter name="level" value="info" />
-                                                                    <parameter name="field1" value="SO Response Sent "/>
-                                                                </record>
-                                                            </block>
-                                                        </outcome>
-                                                    </execute>
-                                                </block>
-                                                <set>
-                                                    <parameter name='error-code' value='500'/>
-                                                    <parameter name='error-message' value='Error in retrieving RRMPolicyRatio. Aborting RPC executiopn'/>
-                                                </set>
-                                                <return status='failure'>
-                                                    <parameter name='ack-final' value='Y'/>
-                                                    <parameter name='error-code' value='500'/>
-                                                    <parameter name='error-message' value='Error in fetching RRMPolicyRatio. Aborting RPC executiopn'/>
-                                                </return>
-                                            </block>
-                                        </outcome>
-                                        <outcome value='success'>
-                                            <block atomic='true'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                    <parameter name="level" value="info" />
-                                                    <parameter name="field1" value="Successfully Retrieved - RRMPolicyRatio"/>
-                                                </record>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                    <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
-                                                </execute>
-                                            </block>
-                                        </outcome>
-                                    </execute>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                        <parameter name='outputPath' value='tmp.rrmPolicyRatioList_CUUP_length' />
-                                        <parameter name='source' value="`'get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio_length '`" />
-                                    </execute>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                        <parameter name="level" value="info" />
-                                        <parameter name="field1" value="CUUP - RRMPolicyRatioList size"/>
-                                        <parameter name="field2" value="`$tmp.tmp.rrmPolicyRatioList_CUUP_length`"/>
-                                    </record>
-                                    <for index='idcuup-rrm' start='0' end='`$tmp.rrmPolicyRatioList_CUUP_length`' >
-                                        <block atomic='true'>
                                             <set>
-                                                <parameter name='tmp.rrmPolicyDedicatedRatio_CUUP' value="`'$get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
-                                                <parameter name='tmp.rrmPolicyDedicatedRatio_CUUP_updated' value="`$tmp.rrmPolicyDedicatedRatio_CUUP + $tmp.rRMPolicyDedicatedRatio-CUUP`" />
-                                            </set>
-                                            <switch test='`$prop.ransim-mounted`'>
-                                                <outcome value='false'>
-                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                        <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP`"/>
-                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                                        <parameter name="target" value="{idNearRTRIC}"/>
-                                                        <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
-                                                    </execute>
-                                                </outcome>
-                                                <outcome value='true'>
-                                                    <block atomic='true'>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                            <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted`"/>
-                                                            <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                                            <parameter name="target" value="{idNearRTRIC}"/>
-                                                            <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
-                                                        </execute>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
-                                                            <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
-                                                            <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
-                                                            <parameter name="target" value="{mountName}"/>
-                                                            <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
-                                                        </execute>
-                                                    </block>
-                                                </outcome>
-                                            </switch>
-                                            <set>
-                                                <parameter name='tmp.RRMPolicyRatio_id' value="`'$get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm+'].id'`" />
-                                            </set>
-                                            <set>
-                                                <parameter name='tmp.RRMPolicyMember_id' value="`'$get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm+ ']'.attributes.rRMPolicyMemberList_length+1`" />
+                                                <parameter name='error-code' value='500'/>
+                                                <parameter name='error-message' value='Error in retrieving RRMPolicyRatio. Aborting RPC executiopn'/>
                                             </set>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name='error-code' value='500'/>
+                                                <parameter name='error-message' value='Error in fetching RRMPolicyRatio. Aborting RPC executiopn'/>
+                                            </return>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block atomic='true'>
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                 <parameter name="level" value="info" />
-                                                <parameter name="field1" value="Updated RRMPolicyRatio for CUUP is - "/>
-                                                <parameter name="field2" value="`$tmp.rrmPolicyDedicatedRatio_CUUP_updated`"/>
+                                                <parameter name="field1" value="Successfully Retrieved - RRMPolicyRatio"/>
                                             </record>
-                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-RRMPolicyRatio-NRCellCU.json'`" />
-                                                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.getRRMPolicyRatio-CUUP.url`"/>
-                                                <parameter name="restapiUser" value="`$prop.controller.user`" />
-                                                <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
-                                                <parameter name="httpMethod" value="PATCH"/>
-                                                <parameter name="responsePrefix" value="patch-CUUP-RRMPolicyRatio-response"/>
-                                                <parameter name='contentType' value='application/yang.patch+json' />
-                                                <parameter name='accept' value='application/yang.patch-status+json'/>
-                                                <parameter name='format' value='json' />
-                                                <outcome value='success'>
-                                                    <block atomic='true'>
-                                                        <block atomic='true'>
-                                                            <set>
-                                                                <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
-                                                                <parameter name="tmp.status" value="`$error-code`"/>
-                                                                <parameter name="tmp.reason" value="`$error-message`"/>
-                                                                <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
-                                                                <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
-                                                            </set>
-                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
-                                                                <parameter name="level" value="info" />
-                                                                <parameter name="field1" value="URL for SO Callback Response"/>
-                                                                <parameter name='field2' value="`$tmp.so.callbackURL`" />
-                                                                <parameter name='field3' value="`$tmp.status`" />
-                                                                <parameter name='field4' value="`$tmp.reason`" />
-                                                                <parameter name='field5' value="`$tmp.requestID`" />
-                                                                <parameter name='field6' value="`$tmp.action`" />
-                                                            </record>
-                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
-                                                                <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
-                                                                <parameter name="httpMethod" value="POST"/>
-                                                                <parameter name="responsePrefix" value="so-callback-modify-response"/>
-                                                                <parameter name='contentType' value='application/json' />
-                                                                <parameter name='format' value='json' />
-                                                                <parameter name='accept' value='application/json' />
-                                                                <parameter name="convertResponse" value="true"/>
-                                                                <outcome value='failure'>
-                                                                    <block>
-                                                                        <return status='failure'>
-                                                                            <parameter name='ack-final' value='Y'/>
-                                                                            <parameter name="error-code" value="500" />
-                                                                            <parameter name="error-message" value="Error sending SO Response" />
-                                                                        </return>
-                                                                    </block>
-                                                                </outcome>
-                                                                <outcome value='success'>
-                                                                    <block>
-                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                                            <parameter name="level" value="info" />
-                                                                            <parameter name="field1" value="SO Response Sent "/>
-                                                                        </record>
-                                                                    </block>
-                                                                </outcome>
-                                                            </execute>
-                                                        </block>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="Successfully Patched - cellCU RRMpolicyRatio"/>
-                                                        </record>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='failure'>
-                                                    <block atomic='true'>
-                                                        <set>
-                                                            <parameter name='error-code' value='500'/>
-                                                            <parameter name='error-message' value='Error patching cellCU RRMPolicyRatio. Aborting RPC executiopn'/>
-                                                        </set>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name='error-code' value='500'/>
-                                                            <parameter name='error-message' value='Error updating nearRTRIC info in ConfigDB. Aborting RPC executiopn'/>
-                                                        </return>
-                                                    </block>
-                                                </outcome>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
                                             </execute>
                                         </block>
-                                    </for>
+                                    </outcome>
+                                </execute>
+                                <set>
+                                    <parameter name='tmp.rrmPolicyRatioList_CUUP_length' value='`$get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio_length`'/>
+                                </set>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="CUUP - RRMPolicyRatioList size"/>
+                                    <parameter name="field2" value="`$tmp.rrmPolicyRatioList_CUUP_length`"/>
+                                </record>
+                                <for index='idcuup-rrm' start='0' end='`$tmp.rrmPolicyRatioList_CUUP_length`' >
                                     <block atomic='true'>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='outputPath' value='tmp.rrmPolicyDedicatedRatio_CUUP' />
+                                            <parameter name='source' value="`'get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='tmp.rrmPolicyDedicatedRatio_CUUP_updated' value="`$tmp.rrmPolicyDedicatedRatio_CUUP + $tmp.rRMPolicyDedicatedRatio-CUUP`" />
+                                        </set>
+                                        <switch test='`$prop.ransim-mounted`'>
+                                            <outcome value='false'>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                    <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP`"/>
+                                                    <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                                    <parameter name="target" value="{idNearRTRIC}"/>
+                                                    <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
+                                                </execute>
+                                            </outcome>
+                                            <outcome value='true'>
+                                                <block atomic='true'>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$prop.restapi.RRMPolicyRatioEntry.ToGNBCUUP.ransim-mounted`"/>
+                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                                        <parameter name="target" value="{idNearRTRIC}"/>
+                                                        <parameter name="replacement" value="`$tmp.nearRTRICId`"/>
+                                                    </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                                        <parameter name="target" value="{mountName}"/>
+                                                        <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                                    </execute>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                            <parameter name="source" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                            <parameter name="outputPath" value="tmp.getRRMPolicyRatio-CUUP.url"/>
+                                            <parameter name="target" value="{idGNBCUUPFunction}"/>
+                                            <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='outputPath' value='tmp.RRMPolicyRatio_id' />
+                                            <parameter name='source' value="`'get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm+'].id'`" />
+                                        </execute>
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                            <parameter name='outputPath' value='tmp.rrmPolicyMembers-CUUP' />
+                                            <parameter name='source' value="`'get-rrmpolicyratio-cuup-response.attributes.RRMPolicyRatio['+ $idcuup-rrm+ ']'.attributes.rRMPolicyMemberList_length'`" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='tmp.RRMPolicyMember_id' value="`$tmp.rrmPolicyMembers-CUUP+1`" />
+                                        </set>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                            <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="Updated RRMPolicyRatio for CUUP is - "/>
+                                            <parameter name="field2" value="`$tmp.rrmPolicyDedicatedRatio_CUUP_updated`"/>
+                                            <parameter name="field3" value="RRMPolicyRatio_id is - "/>
+                                            <parameter name="field4" value="`$tmp.RRMPolicyRatio_id`"/>
+                                            <parameter name="field5" value="RRMPolicyMember_id CUUP is - "/>
+                                            <parameter name="field6" value="`$tmp.RRMPolicyMember_id`"/>
+                                            <parameter name="field7" value="Existing RRMPolicyMembers Length"/>
+                                            <parameter name="field8" value="`$tmp.rrmPolicyMembers-CUUP`"/>
+                                            <parameter name="field9" value="Update RRMPolicyRatio URL - "/>
+                                            <parameter name="field10" value="`$tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                        </record>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updategNBCUUP`"/>
-                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/restapi.configDB.updategNBCUUP.templatefile'`" />
-                                            <parameter name="httpMethod" value="PUT"/>
-                                            <parameter name="responsePrefix" value="update-gNBCUUP-configdb-response"/>
-                                            <parameter name='contentType' value='application/json' />
+                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-RRMPolicyRatio-NRCellCU.json'`" />
+                                            <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.getRRMPolicyRatio-CUUP.url`"/>
+                                            <parameter name="restapiUser" value="`$prop.controller.user`" />
+                                            <parameter name="restapiPassword" value="`$prop.controller.pwd`"/>
+                                            <parameter name="httpMethod" value="PATCH"/>
+                                            <parameter name="responsePrefix" value="patch-CUUP-RRMPolicyRatio-response"/>
+                                            <parameter name='contentType' value='application/yang.patch+json' />
+                                            <parameter name='accept' value='application/yang.patch-status+json'/>
                                             <parameter name='format' value='json' />
-                                            <parameter name='accept' value='application/json' />
-                                            <parameter name="convertResponse" value="true"/>
+                                            <outcome value='success'>
+                                                <block atomic='true'>
+                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                        <parameter name="level" value="info" />
+                                                        <parameter name="field1" value="Successfully Patched - cellCU RRMpolicyRatio"/>
+                                                    </record>
+                                                </block>
+                                            </outcome>
                                             <outcome value='failure'>
                                                 <block atomic='true'>
                                                     <block atomic='true'>
@@ -1252,7 +1577,7 @@
                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                             <parameter name='contentType' value='application/json' />
                                                             <parameter name='format' value='json' />
-                                                            <parameter name='accept' value='application/json' />
+                                                            <parameter name='accept' value='*/*' />
                                                             <parameter name="convertResponse" value="true"/>
                                                             <outcome value='failure'>
                                                                 <block>
@@ -1276,107 +1601,277 @@
                                                     </block>
                                                     <set>
                                                         <parameter name='error-code' value='500'/>
-                                                        <parameter name='error-message' value='Error in updating Config DB - NRCellCU. Aborting RPC executiopn'/>
+                                                        <parameter name='error-message' value='Error patching cellCU RRMPolicyRatio. Aborting RPC executiopn'/>
                                                     </set>
                                                     <return status='failure'>
                                                         <parameter name='ack-final' value='Y'/>
                                                         <parameter name='error-code' value='500'/>
-                                                        <parameter name='error-message' value='Error updating NRCellCU-PLMNInfo in ConfigDB. Aborting RPC executiopn'/>
+                                                        <parameter name='error-message' value='Error updating nearRTRIC info in ConfigDB. Aborting RPC executiopn'/>
                                                     </return>
                                                 </block>
                                             </outcome>
-                                            <outcome value='success'>
-                                                <block>
+                                        </execute>
+                                    </block>
+                                </for>
+                                <block atomic='true'>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="Config DB update"/>
+                                    </record>
+                                    <set>
+                                        <parameter name='tmp.gNBCUUPList.gNBCUUPId' value='`$tmp.idGNBCUUPFunction`'/>
+                                        <parameter name='tmp.gNBCUUPList.gNBId' value='`$tmp.gNBId`'/>
+                                        <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                                        <parameter name='payloadJson.input.sliceProfile.sNSSAI' value='`$tmp.sNSSAI`'/>
+                                        <parameter name='tmp.maxNumberOfConns' value='`$tmp.payload.maxNumberofConns`'/>
+                                    </set>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="sNSSAI"/>
+                                        <parameter name="field2" value="`$payloadJson.input.sliceProfile.sNSSAI`"/>
+                                        <parameter name="field3" value="maxNumberOfConns"/>
+                                        <parameter name="field4" value="`$tmp.maxNumberOfConns`"/>
+                                        <parameter name="field5" value="gNBCUUPId"/>
+                                        <parameter name="field6" value="`$tmp.gNBCUUPList.gNBCUUPId`"/>
+                                        <parameter name="field7" value="pLMNId"/>
+                                        <parameter name="field8" value="`$tmp.payload.pLMNId`"/>
+                                        <parameter name="field9" value="gNBId"/>
+                                        <parameter name="field10" value="`$tmp.gNBCUUPList.gNBId`"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updategNBCUUP`"/>
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updategNBCUUP.json'`" />
+                                        <parameter name="httpMethod" value="PUT"/>
+                                        <parameter name="responsePrefix" value="update-gNBCUUP-configdb-response"/>
+                                        <parameter name='contentType' value='application/json' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='accept' value='application/json' />
+                                        <parameter name="convertResponse" value="true"/>
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <block atomic='true'>
+                                                    <set>
+                                                        <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                                        <parameter name="tmp.status" value="`$error-code`"/>
+                                                        <parameter name="tmp.reason" value="`$error-message`"/>
+                                                        <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                                        <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
+                                                    </set>
                                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
                                                         <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="Successfully updated ConfigDB - NRCellCU pLMNinfo "/>
+                                                        <parameter name="field1" value="URL for SO Callback Response"/>
+                                                        <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                                        <parameter name='field3' value="`$tmp.status`" />
+                                                        <parameter name='field4' value="`$tmp.reason`" />
+                                                        <parameter name='field5' value="`$tmp.requestID`" />
+                                                        <parameter name='field6' value="`$tmp.action`" />
                                                     </record>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                                        <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                                        <parameter name="httpMethod" value="POST"/>
+                                                        <parameter name="responsePrefix" value="so-callback-modify-response"/>
+                                                        <parameter name='contentType' value='application/json' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='accept' value='*/*' />
+                                                        <parameter name="convertResponse" value="true"/>
+                                                        <outcome value='failure'>
+                                                            <block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Error sending SO Response" />
+                                                                </return>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                    <parameter name="level" value="info" />
+                                                                    <parameter name="field1" value="SO Response Sent "/>
+                                                                </record>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
-                                            </outcome>
-                                        </execute>
-                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                            <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRRMPolicy`"/>
-                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/restapi.configDB.updateRRMPolicy.CUUP.templatefile'`" />
-                                            <parameter name="httpMethod" value="PUT"/>
-                                            <parameter name="responsePrefix" value="update-gNBCUUP-rrmpolicy-configdb-response"/>
-                                            <parameter name='contentType' value='application/json' />
-                                            <parameter name='format' value='json' />
-                                            <parameter name='accept' value='application/json' />
-                                            <parameter name="convertResponse" value="true"/>
-                                            <outcome value='failure'>
-                                                <block atomic='true'>
-                                                    <block atomic='true'>
-                                                        <set>
-                                                            <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
-                                                            <parameter name="tmp.status" value="`$error-code`"/>
-                                                            <parameter name="tmp.reason" value="`$error-message`"/>
-                                                            <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
-                                                            <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
-                                                        </set>
-                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
-                                                            <parameter name="level" value="info" />
-                                                            <parameter name="field1" value="URL for SO Callback Response"/>
-                                                            <parameter name='field2' value="`$tmp.so.callbackURL`" />
-                                                            <parameter name='field3' value="`$tmp.status`" />
-                                                            <parameter name='field4' value="`$tmp.reason`" />
-                                                            <parameter name='field5' value="`$tmp.requestID`" />
-                                                            <parameter name='field6' value="`$tmp.action`" />
-                                                        </record>
-                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
-                                                            <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
-                                                            <parameter name="httpMethod" value="POST"/>
-                                                            <parameter name="responsePrefix" value="so-callback-modify-response"/>
-                                                            <parameter name='contentType' value='application/json' />
-                                                            <parameter name='format' value='json' />
-                                                            <parameter name='accept' value='application/json' />
-                                                            <parameter name="convertResponse" value="true"/>
-                                                            <outcome value='failure'>
-                                                                <block>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="Error sending SO Response" />
-                                                                    </return>
-                                                                </block>
-                                                            </outcome>
-                                                            <outcome value='success'>
-                                                                <block>
-                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                                        <parameter name="level" value="info" />
-                                                                        <parameter name="field1" value="SO Response Sent "/>
-                                                                    </record>
-                                                                </block>
-                                                            </outcome>
-                                                        </execute>
-                                                    </block>
+                                                <set>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error in updating Config DB - CUUP. Aborting RPC executiopn'/>
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error updating CUUP-PLMNInfo in ConfigDB. Aborting RPC executiopn'/>
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                    <parameter name="level" value="info" />
+                                                    <parameter name="field1" value="Successfully updated ConfigDB - NRCellCU pLMNinfo "/>
+                                                </record>
+                                            </block>
+                                        </outcome>
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                        <parameter name="source" value="`$prop.restapi.configdb.getRRMPolicyRatio`"/>
+                                        <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                        <parameter name="target" value="{resourceType}"/>
+                                        <parameter name="replacement" value="DRB"/>
+                                    </execute>
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                        <parameter name="source" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                        <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                        <parameter name="target" value="{resourceId}"/>
+                                        <parameter name="replacement" value="`$tmp.idGNBCUUPFunction`"/>
+                                    </execute>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="get RRMPolicyby Resource URL"/>
+                                        <parameter name="field2" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                        <parameter name="httpMethod" value="GET"/>
+                                        <parameter name="responsePrefix" value="getrrmpolicyratioinfo-cuup-configdb-response"/>
+                                        <parameter name='contentType' value='application/json' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='accept' value='application/json' />
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <set>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error in retrieving RRMPolicyRatio. Aborting RPC executiopn'/>
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error in Fetching RRMPolicyRatio - CellCU. Aborting RPC executiopn'/>
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block atomic='true'>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                    <parameter name="level" value="info" />
+                                                    <parameter name="field1" value="Successfully Retrieved - RRMPolicyRatio"/>
+                                                </record>
+                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                    <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                                                </execute>
+                                            </block>
+                                        </outcome>
+                                    </execute>
+                                    <set>
+                                        <parameter name='tmp.rRMPolicyDedicatedRatio.CUUP' value='`$tmp.rrmPolicyDedicatedRatio_CUUP_updated`'/>
+                                        <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                                        <parameter name='tmp.payload.sNSSAI' value='`$tmp.sNSSAI`'/>
+                                        <parameter name='prop.configDB.rrmPolicyID' value='`$getrrmpolicyratioinfo-cuup-configdb-response.rrmPolicyID`'/>
+                                        <parameter name='tmp.resourceID' value='`$tmp.idGNBCUUPFunction`'/>
+                                    </set>
+                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                        <parameter name="level" value="info" />
+                                        <parameter name="field1" value="rRMPolicyDedicatedRatio"/>
+                                        <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio.CUUP`"/>
+                                        <parameter name="field3" value="pLMNId"/>
+                                        <parameter name="field4" value="`$tmp.payload.pLMNId`"/>
+                                        <parameter name="field5" value="sNSSAI"/>
+                                        <parameter name="field6" value="`$tmp.sNSSAI`"/>
+                                        <parameter name="field7" value="rrmPolicyID"/>
+                                        <parameter name="field8" value="`$prop.configDB.rrmPolicyID`"/>
+                                        <parameter name="field9" value="resourceID"/>
+                                        <parameter name="field10" value="`$tmp.resourceID`"/>
+                                    </record>
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                        <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRRMPolicy`"/>
+                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRRMPolicy-CUUP.json'`" />
+                                        <parameter name="httpMethod" value="PUT"/>
+                                        <parameter name="responsePrefix" value="update-gNBCUUP-rrmpolicy-configdb-response"/>
+                                        <parameter name='contentType' value='application/json' />
+                                        <parameter name='format' value='json' />
+                                        <parameter name='accept' value='application/json' />
+                                        <parameter name="convertResponse" value="true"/>
+                                        <outcome value='failure'>
+                                            <block atomic='true'>
+                                                <block atomic='true'>
                                                     <set>
-                                                        <parameter name='error-code' value='500'/>
-                                                        <parameter name='error-message' value='Error in updating RRMPolicyRatio - CUUP. Aborting RPC executiopn'/>
+                                                        <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                                        <parameter name="tmp.status" value="`$error-code`"/>
+                                                        <parameter name="tmp.reason" value="`$error-message`"/>
+                                                        <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                                        <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
                                                     </set>
-                                                    <return status='failure'>
-                                                        <parameter name='ack-final' value='Y'/>
-                                                        <parameter name='error-code' value='500'/>
-                                                        <parameter name='error-message' value='Error updating CUUP-RRMPolicyRatio in ConfigDB. Aborting RPC executiopn'/>
-                                                    </return>
-                                                </block>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <block>
                                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
                                                         <parameter name="level" value="info" />
-                                                        <parameter name="field1" value="Successfully updated ConfigDB - CUUP RRMPolicyRatio "/>
+                                                        <parameter name="field1" value="URL for SO Callback Response"/>
+                                                        <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                                        <parameter name='field3' value="`$tmp.status`" />
+                                                        <parameter name='field4' value="`$tmp.reason`" />
+                                                        <parameter name='field5' value="`$tmp.requestID`" />
+                                                        <parameter name='field6' value="`$tmp.action`" />
                                                     </record>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                                        <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                                        <parameter name="httpMethod" value="POST"/>
+                                                        <parameter name="responsePrefix" value="so-callback-modify-response"/>
+                                                        <parameter name='contentType' value='application/json' />
+                                                        <parameter name='format' value='json' />
+                                                        <parameter name='accept' value='*/*' />
+                                                        <parameter name="convertResponse" value="true"/>
+                                                        <outcome value='failure'>
+                                                            <block>
+                                                                <return status='failure'>
+                                                                    <parameter name='ack-final' value='Y'/>
+                                                                    <parameter name="error-code" value="500" />
+                                                                    <parameter name="error-message" value="Error sending SO Response" />
+                                                                </return>
+                                                            </block>
+                                                        </outcome>
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                    <parameter name="level" value="info" />
+                                                                    <parameter name="field1" value="SO Response Sent "/>
+                                                                </record>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
-                                            </outcome>
-                                        </execute>
-                                    </block>
+                                                <set>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error in updating RRMPolicyRatio - CUUP. Aborting RPC executiopn'/>
+                                                </set>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name='error-code' value='500'/>
+                                                    <parameter name='error-message' value='Error updating CUUP-RRMPolicyRatio in ConfigDB. Aborting RPC executiopn'/>
+                                                </return>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='success'>
+                                            <block>
+                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                    <parameter name="level" value="info" />
+                                                    <parameter name="field1" value="Successfully updated ConfigDB - CUUP RRMPolicyRatio "/>
+                                                </record>
+                                            </block>
+                                        </outcome>
+                                    </execute>
                                 </block>
-                            </for>
+                            </block>
                         </block>
                     </for>
                 </block>
@@ -1410,26 +1905,18 @@
                                 <parameter name='source' value="`'getNFNSSIRIC-configdb-response.[' + $idy +'].gNBDUList[' + $id-du +'].cellDUList_length'`" />
                             </execute>
                             <for index='id-celldu' start='0' end='`$tmp.cellDUList_length`' >
-                                <block>
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                        <parameter name='outputPath' value='tmp.DUpLMNInfoList_length' />
-                                        <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBDUList['+ $id-du +'].cellDUList['+ $id-celldu +'].pLMNInfoList_length '`" />
-                                    </execute>
-                                    <for index='id-duplmn' start='0' end='`$tmp.DUpLMNInfoList_length`' >
+                                <block atomic='true'>
+                                    <for index='id-ta' start='0' end='`$getListofCells-configdb-response._length`' >
                                         <block atomic='true'>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                <parameter name='outputPath' value='tmp.configDBSNSSAI-DU' />
-                                                <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBDUList['+ $id-du +'].cellDUList['+ $id-celldu +'].pLMNInfoList['+ $id-duplmn +'].sNSSAI.sNSSAI'`" />
+                                                <parameter name='outputPath' value='tmp.cellCULocalId' />
+                                                <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBDUList['+ $id-du +'].cellDUList['+ $id-celldu +'].cellLocalId'`" />
                                             </execute>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
-                                                <parameter name="level" value="info" />
-                                                <parameter name="field1" value="sNSSAI - getNFNSSIRIC-configdb-response"/>
-                                                <parameter name="field2" value="`$tmp.configDBSNSSAI-DU`"/>
-                                                <parameter name="field3" value="sNSSAI from request"/>
-                                                <parameter name="field4" value="`$tmp.sNSSAI`"/>
-                                            </record>
-                                            <switch test='`$tmp.configDBSNSSAI-DU == $tmp.sNSSAI`'>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='tmp.cellCU2' />
+                                                <parameter name='source' value="`'getListofCells-configdb-response.[' + $id-ta + ']'`" />
+                                            </execute>
+                                            <switch test='`$tmp.cellCULocalId == $tmp.cellCU2`'>
                                                 <outcome value='true'>
                                                     <block atomic='true'>
                                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -1465,7 +1952,7 @@
                                                         </switch>
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                                                             <parameter name='outputPath' value='tmp.cellDULocalId' />
-                                                            <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBDUList['+ $id-du +'].cellCUList['+ $id-celldu +'].cellLocalId'`" />
+                                                            <parameter name='source' value="`'getNFNSSIRIC-configdb-response.['+ $idy +'].gNBDUList['+ $id-du +'].cellDUList['+ $id-celldu +'].cellLocalId'`" />
                                                         </execute>
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                                             <parameter name="source" value="`$tmp.patchPLMNInfoListEntry-cellDU.url`"/>
@@ -1477,7 +1964,7 @@
                                                             <parameter name="source" value="`$tmp.patchPLMNInfoListEntry-cellDU.url`"/>
                                                             <parameter name="outputPath" value="tmp.patchPLMNInfoListEntry-cellDU.url"/>
                                                             <parameter name="target" value="{idNRCellDU}"/>
-                                                            <parameter name="replacement" value="`$tmp.cellCULocalId`"/>
+                                                            <parameter name="replacement" value="`$tmp.cellDULocalId`"/>
                                                         </execute>
                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                                             <parameter name="source" value="`$tmp.patchPLMNInfoListEntry-cellDU.url`"/>
@@ -1539,7 +2026,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -1582,6 +2069,11 @@
                                                                 </block>
                                                             </outcome>
                                                         </execute>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setPropertiesForList'>
+                                                            <parameter name='prefixKey' value='tmp.DUList.response' />
+                                                            <parameter name='keyName' value='gNBDUId' />
+                                                            <parameter name='keyValue' value="`$tmp.GNBDUId`"/>
+                                                        </execute>
                                                         <block atomic='true'>
                                                             <block atomic='true'>
                                                                 <set>
@@ -1633,6 +2125,12 @@
                                                                     <parameter name="field14" value="`$tmp.rRMPolicyDedicatedRatio.CellDU1`"/>
                                                                 </record>
                                                             </block>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="Calculated RRMPolicyRatio"/>
+                                                                <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio.CellDU`"/>
+                                                            </record>
                                                             <switch test='`$prop.ransim-mounted`'>
                                                                 <outcome value='false'>
                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
@@ -1671,6 +2169,12 @@
                                                                 <parameter name="target" value="{idNRCellDU}"/>
                                                                 <parameter name="replacement" value="`$tmp.cellDULocalId`"/>
                                                             </execute>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="idNRCellDU"/>
+                                                                <parameter name="field2" value="`$tmp.cellDULocalId`"/>
+                                                            </record>
                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                 <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.getRRMPolicyRatio-gNBDU.url`"/>
                                                                 <parameter name="restapiUser" value="`$prop.controller.user`" />
@@ -1708,7 +2212,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -1754,21 +2258,23 @@
                                                                     </block>
                                                                 </outcome>
                                                             </execute>
-                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                                <parameter name='outputPath' value='tmp.rrmPolicyRatioDUList_length' />
-                                                                <parameter name='source' value="`'get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio_length '`" />
-                                                            </execute>
+                                                            <set>
+                                                                <parameter name='tmp.rrmPolicyRatioDUList_length' value='`$get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio_length`'/>
+                                                            </set>
                                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                                 <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                                 <parameter name="level" value="info" />
                                                                 <parameter name="field1" value="RRMPolicyRatioList size"/>
-                                                                <parameter name="field2" value="`$tmp.rrmPolicyRatioList_length`"/>
+                                                                <parameter name="field2" value="`$tmp.rrmPolicyRatioDUList_length`"/>
                                                             </record>
                                                             <for index='iddu-rrm' start='0' end='`$tmp.rrmPolicyRatioDUList_length`' >
                                                                 <block atomic='true'>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.rrmPolicyDedicatedRatio_cellDU-old' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio['+ $iddu-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
+                                                                    </execute>
                                                                     <set>
-                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_cellDU' value="`'$get-rrmpolicyratio-response.attributes.RRMPolicyRatio['+ $iddu-rrm +'].attributes.rRMPolicyDedicatedRatio'`" />
-                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_CellDU_updated' value="`$tmp.rrmPolicyDedicatedRatio_cellDU + $tmp.rRMPolicyDedicatedRatio.CellDU`" />
+                                                                        <parameter name='tmp.rrmPolicyDedicatedRatio_CellDU_updated' value="`$tmp.rrmPolicyDedicatedRatio_cellDU-old + $tmp.rRMPolicyDedicatedRatio.CellDU`" />
                                                                     </set>
                                                                     <switch test='`$prop.ransim-mounted`'>
                                                                         <outcome value='false'>
@@ -1796,17 +2302,38 @@
                                                                             </block>
                                                                         </outcome>
                                                                     </switch>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.RRMPolicyRatio_id' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio['+ $iddu-rrm+'].id'`" />
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio-gNBDU.url`"/>
+                                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-gNBDU.url"/>
+                                                                        <parameter name="target" value="{idGNBDUFunction}"/>
+                                                                        <parameter name="replacement" value="`$tmp.GNBDUId`"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                        <parameter name="source" value="`$tmp.getRRMPolicyRatio-gNBDU.url`"/>
+                                                                        <parameter name="outputPath" value="tmp.getRRMPolicyRatio-gNBDU.url"/>
+                                                                        <parameter name="target" value="{idNRCellDU}"/>
+                                                                        <parameter name="replacement" value="`$tmp.cellDULocalId`"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                                        <parameter name='outputPath' value='tmp.RRMPolicyMembersDU_Length' />
+                                                                        <parameter name='source' value="`'get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio['+ $iddu-rrm+ ']'.attributes.rRMPolicyMemberList_length'`" />
+                                                                    </execute>
                                                                     <set>
-                                                                        <parameter name='tmp.RRMPolicyRatio_id' value="`'$get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio['+ $iddu-rrm+'].id'`" />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='tmp.RRMPolicyMember_id' value="`'$get-rrmpolicyratio-du-response.attributes.RRMPolicyRatio['+ $iddu-rrm+ ']'.attributes.rRMPolicyMemberList_length+1`" />
+                                                                        <parameter name='tmp.RRMPolicyMember_id' value="`$tmp.RRMPolicyMembersDU_Length+1`" />
                                                                     </set>
                                                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                                         <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
                                                                         <parameter name="level" value="info" />
-                                                                        <parameter name="field1" value="Updated RRMPolicyRatio for CellCU is - "/>
-                                                                        <parameter name="field2" value="`$tmp.rrmPolicyDedicatedRatio_updated`"/>
+                                                                        <parameter name="field1" value="RRMPolicyRatioid - "/>
+                                                                        <parameter name="field2" value="`$tmp.RRMPolicyRatio_id`"/>
+                                                                        <parameter name="field3" value="RRMPolicyMemberid- "/>
+                                                                        <parameter name="field4" value="`$tmp.RRMPolicyMember_id`"/>
+                                                                        <parameter name="field5" value="Updated RRMPolicyRatio for CellDU is - "/>
+                                                                        <parameter name="field6" value="`$tmp.rrmPolicyDedicatedRatio_CellDU_updated`"/>
                                                                     </record>
                                                                     <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                         <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-patch-RRMPolicyRatio-NRCellCU.json'`" />
@@ -1854,7 +2381,7 @@
                                                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                         <parameter name='contentType' value='application/json' />
                                                                                         <parameter name='format' value='json' />
-                                                                                        <parameter name='accept' value='application/json' />
+                                                                                        <parameter name='accept' value='*/*' />
                                                                                         <parameter name="convertResponse" value="true"/>
                                                                                         <outcome value='failure'>
                                                                                             <block>
@@ -1892,9 +2419,37 @@
                                                             </for>
                                                         </block>
                                                         <block atomic='true'>
+                                                            <set>
+                                                                <parameter name='tmp.cellLocalId' value='`$tmp.cellDULocalId`'/>
+                                                                <parameter name='tmp.maxNumberOfConns' value='`$tmp.payload.maxNumberofConns`'/>
+                                                                <parameter name='tmp.dLThptPerSlice' value='`$tmp.payload.dLThptPerSlice`'/>
+                                                                <parameter name='tmp.uLThptPerSlice' value='`$tmp.payload.uLThptPerSlice`'/>
+                                                                <parameter name='tmp.payload.sNSSAI' value='`$tmp.sNSSAI`'/>
+                                                                <parameter name='tmp.gNBId' value='`$tmp.gNBId`'/>
+                                                                <parameter name='tmp.gNBDUList.gNBDUId' value='`$tmp.GNBDUId`'/>
+                                                            </set>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="cellLocalId"/>
+                                                                <parameter name="field2" value="`$tmp.cellLocalId`"/>
+                                                                <parameter name="field3" value="pLMNId"/>
+                                                                <parameter name="field4" value="`$tmp.pLMNId`"/>
+                                                                <parameter name="field5" value="maxNumberOfConns"/>
+                                                                <parameter name="field6" value="`$tmp.maxNumberOfConns`"/>
+                                                                <parameter name="field7" value="GNBDUId"/>
+                                                                <parameter name="field8" value="`$tmp.gNBDUList.gNBDUId`"/>
+                                                                <parameter name="field9" value="gNBId"/>
+                                                                <parameter name="field10" value="`$tmp.gNBId`"/>
+                                                                <parameter name="field11" value="dLThptPerSlice"/>
+                                                                <parameter name="field12" value="`$tmp.dLThptPerSlice`"/>
+                                                                <parameter name="field13" value="uLThptPerSlice"/>
+                                                                <parameter name="field14" value="`$tmp.uLThptPerSlice`"/>
+                                                            </record>
                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                 <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updategNBDU`"/>
-                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/restapi.configDB.updategNBDU.templatefile'`" />
+                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updategNBDU.json
+'`" />
                                                                 <parameter name="httpMethod" value="PUT"/>
                                                                 <parameter name="responsePrefix" value="update-gNBDU-configdb-response"/>
                                                                 <parameter name='contentType' value='application/json' />
@@ -1928,7 +2483,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -1971,9 +2526,81 @@
                                                                     </block>
                                                                 </outcome>
                                                             </execute>
+                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                <parameter name="source" value="`$prop.restapi.configdb.getRRMPolicyRatio`"/>
+                                                                <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                                                <parameter name="target" value="{resourceType}"/>
+                                                                <parameter name="replacement" value="PRB"/>
+                                                            </execute>
+                                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                                <parameter name="source" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                                <parameter name="outputPath" value="tmp.configdb.getRRMPolicyRatio-existing.url"/>
+                                                                <parameter name="target" value="{resourceId}"/>
+                                                                <parameter name="replacement" value="`$tmp.cellDULocalId`"/>
+                                                            </execute>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="get RRMPolicyby Resource URL"/>
+                                                                <parameter name="field2" value="`$tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                            </record>
+                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                <parameter name="restapiUrl" value="`$prop.configdb.url + $tmp.configdb.getRRMPolicyRatio-existing.url`"/>
+                                                                <parameter name="httpMethod" value="GET"/>
+                                                                <parameter name="responsePrefix" value="getrrmpolicyratioinfoDU-configdb-response"/>
+                                                                <parameter name='contentType' value='application/json' />
+                                                                <parameter name='format' value='json' />
+                                                                <parameter name='accept' value='application/json' />
+                                                                <outcome value='failure'>
+                                                                    <block atomic='true'>
+                                                                        <set>
+                                                                            <parameter name='error-code' value='500'/>
+                                                                            <parameter name='error-message' value='Error in retrieving RRMPolicyRatio. Aborting RPC executiopn'/>
+                                                                        </set>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name='error-code' value='500'/>
+                                                                            <parameter name='error-message' value='Error in Fetching RRMPolicyRatio - CellCU. Aborting RPC executiopn'/>
+                                                                        </return>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <block atomic='true'>
+                                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                            <parameter name="level" value="info" />
+                                                                            <parameter name="field1" value="Successfully Retrieved - RRMPolicyRatio"/>
+                                                                        </record>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-instantiateRANSlice-configrsp-context.log' />
+                                                                        </execute>
+                                                                    </block>
+                                                                </outcome>
+                                                            </execute>
+                                                            <set>
+                                                                <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                                                                <parameter name='tmp.payload.sNSSAI' value='`$tmp.sNSSAI`'/>
+                                                                <parameter name='prop.configDB.rrmPolicyID' value='`$getrrmpolicyratioinfoDU-configdb-response.rrmPolicyID`'/>
+                                                                <parameter name='tmp.resourceID' value='`$tmp.cellDULocalId`'/>
+                                                                <parameter name='tmp.rRMPolicyDedicatedRatio.CellDU' value='`$tmp.rrmPolicyDedicatedRatio_CellDU_updated`'/>
+                                                            </set>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                                <parameter name="level" value="info" />
+                                                                <parameter name="field1" value="rRMPolicyDedicatedRatio"/>
+                                                                <parameter name="field2" value="`$tmp.rRMPolicyDedicatedRatio.CellDU`"/>
+                                                                <parameter name="field3" value="pLMNId"/>
+                                                                <parameter name="field4" value="`$tmp.payload.pLMNId`"/>
+                                                                <parameter name="field5" value="sNSSAI"/>
+                                                                <parameter name="field6" value="`$tmp.sNSSAI`"/>
+                                                                <parameter name="field7" value="rrmPolicyID"/>
+                                                                <parameter name="field8" value="`$prop.configDB.rrmPolicyID`"/>
+                                                                <parameter name="field9" value="resourceID"/>
+                                                                <parameter name="field10" value="`$tmp.resourceID`"/>
+                                                            </record>
                                                             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                 <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRRMPolicy`"/>
-                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRRMPolicy-CUCP.json'`" />
+                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRRMPolicy-DU.json'`" />
                                                                 <parameter name="httpMethod" value="PUT"/>
                                                                 <parameter name="responsePrefix" value="update-gNBDU-rrmpolicy-configdb-response"/>
                                                                 <parameter name='contentType' value='application/json' />
@@ -2007,7 +2634,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -2061,6 +2688,97 @@
                         </block>
                     </for>
                 </block>
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                    <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                    <parameter name="level" value="info" />
+                    <parameter name="field1" value="Update inventory in ConfigDB"/>
+                </record>
+                <set>
+                    <parameter name='tmp.dLThptPerSlice' value='`$tmp.payload.dLThptPerSlice`'/>
+                    <parameter name='tmp.payload.pLMNId' value='`$tmp.pLMNId`'/>
+                    <parameter name='tmp.payload.sNSSAI' value='`$tmp.sNSSAI`'/>
+                    <parameter name='tmp.uLThptPerSlice' value='`$tmp.payload.uLThptPerSlice`'/>
+                    <parameter name='tmp.maxNumberOfConns' value='`$tmp.payload.maxNumberOfConns`'/>
+                </set>
+                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                    <parameter name="restapiUrl" value="`$prop.configdb.url + $prop.restapi.configdb.updateRANSliceInventory`"/>
+                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-configDB-updateRANSliceInventory.json'`" />
+                    <parameter name="httpMethod" value="PUT"/>
+                    <parameter name="responsePrefix" value="update-inventory-configdb-response"/>
+                    <parameter name='contentType' value='application/json' />
+                    <parameter name='format' value='json' />
+                    <parameter name='accept' value='application/json' />
+                    <parameter name="convertResponse" value="true"/>
+                    <outcome value='failure'>
+                        <block>
+                            <set>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error updating nearRTRIC info in ConfigDB. Aborting RPC executiopn'/>
+                            </set>
+                            <return status='failure'>
+                                <parameter name='ack-final' value='Y'/>
+                                <parameter name='error-code' value='500'/>
+                                <parameter name='error-message' value='Error updating inventory in ConfigDB. Aborting RPC executiopn'/>
+                            </return>
+                        </block>
+                    </outcome>
+                    <outcome value='success'>
+                        <block>
+                            <block atomic='true'>
+                                <set>
+                                    <parameter name="tmp.so.callbackURL" value="`$payloadJson.input.callbackURL`"/>
+                                    <parameter name="tmp.status" value="`$error-code`"/>
+                                    <parameter name="tmp.reason" value="`$error-message`"/>
+                                    <parameter name="tmp.requestID" value="`$instantiateRANSlice-input.common-header.request-id`"/>
+                                    <parameter name="tmp.action" value="`$instantiateRANSlice-input.action`"/>
+                                </set>
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                    <parameter name="file" value="/opt/opendaylight/current/data/log/so-callback-response.log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="URL for SO Callback Response"/>
+                                    <parameter name='field2' value="`$tmp.so.callbackURL`" />
+                                    <parameter name='field3' value="`$tmp.status`" />
+                                    <parameter name='field4' value="`$tmp.reason`" />
+                                    <parameter name='field5' value="`$tmp.requestID`" />
+                                    <parameter name='field6' value="`$tmp.action`" />
+                                </record>
+                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/ranSlice-so-response.json'`" />
+                                    <parameter name="restapiUrl" value="`$tmp.so.callbackURL`"/>
+                                    <parameter name="httpMethod" value="POST"/>
+                                    <parameter name="responsePrefix" value="so-callback-modify-response"/>
+                                    <parameter name='contentType' value='application/json' />
+                                    <parameter name='format' value='json' />
+                                    <parameter name='accept' value='*/*' />
+                                    <parameter name="convertResponse" value="true"/>
+                                    <outcome value='failure'>
+                                        <block>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="Error sending SO Response" />
+                                            </return>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='success'>
+                                        <block>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/opendaylight/current/data/log/instantiateRANSliceModifyAllocate.log" />
+                                                <parameter name="level" value="info" />
+                                                <parameter name="field1" value="SO Response Sent "/>
+                                            </record>
+                                        </block>
+                                    </outcome>
+                                </execute>
+                            </block>
+                            <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="Successfully Updated inventory in ConfigDB"/>
+                            </record>
+                        </block>
+                    </outcome>
+                </execute>
             </for>
             <return status='success'>
                 <parameter name="ack-final" value="Y" />
@@ -2097,7 +2815,7 @@
                     <parameter name="responsePrefix" value="so-callback-response"/>
                     <parameter name='contentType' value='application/json' />
                     <parameter name='format' value='json' />
-                    <parameter name='accept' value='application/json' />
+                    <parameter name='accept' value='*/*' />
                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                     <outcome value='failure'>
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceReconfigure.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceReconfigure.xml
index 1ae327fe..adb24742 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceReconfigure.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_instantiateRANSliceReconfigure.xml
@@ -136,7 +136,7 @@
                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                         <parameter name='contentType' value='application/json' />
                                                         <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
+                                                        <parameter name='accept' value='*/*' />
                                                         <outcome value='failure'>
                                                             <block>
                                                                 <return status='failure'>
@@ -246,7 +246,7 @@
                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                         <parameter name='contentType' value='application/json' />
                                                         <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
+                                                        <parameter name='accept' value='*/*' />
                                                         <outcome value='failure'>
                                                             <block>
                                                                 <return status='failure'>
@@ -393,7 +393,7 @@
                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                         <parameter name='contentType' value='application/json' />
                                                         <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
+                                                        <parameter name='accept' value='*/*' />
                                                         <outcome value='failure'>
                                                             <block>
                                                                 <return status='failure'>
@@ -527,7 +527,7 @@
                                                             <parameter name="responsePrefix" value="so-callback-response"/>
                                                             <parameter name='contentType' value='application/json' />
                                                             <parameter name='format' value='json' />
-                                                            <parameter name='accept' value='application/json' />
+                                                            <parameter name='accept' value='*/*' />
                                                             <outcome value='failure'>
                                                                 <block>
                                                                     <return status='failure'>
@@ -693,7 +693,7 @@
                                                                         <parameter name="responsePrefix" value="so-callback-response"/>
                                                                         <parameter name='contentType' value='application/json' />
                                                                         <parameter name='format' value='json' />
-                                                                        <parameter name='accept' value='application/json' />
+                                                                        <parameter name='accept' value='*/*' />
                                                                         <outcome value='failure'>
                                                                             <block>
                                                                                 <return status='failure'>
@@ -769,7 +769,7 @@
                     <parameter name="responsePrefix" value="so-callback-response"/>
                     <parameter name='contentType' value='application/json' />
                     <parameter name='format' value='json' />
-                    <parameter name='accept' value='application/json' />
+                    <parameter name='accept' value='*/*' />
                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                     <outcome value='failure'>
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance.xml
index 9966b6eb..ddf618d6 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance.xml
@@ -125,7 +125,7 @@
                                     <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                     <parameter name='contentType' value='application/json' />
                                     <parameter name='format' value='json' />
-                                    <parameter name='accept' value='application/json' />
+                                    <parameter name='accept' value='*/*' />
                                     <parameter name="convertResponse" value="true"/>
                                     <outcome value='failure'>
                                         <block>
@@ -265,7 +265,7 @@
                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                         <parameter name='contentType' value='application/json' />
                                         <parameter name='format' value='json' />
-                                        <parameter name='accept' value='application/json' />
+                                        <parameter name='accept' value='*/*' />
                                         <parameter name="convertResponse" value="true"/>
                                         <outcome value='failure'>
                                             <block>
@@ -528,7 +528,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -658,7 +658,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -888,7 +888,7 @@
                                                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                         <parameter name='contentType' value='application/json' />
                                                                                         <parameter name='format' value='json' />
-                                                                                        <parameter name='accept' value='application/json' />
+                                                                                        <parameter name='accept' value='*/*' />
                                                                                         <parameter name="convertResponse" value="true"/>
                                                                                         <outcome value='failure'>
                                                                                             <block>
@@ -969,7 +969,7 @@
                                                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                         <parameter name='contentType' value='application/json' />
                                                                                         <parameter name='format' value='json' />
-                                                                                        <parameter name='accept' value='application/json' />
+                                                                                        <parameter name='accept' value='*/*' />
                                                                                         <parameter name="convertResponse" value="true"/>
                                                                                         <outcome value='failure'>
                                                                                             <block>
@@ -1059,7 +1059,7 @@
                                                                                 <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                 <parameter name='contentType' value='application/json' />
                                                                                 <parameter name='format' value='json' />
-                                                                                <parameter name='accept' value='application/json' />
+                                                                                <parameter name='accept' value='*/*' />
                                                                                 <parameter name="convertResponse" value="true"/>
                                                                                 <outcome value='failure'>
                                                                                     <block>
@@ -1236,7 +1236,7 @@
                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                         <parameter name='contentType' value='application/json' />
                                                         <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
+                                                        <parameter name='accept' value='*/*' />
                                                         <parameter name="convertResponse" value="true"/>
                                                         <outcome value='failure'>
                                                             <block>
@@ -1360,7 +1360,7 @@
                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                         <parameter name='contentType' value='application/json' />
                                                         <parameter name='format' value='json' />
-                                                        <parameter name='accept' value='application/json' />
+                                                        <parameter name='accept' value='*/*' />
                                                         <parameter name="convertResponse" value="true"/>
                                                         <outcome value='failure'>
                                                             <block>
@@ -1624,7 +1624,7 @@
                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                             <parameter name='contentType' value='application/json' />
                                                             <parameter name='format' value='json' />
-                                                            <parameter name='accept' value='application/json' />
+                                                            <parameter name='accept' value='*/*' />
                                                             <parameter name="convertResponse" value="true"/>
                                                             <outcome value='failure'>
                                                                 <block>
@@ -1703,7 +1703,7 @@
                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                             <parameter name='contentType' value='application/json' />
                                                             <parameter name='format' value='json' />
-                                                            <parameter name='accept' value='application/json' />
+                                                            <parameter name='accept' value='*/*' />
                                                             <parameter name="convertResponse" value="true"/>
                                                             <outcome value='failure'>
                                                                 <block>
@@ -1915,7 +1915,7 @@
                                                                         <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                         <parameter name='contentType' value='application/json' />
                                                                         <parameter name='format' value='json' />
-                                                                        <parameter name='accept' value='application/json' />
+                                                                        <parameter name='accept' value='*/*' />
                                                                         <parameter name="convertResponse" value="true"/>
                                                                         <outcome value='failure'>
                                                                             <block>
@@ -2084,7 +2084,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -2310,7 +2310,7 @@
                                                                                     <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                                     <parameter name='contentType' value='application/json' />
                                                                                     <parameter name='format' value='json' />
-                                                                                    <parameter name='accept' value='application/json' />
+                                                                                    <parameter name='accept' value='*/*' />
                                                                                     <parameter name="convertResponse" value="true"/>
                                                                                     <outcome value='failure'>
                                                                                         <block>
@@ -2402,7 +2402,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -2481,7 +2481,7 @@
                                                                             <parameter name="responsePrefix" value="so-callback-modify-response"/>
                                                                             <parameter name='contentType' value='application/json' />
                                                                             <parameter name='format' value='json' />
-                                                                            <parameter name='accept' value='application/json' />
+                                                                            <parameter name='accept' value='*/*' />
                                                                             <parameter name="convertResponse" value="true"/>
                                                                             <outcome value='failure'>
                                                                                 <block>
@@ -2570,7 +2570,7 @@
                     <parameter name="responsePrefix" value="so-callback-response"/>
                     <parameter name='contentType' value='application/json' />
                     <parameter name='format' value='json' />
-                    <parameter name='accept' value='application/json' />
+                    <parameter name='accept' value='*/*' />
                     <parameter name="restapiUser" value="`$prop.restapi.so.user`" />
                     <parameter name="restapiPassword" value="`$prop.restapi.so.password`"/>
                     <outcome value='failure'>
-- 
cgit 1.2.3-korg