Merge "Mapping based RA Processing"

Former-commit-id: 2054fb775bf87444dd4350f994f850d64aa641ad

6 files changed, 405 insertions, 154 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
new file mode 100644
index 00000000..cc9d60bb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
@@ -0,0 +1,92 @@
+<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='GENERIC-RESOURCE-API' version='${project.version}'>

+    <method rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync'>

+        <block atomic="true">

+            <switch test='`$jsonContextPrefix.resolution-summary_length`'>

+                <outcome value=''>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="resolution-summary_length is null" />

+                    </return>

+                </outcome>

+            </switch>

+            <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >

+                <block atomic="true">

+                    <set>

+                        <parameter name='tmp.mso.param.found' value='false' />

+                    </set>

+                    <switch test='`$prehighnum &gt; 0`'>

+                        <outcome value='true'>

+                            <for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >

+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>

+                                    <outcome value='true'>

+                                        <block>

+                                            <set>

+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].value' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='tmp.mso.param.found' value='true' />

+                                            </set>

+                                        </block>

+                                    </outcome>

+                                </switch>

+                            </for>

+                        </outcome>

+                    </switch>

+                    <switch test='`$tmp.mso.param.found`'>

+                        <outcome value='false'>

+                            <block atomic='true'>

+                                <set>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>

+                                </set>

+                                <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>

+                                    <outcome value='sdnc'>

+                                        <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >

+                                            <set>

+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>

+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>

+                                            </set>

+                                        </for>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />

+                                </set>

+                                <set>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.payload' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>

+                                </set>

+                                <set>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name' 

+	value='RA Resolved'/>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>

+                                </set>

+                                <set>

+                                    <parameter name='highnum' value='`$highnum + 1`' />

+                                </set>

+                            </block>

+                        </outcome>

+                    </switch>

+                </block>

+            </for>

+            <set>

+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' 

+	value='`$highnum`'/>

+            </set>

+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

+                <parameter name="logger" value="message-log"/>

+                <parameter name="field1" value="DONE: self-serve-process-vfmodule-mapping-ra-response"/>

+            </record>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
new file mode 100644
index 00000000..b2746cf9
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-template-ra-response.xml
@@ -0,0 +1,99 @@
+<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='GENERIC-RESOURCE-API' version='${project.version}'>

+    <method rpc='self-serve-process-vfmodule-template-ra-response' mode='sync'>

+        <block atomic="true">

+            <switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>

+                <outcome value=''>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="resource-accumulator-resolved-data_length is null" />

+                    </return>

+                </outcome>

+            </switch>

+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >

+                <block atomic="true">

+                    <set>

+                        <parameter name='tmp.mso.param.found' value='false' />

+                    </set>

+                    <switch test='`$prehighnum &gt; 0`'>

+                        <outcome value='true'>

+                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >

+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>

+                                    <outcome value='true'>

+                                        <set>

+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' 

+	value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

+                                            <parameter name='tmp.mso.param.found' value='true' />

+                                        </set>

+                                    </outcome>

+                                </switch>

+                            </for>

+                        </outcome>

+                    </switch>

+                    <switch test='`$tmp.mso.param.found`'>

+                        <outcome value='false'>

+                            <block atomic='true'>

+                                <set>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>

+                                </set>

+                                <set>

+                                    <parameter name='highnum' value='`$highnum + 1`' />

+                                </set>

+                            </block>

+                        </outcome>

+                    </switch>

+                </block>

+            </for>

+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >

+                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >

+                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >

+                        <block atomic="true">

+                            <set>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>

+                                <parameter name='num' value='0' />

+                            </set>

+                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">

+                                <outcome value='true'></outcome>

+                                <outcome value='false'>

+                                    <for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >

+                                        <block atomic='true'>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='num' value='`$num + 1`' />

+                                            </set>

+                                        </block>

+                                    </for>

+                                </outcome>

+                            </switch>

+                            <set>

+                                <parameter name='highnum' value='`$highnum + 1`' />

+                            </set>

+                        </block>

+                    </for>

+                </for>

+            </for>

+            <set>

+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' 

+	value='`$highnum`'/>

+            </set>

+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

+                <parameter name="logger" value="message-log"/>

+                <parameter name="field1" value="DONE: self-serve-process-vfmodule-template-ra-response"/>

+            </record>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
new file mode 100644
index 00000000..67f16c81
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
@@ -0,0 +1,92 @@
+<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='GENERIC-RESOURCE-API' version='${project.version}'>

+    <method rpc='self-serve-process-vnf-mapping-ra-response' mode='sync'>

