X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml;h=420bdf32a5e90590bab4d1f1bea6804186b67f17;hb=2a546f93ac1c3686f099549fc88cd8bf2d39bd20;hp=494fe4a4568f27448d8ca0c9d6b154b6b9e290f5;hpb=59d40f33bd47fb15f2af85b6c4b09f353bf13db2;p=sdnc%2Foam.git

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