self-serve DG fix

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml

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 67f16c8..551364f 100644 (file)
--- 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>\r
                 </outcome>\r
             </switch>\r
+            <set>\r
+                <parameter name='CONSTANT' value='success'/>\r
+            </set>\r
             <for silentFailure='true'  index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\r
                 <block atomic="true">\r
                     <set>\r
@@ -42,34 +45,39 @@
                                 <set>\r
                                     <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' \r
        value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>\r
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \r
-       value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\r
                                 </set>\r
-                                <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>\r
-                                    <outcome value='sdnc'>\r
-                                        <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\r
-                                            <set>\r
-                                                <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' \r
-       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\r
-                                                <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' \r
-       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\r
-                                            </set>\r
-                                        </for>\r
+                                <switch test="`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and\r
+               $jsonContextPrefix.resolution-summary[$vdns-index].value == ''`">\r
+                                    <outcome value='true'>\r
+                                        <set>\r
+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \r
+       value='`$CONSTANT`'/>\r
+                                        </set>\r
+                                    </outcome>\r
+                                    <outcome value='false'>\r
+                                        <set>\r
+                                            <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\r
+                                        </set>\r
                                     </outcome>\r
                                 </switch>\r
-                                <set>\r
-                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' \r
-       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\r
-                                </set>\r
-                                <set>\r
-                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' \r
-       value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\r
-                                </set>\r
+                                <for silentFailure='true'  index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\r
+                                    <set>\r
+                                        <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' \r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\r
+                                        <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' \r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\r
+                                    </set>\r
+                                </for>\r
                                 <set>\r
                                     <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' \r
-       value='RA Resolved'/>\r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>\r
                                     <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' \r
-       value='`$jsonContextPrefix.payload.resolution-summary[$vdns-index].status`'/>\r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>\r
+                                </set>\r
+                                <set>\r
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' \r
+       value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\r
                                 </set>\r
                                 <set>\r
                                     <parameter name='highnum' value='`$highnum + 1`' />\r