diff options
author | 2020-04-03 17:47:37 +0000 | |
---|---|---|
committer | 2020-04-03 17:47:37 +0000 | |
commit | 1d8b0fdfeb4bd7f192c3f4e4e2eca1186d3ee11c (patch) | |
tree | f09d673635ff0b542b5b05ccf69025541262e60a /platform-logic/generic-resource-api/src/main/xml | |
parent | 73393dfe2885594fa4a15388fff03f4708473dec (diff) | |
parent | b93fd38333a50eff74a78772dc379caa150101d4 (diff) |
Merge "self serve DG bugfix" into frankfurt
Former-commit-id: 29e187d698c1a88605e74f3f372cb0c98aebb9e0
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 44 insertions, 20 deletions
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 b1486e22..9038e678 100644 --- 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" />
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
- <parameter name="responsePrefix" value="`$responsePrefix`" />
+ <parameter name="responsePrefix" value="raAssign" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -163,18 +163,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.vf-module-label`" />
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.vf-module-label`" />
<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-vfmodule-mapping-ra-response' mode='sync' ></call>
</outcome>
- <outcome value='Other'>
- <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-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.vf-module-label`" />
+ <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-vfmodule-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: vfmodule-ra-assignment"/>
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"/>
|