self-serve DG bugfix

fix cds ra response to yang model mapping

Issue-ID: SDNC-1140
Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com>
Change-Id: I54cdb6fec0bd448b99344868e894bf65dc2f26fc
(cherry picked from commit f2572405ddda75817b0e7fb4ecd072be5788d535 [formerly cfddfad6cdbe087a0b75c5df73cf059dbe2d700f])

Former-commit-id: 80423bcdfc78f2e412d64fc2be7050da76a7383a

1 files changed, 12 insertions, 20 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
index cc9d60bb..4539ae13 100644
--- 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
@@ -45,33 +45,25 @@
                                     <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' 

+                                <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='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>

+                                    <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>

+                                <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' 

+                                        <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>

+                                </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[$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>