+        <block atomic="true">

+            <switch test='`$jsonContextPrefix.resolution-summary_length`'>

+                <outcome value=''>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="resolution-summary is null" />

+                    </return>

+                </outcome>

+            </switch>

+            <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >

+                <block atomic="true">

+                    <set>

+                        <parameter name='tmp.mso.param.found' value='false' />

+                    </set>

+                    <switch test='`$prehighnum &gt; 0`'>

+                        <outcome value='true'>

+                            <for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >

+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>

+                                    <outcome value='true'>

+                                        <block>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].value`' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='tmp.mso.param.found' value='true' />

+                                            </set>

+                                        </block>

+                                    </outcome>

+                                </switch>

+                            </for>

+                        </outcome>

+                    </switch>

+                    <switch test='`$tmp.mso.param.found`'>

+                        <outcome value='false'>

+                            <block atomic='true'>

+                                <set>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>

+                                </set>

+                                <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>

+                                    <outcome value='sdnc'>

+                                        <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >

+                                            <set>

+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>

+                                                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>

+                                            </set>

+                                        </for>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />

+                                </set>

+                                <set>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' 

+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>

+                                </set>

+                                <set>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' 

+	value='RA Resolved'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' 

+	value='`$jsonContextPrefix.payload.resolution-summary[$vdns-index].status`'/>

+                                </set>

+                                <set>

+                                    <parameter name='highnum' value='`$highnum + 1`' />

+                                </set>

+                            </block>

+                        </outcome>

+                    </switch>

+                </block>

+            </for>

+            <set>

+                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' 

+	value='`$highnum`'/>

+            </set>

+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

+                <parameter name="logger" value="message-log"/>

+                <parameter name="field1" value="DONE: self-serve-process-vnf-mapping-ra-response"/>

+            </record>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
new file mode 100644
index 00000000..2e628320
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-template-ra-response.xml
@@ -0,0 +1,104 @@
+<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='GENERIC-RESOURCE-API' version='${project.version}'>

+    <method rpc='self-serve-process-vnf-template-ra-response' mode='sync'>

+        <block atomic="true">

+            <switch test='`$jsonContextPrefix.resource-accumulator-resolved-data_length`'>

+                <outcome value=''>

+                    <return status='failure'>

+                        <parameter name='ack-final' value='Y'/>

+                        <parameter name="error-code" value="500" />

+                        <parameter name="error-message" value="resource-accumulator-resolved-data_length is null" />

+                    </return>

+                </outcome>

+            </switch>

+            <for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >

+                <block atomic="true">

+                    <set>

+                        <parameter name='tmp.mso.param.found' value='false' />

+                    </set>

+                    <switch test='`$prehighnum &gt; 0`'>

+                        <outcome value='true'>

+                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >

+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>

+                                    <outcome value='true'>

+                                        <block>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

+                                                <parameter name='tmp.mso.param.found' value='true' />

+                                            </set>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

+                                                <parameter name='tmp.mso.param.found' value='true' />

+                                            </set>

+                                        </block>

+                                    </outcome>

+                                </switch>

+                            </for>

+                        </outcome>

+                    </switch>

+                    <switch test='`$tmp.mso.param.found`'>

+                        <outcome value='false'>

+                            <block atomic='true'>

+                                <set>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>

+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>

+                                </set>

+                                <set>

+                                    <parameter name='highnum' value='`$highnum + 1`' />

+                                </set>

+                            </block>

+                        </outcome>

+                    </switch>

+                </block>

+            </for>

+            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >

+                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >

+                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >

+                        <block atomic="true">

+                            <set>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>

+                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>

+                                <parameter name='num' value='0' />

+                            </set>

+                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">

+                                <outcome value='true'></outcome>

+                                <outcome value='false'>

+                                    <for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >

+                                        <block atomic="true">

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>

+                                            </set>

+                                            <set>

+                                                <parameter name='num' value='`$num + 1`' />

+                                            </set>

+                                        </block>

+                                    </for>

+                                </outcome>

+                            </switch>

+                            <set>

+                                <parameter name='highnum' value='`$highnum + 1`' />

+                            </set>

+                        </block>

+                    </for>

+                </for>

+            </for>

+            <set>

+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length' 

+	value='`$highnum`'/>

+            </set>

+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

+                <parameter name="logger" value="message-log"/>

+                <parameter name="field1" value="DONE: self-serve-process-vnf-template-ra-response"/>

+            </record>

+        </block>

+    </method>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index 79e84d61..b1486e22 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -167,82 +167,14 @@
                 <parameter name="outputPath" value="jsonContextPrefix" />

                 <parameter name="isEscaped" value="false" />

             </execute>

-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >

-                <block atomic="true">

-                    <set>

-                        <parameter name='tmp.mso.param.found' value='false' />

-                    </set>

-                    <switch test='`$prehighnum &gt; 0`'>

-                        <outcome value='true'>

-                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >

-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>

-                                    <outcome value='true'>

-                                        <set>

-                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

-                                            <parameter name='tmp.mso.param.found' value='true' />

-                                        </set>

-                                    </outcome>

-                                </switch>

-                            </for>

-                        </outcome>

-                    </switch>

-                    <switch test='`$tmp.mso.param.found`'>

-                        <outcome value='false'>

-                            <block atomic='true'>

-                                <set>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>

-                                </set>

-                                <set>

-                                    <parameter name='highnum' value='`$highnum + 1`' />

-                                </set>

-                            </block>

-                        </outcome>

-                    </switch>

-                </block>

-            </for>

-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >

-                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >

-                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >

-                        <block atomic="true">

-                            <set>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>

-                                <parameter name='num' value='0' />

-                            </set>

-                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">

-                                <outcome value='true'></outcome>

-                                <outcome value='false'>

-                                    <for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >

-                                        <block atomic='true'>

-                                            <set>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>

-                                            </set>

-                                            <set>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>

-                                            </set>

-                                            <set>

-                                                <parameter name='num' value='`$num + 1`' />

-                                            </set>

-                                        </block>

-                                    </for>

-                                </outcome>

-                            </switch>

-                            <set>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' value='`$highnum + 1`'/>

-                            </set>

-                            <set>

-                                <parameter name='highnum' value='`$highnum + 1`' />

-                            </set>

-                        </block>

-                    </for>

-                </for>

-            </for>

+            <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">

+                <outcome value=''>

+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' ></call>

+                </outcome>

+                <outcome value='Other'>

+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>

+                </outcome>

+            </switch>

             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                 <parameter name="logger" value="message-log"/>

                 <parameter name="field1" value="DONE: vfmodule-ra-assignment"/>

@@ -257,4 +189,4 @@
             </execute>

         </block>

     </method>

-</service-logic>

+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
index 347dd718..494fe4a4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
@@ -142,85 +142,17 @@
                 <parameter name="outputPath" value="jsonContextPrefix" />

                 <parameter name="isEscaped" value="false" />

             </execute>

-            <for silentFailure='true'  index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >

-                <block atomic="true">

-                    <set>

-                        <parameter name='tmp.mso.param.found' value='false' />

-                    </set>

-                    <switch test='`$prehighnum &gt; 0`'>

-                        <outcome value='true'>

-                            <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >

-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>

-                                    <outcome value='true'>

-                                        <set>

-                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

-                                            <parameter name='tmp.mso.param.found' value='true' />

-                                        </set>

-                                    </outcome>

-                                </switch>

-                            </for>

-                        </outcome>

-                    </switch>

-                    <switch test='`$tmp.mso.param.found`'>

-                        <outcome value='false'>

-                            <block atomic='true'>

-                                <set>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>

-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>

-                                </set>

-                                <set>

-                                    <parameter name='highnum' value='`$highnum + 1`' />

-                                </set>

-                            </block>

-                        </outcome>

-                    </switch>

-                </block>

-            </for>

-            <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >

-                <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >

-                    <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >

-                        <block atomic="true">

-                            <set>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>

-                                <parameter name='num' value='0' />

-                            </set>

-                            <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">

-                                <outcome value='true'></outcome>

-                                <outcome value='false'>

-                                    <for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >

-                                        <block atomic="true">

-                                            <set>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>

-                                            </set>

-                                            <set>

-                                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>

-                                            </set>

-                                            <set>

-                                                <parameter name='num' value='`$num + 1`' />

-                                            </set>

-                                        </block>

-                                    </for>

-                                </outcome>

-                            </switch>

-                            <set>

-                                <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>

-                            </set>

-                            <set>

-                                <parameter name='highnum' value='`$highnum + 1`' />

-                            </set>

-                        </block>

-                    </for>

-                </for>

-            </for>

+            <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">

+                <outcome value=''>

+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' ></call>

+                </outcome>

+                <outcome value='Other'>

+                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' ></call>

+                </outcome>

+            </switch>

             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                 <parameter name="logger" value="message-log"/>

-                <parameter name="field1" value="DONE: vnf-ra-assignment"/>

+                <parameter name="field1" value="DONE: self-serve-vnf-ra-assignment"/>

             </record>

             <set>

                 <parameter name='pathname'