self serve DG bugfix

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index b1486e2..9038e67 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -142,7 +142,7 @@
                 <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
                 <parameter name='format' value='json' />\r
                 <parameter name='httpMethod' value='POST' />\r
-                <parameter name="responsePrefix" value="`$responsePrefix`" />\r
+                <parameter name="responsePrefix" value="raAssign" />\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -163,18 +163,30 @@
                 <parameter name="field1" value="AFTER BlueprintProcessingClient"/>\r
             </record>\r
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
-                <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`" />\r
+                <parameter name="source" value="`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.vf-module-label`" />\r
                 <parameter name="outputPath" value="jsonContextPrefix" />\r
-                <parameter name="isEscaped" value="false" />\r
-            </execute>\r
-            <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">\r
-                <outcome value=''>\r
+                <parameter name="isEscaped" value="true" />\r
+                <outcome value='success'>\r
                     <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' ></call>\r
                 </outcome>\r
-                <outcome value='Other'>\r
-                    <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>\r
+                <outcome value='failure'>\r
+                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">\r
+                        <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`" />\r
+                        <parameter name="outputPath" value="jsonContextPrefix" />\r
+                        <parameter name="isEscaped" value="true" />\r
+                        <outcome value='failure'>\r
+                            <return status='failure'>\r
+                                <parameter name='ack-final' value='Y'/>\r
+                                <parameter name="error-code" value="500" />\r
+                                <parameter name="error-message" value="Failed to parse RA respose from mapping or meshed-template" />\r
+                            </return>\r
+                        </outcome>\r
+                        <outcome value='success'>\r
+                            <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>\r
+                        </outcome>\r
+                    </execute>\r
                 </outcome>\r
-            </switch>\r
+            </execute>\r
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                 <parameter name="logger" value="message-log"/>\r
                 <parameter name="field1" value="DONE: vfmodule-ra-assignment"/>\r