</outcome>\r
</execute>\r
<set>\r
- <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>\r
+ <parameter name="cds" value="execution-service_process."/>\r
+ <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>\r
<parameter name="resource-type" value="`$vnf-topology-operation-input.vnf-information.vnf-type`" />\r
- <parameter name="resource-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />\r
- <parameter name="action-name" value="resource-assignment"/>\r
+ <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />\r
+ <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>\r
<parameter name="responsePrefix" value="raAssign" />\r
+ <parameter name="`$cds + 'isNonAppend'`" value="true"/>\r
+ <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>\r
+ <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>\r
</set>\r
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\r
<outcome value=''>\r
<parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '"vnf-model-customization-uuid":"' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '",'`"/>\r
<parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '"vnf-id":"' + $vnf-topology-operation-input.vnf-information.vnf-id + '",'`"/>\r
<parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '"'`"/>\r
+ </set>\r
+ <set>\r
<parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />\r
+ <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />\r
+ <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />\r
+ <parameter name="`$cds + 'payload.resource-assignment-request.template-prefix[0]'`" value='`$tmp.sdnc-artifact-name`' />\r
+ <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />\r
</set>\r
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
<parameter name="logger" value="message-log"/>\r
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>\r
</record>\r
- <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>\r
- <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\r
- <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\r
- <parameter name='action' value='`$action-name`' />\r
- <parameter name='mode' value='sync' />\r
- <parameter name='force' value='false' />\r
- <parameter name='ttl' value='0' />\r
- <parameter name='prefix' value='`$responsePrefix`' />\r
- <parameter name='payload' value="`'{\r
- "resource-assignment-request": {\r
- "template-prefix": [\r
- "' + $tmp.sdnc-artifact-name + '"\r
- ],\r
- "resource-assignment-properties": \r
- ' + $tmp.json-payload + '\r
- }\r
-}'`"/>\r
+ <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+ <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />\r
+ <parameter name='restapiUser' value='`$prop.cds.user`' />\r
+ <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r
+ <parameter name='format' value='json' />\r
+ <parameter name='httpMethod' value='POST' />\r
+ <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+ <parameter name="responsePrefix" value="raAssign" />\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="Error from ConfigAssignmentNode" />\r
+ <parameter name="error-message" value="Error from BlueprintProcessingClient" />\r
</return>\r
</outcome>\r
<outcome value='not-found'>\r
<return status='failure'>\r
<parameter name='ack-final' value='Y'/>\r
<parameter name="error-code" value="500" />\r
- <parameter name="error-message" value="Error from ConfigAssignmentNode" />\r
+ <parameter name="error-message" value="Error from BlueprintProcessingClient" />\r
</return>\r
</outcome>\r
</execute>\r
<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.sdnc-artifact-name`" />\r
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.sdnc-artifact-name`" />\r
<parameter name="outputPath" value="jsonContextPrefix" />\r
- <parameter name="isEscaped" value="false" />\r
- </execute>\r
- <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\r
- <block atomic="true">\r
- <set>\r
- <parameter name='tmp.mso.param.found' value='false' />\r
- </set>\r
- <switch test='`$prehighnum > 0`'>\r
- <outcome value='true'>\r
- <for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\r
- <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\r
- <outcome value='true'>\r
- <set>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\r
- <parameter name='tmp.mso.param.found' value='true' />\r
- </set>\r
- </outcome>\r
- </switch>\r
- </for>\r
+ <parameter name="isEscaped" value="true" />\r
+ <outcome value='success'>\r
+ <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' ></call>\r
+ </outcome>\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.sdnc-artifact-name`" />\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
- </switch>\r
- <switch test='`$tmp.mso.param.found`'>\r
- <outcome value='false'>\r
- <block atomic='true'>\r
- <set>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\r
- <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'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\r
- </set>\r
- <set>\r
- <parameter name='highnum' value='`$highnum + 1`' />\r
- </set>\r
- </block>\r
+ <outcome value='success'>\r
+ <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' ></call>\r
</outcome>\r
- </switch>\r
- </block>\r
- </for>\r
- <for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\r
- <for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >\r
- <for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >\r
- <block atomic="true">\r
- <set>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\r
- <parameter name='num' value='0' />\r
- </set>\r
- <switch test="`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`">\r
- <outcome value='true'></outcome>\r
- <outcome value='false'>\r
- <for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >\r
- <block atomic="true">\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[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\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`' value='`$num + 1`'/>\r
- </set>\r
- <set>\r
- <parameter name='num' value='`$num + 1`' />\r
- </set>\r
- </block>\r
- </for>\r
- </outcome>\r
- </switch>\r
- <set>\r
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>\r
- </set>\r
- <set>\r
- <parameter name='highnum' value='`$highnum + 1`' />\r
- </set>\r
- </block>\r
- </for>\r
- </for>\r
- </for>\r
+ </execute>\r
+ </outcome>\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: vnf-ra-assignment"/>\r
+ <parameter name="field1" value="DONE: self-serve-vnf-ra-assignment"/>\r
</record>\r
<set>\r
<parameter name='pathname' \r