RANSlice - CPS Integration1.2.3

TerminateRANSliceInstance - RAN inventory update
Other Minor bug fixes

Issue-ID: CCSDK-3466

Signed-off-by: Ahila <ahila.pandaram@wipro.com>
Change-Id: I2623c8652ae2feb35219660928604081bf18c14b

5 files changed, 186 insertions, 9 deletions

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 d17b73ce..f9ba5159 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
@@ -316,7 +316,7 @@
                                         <parameter name="level" value="info" />
                                         <parameter name="field1" value="Calling instantiateRANSliceModifyAllocate "/>
                                     </record>
-                                    <call module='ran-slice-api' rpc='instantiateRANSliceModifyAllocate' mode='sync' >
+                                    <call module='ran-slice-api' rpc='instantiateRANSliceModifyAllocate-configDB' mode='sync' >
                                         <outcome value='failure'>
                                             <return status='failure'>
                                                 <parameter name='ack-final' value='Y' />
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-configDB.xml
index baf92b5c..85c1528b 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-configDB.xml
@@ -1,7 +1,7 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='ran-slice-api' version='${project.version}'>
-    <method rpc='instantiateRANSliceModifyAllocate' mode='sync'>
+    <method rpc='instantiateRANSliceModifyAllocate-configDB' mode='sync'>
         <block atomic='true'>
             <block atomic='true'>
                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-configDb.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-configDb.xml
index 8b29480a..272285fe 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-configDb.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-configDb.xml
@@ -1,7 +1,7 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='ran-slice-api' version='${project.version}'>
-    <method rpc='terminateRANSliceInstance-configDb' mode='sync'>
+    <method rpc='terminateRANSliceInstance-configDB' mode='sync'>
         <block atomic='true'>
             <block atomic='true'>
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
diff --git a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-cps.xml b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-cps.xml
index 4d8c1b9c..657b9136 100644
--- a/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-cps.xml
+++ b/platform-logic/ran-slice-api/src/main/xml/ran-slice-api_terminateRANSliceInstance-cps.xml
@@ -458,6 +458,10 @@
                                                 <parameter name='outputPath' value='tmp.RICPLMNEntries' />
                                                 <parameter name='source' value="`'getNFNSSIRIC-cps-response.['+ $idy +'].attributes.pLMNInfoList_length'`" />
                                             </execute>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='tmp.nearRTRICId' />
+                                                <parameter name='source' value="`'getNFNSSIRIC-cps-response.[' + $idy + '].idNearRTRIC'`" />
+                                            </execute>
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
                                                 <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
                                                 <parameter name="level" value="info" />
@@ -497,10 +501,6 @@
                                                                             <parameter name='outputPath' value='tmp.ric.sNSSAIremoved' />
                                                                             <parameter name='source' value="`'getNFNSSIRIC-cps-response.['+ $idy +'].attributes.pLMNInfoList['+$id-ric+'].sNSSAIList['+$id-ric-snssai+'].sNssai'`" />
                                                                         </execute>
-                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                                                            <parameter name='outputPath' value='tmp.nearRTRICId' />
-                                                                            <parameter name='source' value="`'getNFNSSIRIC-cps-response.[' + $idy + '].idNearRTRIC'`" />
-                                                                        </execute>
                                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
                                                                             <parameter name="source" value="`$prop.restapi.cps.tbdmt.execute.endpoint`"/>
                                                                             <parameter name="outputPath" value="tmp.cps.deletenssai.rtric.url"/>
@@ -728,7 +728,7 @@
                                                                                                                     <parameter name="replacement" value="`$tmp.sNSSAI`"/>
                                                                                                                 </execute>
                                                                                                                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                                                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSliceModifyAllocate.log" />
+                                                                                                                    <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
                                                                                                                     <parameter name="level" value="info" />
                                                                                                                     <parameter name="field1" value="patch cellCU NSSAI parameters"/>
                                                                                                                     <parameter name="field2" value="`$tmp.nearRTRICId`"/>
@@ -2705,6 +2705,183 @@
                                                 </block>
                                             </for>
                                         </block>
