X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml;h=1be42fa4c9947f31c3e337db03ad01f31bf73e11;hb=e2ad43f208af3c91d7b0f6788c1d9da5e5833f1a;hp=67f16c81ceb666c23b5331d09d4af8dc8e4afe61;hpb=b7af6a1d7e5c113f266547cd1fdbd4af3eccabde;p=sdnc%2Foam.git

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
index 67f16c81..1be42fa4 100644
--- 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
@@ -45,31 +45,23 @@
                                     <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' 
+                                <set>
+                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.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.vnf-topology.vnf-parameters-data.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.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' 
+                                        <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>
+                                </for>
                                 <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`' />