X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fran-slice-api%2Fsrc%2Fmain%2Fxml%2Fran-slice-api_instantiateRANSlice.xml;h=d17b73ce21721d1d8bac1c779784bad5aaca3449;hb=ebdbc59bbbde204ce9cdbcf3a231cb6fbc85169d;hp=63df62a546d697c429ff73dc01899eeb205bd109;hpb=6460c29f5778a917f8d2a1798416cfcb69c19c8c;p=ccsdk%2Fdistribution.git

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 63df62a5..d17b73ce 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
@@ -116,18 +116,17 @@
                     <outcome value='allocate'>
                         <block atomic="true">
                             <set>
-                                <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/>
                                 <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/>
                                 <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/>
                                 <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/>
-                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/>
+                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/>
                                 <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/>
                                 <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/>
                                 <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/>
                                 <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/>
                                 <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/>
                                 <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/>
-                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/>
+                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/>
                                 <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/>
                                 <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/>
                                 <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/>
@@ -141,17 +140,28 @@
                                 <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='split'>
+                                            <parameter name="original_string" value="`$tmp.payload.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>
+                                </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" />
@@ -164,18 +174,17 @@
                     <outcome value='modify-allocate'>
                         <block atomic="true">
                             <set>
-                                <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/>
                                 <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/>
                                 <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/>
                                 <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/>
-                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/>
+                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/>
                                 <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/>
                                 <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/>
                                 <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/>
                                 <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/>
                                 <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/>
                                 <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/>
-                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/>
+                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/>
                                 <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/>
                                 <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/>
                                 <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/>
@@ -189,17 +198,28 @@
                                 <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='split'>
+                                            <parameter name="original_string" value="`$tmp.payload.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>
+                                </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" />
@@ -212,18 +232,17 @@
                     <outcome value='modify-deallocate'>
                         <block atomic="true">
                             <set>
-                                <parameter name='tmp.payload.trackingArea' value='`$payloadJson.input.sliceProfile.coverageAreaList[0]`'/>
                                 <parameter name='tmp.payload.callbackURL' value='`$payloadJson.input.callbackURL`'/>
                                 <parameter name='tmp.payload.RANNFNSSIId' value='`$payloadJson.input.RANNFNSSIId`'/>
                                 <parameter name='tmp.payload.RANNSSIId' value='`$payloadJson.input.RANNSSIId`'/>
-                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaList_length`'/>
+                                <parameter name='tmp.payload.coverageAreaList_length' value='`$payloadJson.input.sliceProfile.coverageAreaTAList_length`'/>
                                 <parameter name='tmp.payload.dLThptPerSlice' value='`$payloadJson.input.sliceProfile.dLThptPerSlice`'/>
                                 <parameter name='tmp.payload.latency' value='`$payloadJson.input.sliceProfile.latency`'/>
                                 <parameter name='tmp.payload.maxNumberofConns' value='`$payloadJson.input.sliceProfile.maxNumberofConns`'/>
                                 <parameter name='tmp.payload.maxNumberofUEs' value='`$payloadJson.input.sliceProfile.maxNumberofUEs`'/>
                                 <parameter name='tmp.payload.resourceSharingLevel' value='`$payloadJson.input.sliceProfile.resourceSharingLevel`'/>
                                 <parameter name='tmp.payload.sliceProfileId' value='`$payloadJson.input.sliceProfile.sliceProfileId`'/>
-                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.sNSSAI`'/>
+                                <parameter name='tmp.payload.sNSSAI' value='`$payloadJson.input.sliceProfile.snssaiList[0]`'/>
                                 <parameter name='tmp.payload.uEMobilityLevel' value='`$payloadJson.input.sliceProfile.uEMobilityLevel`'/>
                                 <parameter name='tmp.payload.uLThptPerSlice' value='`$payloadJson.input.sliceProfile.uLThptPerSlice`'/>
                                 <parameter name='tmp.payload.pLMNId' value='`$payloadJson.input.sliceProfile.pLMNIdList[0]`'/>
@@ -237,17 +256,28 @@
                                 <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='split'>
+                                            <parameter name="original_string" value="`$tmp.payload.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>
+                                </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" />
@@ -302,7 +332,7 @@
                                         <parameter name="level" value="info" />
                                         <parameter name="field1" value="Calling instantiateRANSliceModifyDeallocate "/>
                                     </record>
-                                    <call module='ran-slice-api' rpc='instantiateRANSliceModifyDeallocate' mode='sync' >
+                                    <call module='ran-slice-api' rpc='terminateRANSliceInstance' mode='sync' >
                                         <outcome value='failure'>
                                             <return status='failure'>
                                                 <parameter name='ack-final' value='Y' />
@@ -330,6 +360,28 @@
                         </switch>
                     </block>
                 </outcome>
+                <outcome value='false'>
+                    <block atomic='true'>
+                        <switch test='`$instantiate-r-a-n-slice-input.action`'>
+                            <outcome value='modify-allocate'>
+                                <block atomic="true">
+                                    <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="Calling instantiateRANSliceModifyAllocate-CPS "/>
+                                    </record>
+                                    <call module='ran-slice-api' rpc='instantiateRANSliceModifyAllocate-cps' mode='sync' >
+                                        <outcome value='failure'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y' />
+                                            </return>
+                                        </outcome>
+                                    </call>
+                                </block>
+                            </outcome>
+                        </switch>
+                    </block>
+                </outcome>
             </switch>
             <return status='success'>
                 <parameter name="ack-final" value="Y" />
@@ -338,4 +390,4 @@
             </return>
         </block>
     </method>
-</service-logic>
+</service-logic>
\ No newline at end of file