+                                        <block atomic='true'>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                <parameter name="source" value="`$prop.restapi.cps.tbdmt.execute.endpoint`"/>
+                                                <parameter name="outputPath" value="tmp.cps.getInventory.url"/>
+                                                <parameter name="target" value="{schemaSet}"/>
+                                                <parameter name="replacement" value="`$prop.inventory.schemaset`"/>
+                                            </execute>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                <parameter name="source" value="`$tmp.cps.getInventory.url`"/>
+                                                <parameter name="outputPath" value="tmp.cps.getInventory.url"/>
+                                                <parameter name="target" value="{templateId}"/>
+                                                <parameter name="replacement" value="`$prop.tbdmt.template.get-ran-slices`"/>
+                                            </execute>
+                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                <parameter name="level" value="info" />
+                                                <parameter name="field1" value="URL for CPS TDBMT to get inventory details - CPS"/>
+                                                <parameter name='field2' value="`$tmp.cps.getInventory.url`" />
+                                            </record>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="restapiUrl" value="`$tmp.cps.getInventory.url`"/>
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/cps-templates/cps-terminate-rannfnssi-ran-inventory.json'`" />
+                                                <parameter name="httpMethod" value="POST"/>
+                                                <parameter name="responsePrefix" value="get-inventory-cps-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 RAN Inventory. 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>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                            <parameter name="level" value="info" />
+                                                            <parameter name="field1" value="Successfully Updated inventory"/>
+                                                        </record>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                            <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-terminateRANSlice-configrsp-context.log' />
+                                                        </execute>
+                                                    </block>
+                                                </outcome>
+                                            </execute>
+                                            <set>
+                                                <parameter name='tmp.profiles_length' value='`$get-inventory-cps-response.sliceProfilesList_length`'/>
+                                            </set>
+                                            <switch test='`$tmp.profiles_length == 1`'>
+                                                <outcome value='true'>
+                                                    <block atomic='true'>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                            <parameter name="source" value="`$prop.restapi.cps.tbdmt.execute.endpoint`"/>
+                                                            <parameter name="outputPath" value="tmp.cps.delete.rannfnssi.url"/>
+                                                            <parameter name="target" value="{schemaSet}"/>
+                                                            <parameter name="replacement" value="`$prop.inventory.schemaset`"/>
+                                                        </execute>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                            <parameter name="source" value="`$tmp.cps.delete.rannfnssi.url`"/>
+                                                            <parameter name="outputPath" value="tmp.cps.delete.rannfnssi.url"/>
+                                                            <parameter name="target" value="{templateId}"/>
+                                                            <parameter name="replacement" value="`$prop.tbdmt.template.delete-rannfnssi`"/>
+                                                        </execute>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                            <parameter name="level" value="info" />
+                                                            <parameter name="field1" value="URL for CPS TDBMT to delete inventory in CPS"/>
+                                                            <parameter name='field2' value="`$tmp.cps.delete.rannfnssi.url`" />
+                                                        </record>
+                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                            <parameter name="restapiUrl" value="`$tmp.cps.delete.rannfnssi.url`"/>
+                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/cps-templates/cps-terminate-rannfnssi-ran-inventory.json'`" />
+                                                            <parameter name="httpMethod" value="POST"/>
+                                                            <parameter name="responsePrefix" value="delete-inventory-cps-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 RAN Inventory. 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>
+                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                                        <parameter name="level" value="info" />
+                                                                        <parameter name="field1" value="Successfully fetched inventory details"/>
+                                                                    </record>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                        <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-terminateRANSlice-configrsp-context.log' />
+                                                                    </execute>
+                                                                </block>
+                                                            </outcome>
+                                                        </execute>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <block atomic='true'>
+                                                        <set>
+                                                            <parameter name='tmp.payload.sliceProfileId' value='`$tmp.sliceprofileid`'/>
+                                                        </set>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                            <parameter name="source" value="`$prop.restapi.cps.tbdmt.execute.endpoint`"/>
+                                                            <parameter name="outputPath" value="tmp.cps.delete.snssai.url"/>
+                                                            <parameter name="target" value="{schemaSet}"/>
+                                                            <parameter name="replacement" value="`$prop.inventory.schemaset`"/>
+                                                        </execute>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+                                                            <parameter name="source" value="`$tmp.cps.delete.snssai.url`"/>
+                                                            <parameter name="outputPath" value="tmp.cps.delete.snssai.url"/>
+                                                            <parameter name="target" value="{templateId}"/>
+                                                            <parameter name="replacement" value="`$prop.tbdmt.template.delete-slice-profile`"/>
+                                                        </execute>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                            <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                            <parameter name="level" value="info" />
+                                                            <parameter name="field1" value="URL for CPS TDBMT to delete inventory in CPS"/>
+                                                            <parameter name='field2' value="`$tmp.cps.delete.snssai.url`" />
+                                                        </record>
+                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                            <parameter name="restapiUrl" value="`$tmp.cps.delete.snssai.url`"/>
+                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/cps-templates/cps-terminate-snssai-ran-inventory.json'`" />
+                                                            <parameter name="httpMethod" value="POST"/>
+                                                            <parameter name="responsePrefix" value="delete-inventory-cps-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 RAN Inventory. 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>
+                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+                                                                        <parameter name="file" value="/opt/opendaylight/current/data/log/terminateRANSlice.log" />
+                                                                        <parameter name="level" value="info" />
+                                                                        <parameter name="field1" value="Successfully Updated inventory"/>
+                                                                    </record>
+                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                        <parameter name='filename' value='/opt/opendaylight/current/data/log/ranSlice-terminateRANSlice-configrsp-context.log' />
+                                                                    </execute>
+                                                                </block>
+                                                            </outcome>
+                                                        </execute>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </block>
                                     </for>
                                 </block>
                             </block>
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 7ef1cf84..04aa0346 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
@@ -11,7 +11,7 @@
                             <parameter name="level" value="info" />
                             <parameter name="field1" value="Calling instantiateRANSliceModifyAllocate-CPS "/>
                         </record>
-                        <call module='ran-slice-api' rpc='terminateRANSliceInstance-configDb' mode='sync' ></call>
+                        <call module='ran-slice-api' rpc='terminateRANSliceInstance-configDB' mode='sync' ></call>
                     </block>
                 </outcome>
                 <outcome value='false'>