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=551364fbc78a24cb0bb551305403da86c7ee41c3;hb=1df36cd2a20f26dfa1c80bc5c3baaa03140f1987;hp=67f16c81ceb666c23b5331d09d4af8dc8e4afe61;hpb=d69e76ecb31efc5344d6b320d324d5e9ee842b32;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..551364fb 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
@@ -12,6 +12,9 @@
                     </return>
                 </outcome>
             </switch>
+            <set>
+                <parameter name='CONSTANT' value='success'/>
+            </set>
             <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >
                 <block atomic="true">
                     <set>
@@ -42,34 +45,39 @@
                                 <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>
+                                <switch test="`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and
+		$jsonContextPrefix.resolution-summary[$vdns-index].value == ''`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' 
+	value='`$CONSTANT`'/>
+                                        </set>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <set>
+                                            <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>
                                     </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>
+                                <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>
                                 <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'/>
+	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.payload.resolution-summary[$vdns-index].status`'/>
+	value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
+                                </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='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />
                                 </set>
                                 <set>
                                     <parameter name='highnum' value='`$highnum + 1`' />