Mapping based RA Processing

VNF and vf-module assign DG changes to support mapping based RA processing

Issue-ID: SDNC-1036
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>
Change-Id: Id8533ef28fdd66912be1f1892465abfda51de401

Former-commit-id: d0da971041814680bcdc8cfc7ed37c76026b8e93

1 files changed, 9 insertions, 77 deletions

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'