RAN Configuration enhancements

[ccsdk/distribution.git] / platform-logic / ran-slice-api / src / main / xml / ran-slice-api_instantiateRANSliceReconfigure.xml

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 1ae327f..3358454 100644 (file)
--- 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'>
@@ -273,17 +273,17 @@
                                     <set>
                                         <parameter name='tmp.pLMNId' value='`$getPLMN-CL-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>
+                                    <block atomic="true">
+                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                            <parameter name="original_string" value="`$tmp.pLMNId`" />
+                                            <parameter name="regex" value="-"/>
+                                            <parameter name="ctx_memory_result_key" value="tmp.plmnList" />
+                                        </execute>
+                                        <set>
+                                            <parameter name='tmp.mcc' value='`$tmp.plmnList[0]`'/>
+                                            <parameter name='tmp.mnc' value='`$tmp.plmnList[1]`'/>
+                                        </set>
+                                    </block>
                                     <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                         <parameter name="file" value="/opt/opendaylight/current/data/log/closedLoop.log" />
                                         <parameter name="level" value="info" />
@@ -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'>
@@ -554,17 +554,17 @@
                                         <set>
                                             <parameter name='tmp.pLMNId' value='`$getPLMN-CL-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>
+                                        <block atomic="true">
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                <parameter name="original_string" value="`$tmp.pLMNId`" />
+                                                <parameter name="regex" value="-"/>
+                                                <parameter name="ctx_memory_result_key" value="tmp.plmnList" />
+                                            </execute>
+                                            <set>
+                                                <parameter name='tmp.mcc' value='`$tmp.plmnList[0]`'/>
+                                                <parameter name='tmp.mnc' value='`$tmp.plmnList[1]`'/>
+                                            </set>
+                                        </block>
                                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                             <parameter name="file" value="/opt/opendaylight/current/data/log/closedLoop.log" />
                                             <parameter name="level" value="info" />
@@ -634,6 +634,11 @@
                                                         <parameter name='outputPath' value='tmp.cellLocalId' />
                                                         <parameter name='source' value="`'payloadJson.input.additionalproperties.resourceConfig.data['+$id-is+'].cellCUList['+$id2+'].cellLocalId'`" />
                                                     </execute>
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                        <parameter name="source" value="`$tmp.cellLocalId`" />
+                                                        <parameter name="target" value="-maxNumberofConns"/>
+                                                        <parameter name="outputPath" value="tmp.cellLocalId" />
+                                                    </execute>
                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                                                         <parameter name='outputPath' value='tmp.predictedMaxNumberofConns' />
                                                         <parameter name='source' value="`'payloadJson.input.additionalproperties.resourceConfig.data['+$id-is+'].cellCUList['+$id2+'].configData.predictedMaxNumberofConns'`" />
@@ -693,7 +698,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 +774,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'>