diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-03-06 17:56:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-06 17:56:20 +0000 |
| commit | 42665b27a449cde74898645b40e3bc32c4ee0183 (patch) | |
| tree | 739ba2d32eea20c79d69f45f063a2f9d02ee38f5 /platform-logic/generic-resource-api/src/main/xml | |
| parent | d0ce678113d24f7ebfa401488e6df8bfb849cccb (diff) | |
| parent | c17046d827a463ca221912f80998f8fc4c733b88 (diff) | |
Merge "CDS integration in GR-API for self-serve"
Former-commit-id: 7b60fe453be2fa7d9908576765b7c220802afc39
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
2 files changed, 44 insertions, 30 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 56a52ff4..f9e12e4e 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 @@ -17,8 +17,8 @@ <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
<parameter name="resource-type" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-type`" />
<parameter name="resource-id" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
- <parameter name="action-name" value="resource-assignment-action"/>
- <parameter name="responsePrefix" value="sriovAssign" />
+ <parameter name="action-name" value="resource-assignment"/>
+ <parameter name="responsePrefix" value="raAssign" />
</set>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>
<outcome value=''>
@@ -123,18 +123,25 @@ </set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
- <parameter name="field1" value="BEFORE ConfigAssignmentNode"/>
+ <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <execute plugin='org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode' method='process'>
- <parameter name="request-id" value='`$request-id`' />
- <parameter name="resource-id" value='`$resource-id`' />
- <parameter name="resource-type" value='`$resource-type`' />
- <parameter name="action-name" value='`$action-name`' />
- <parameter name="template-names" value="`'["' + $tmp.vf-module-label + '"]'`" />
- <parameter name="service-template-name" value='`$tmp.sdnc-model-name`' />
- <parameter name="service-template-version" value='`$tmp.sdnc-model-version`' />
- <parameter name='input-data' value='`$tmp.config-name-value-payload91`' />
- <parameter name="prifix" value="sriovAssign" />
+ <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest' >
+ <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />
+ <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />
+ <parameter name='action' value='`$action-name`' />
+ <parameter name='mode' value='sync' />
+ <parameter name='force' value='false' />
+ <parameter name='ttl' value='0' />
+ <parameter name='prefix' value='`$responsePrefix`' />
+ <parameter name='payload' value="`'{
+ "resource-assignment-request": {
+ "template-prefix": [
+ "' + $tmp.vf-module-label + '"
+ ],
+ "resource-assignment-properties":
+ ' + $tmp.config-name-value-payload91 + '
+ }
+}'`"/>
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -152,10 +159,10 @@ </execute>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
- <parameter name="field1" value="AFTER ConfigAssignmentNode"/>
+ <parameter name="field1" value="AFTER BlueprintProcessingClient"/>
</record>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="`'sriovAssign.mashed-data.' + $tmp.vf-module-label`" />
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-params.' + $tmp.vf-module-label`" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
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 c4f52fca..cee988dd 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 @@ -17,8 +17,8 @@ <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
<parameter name="resource-type" value="`$vnf-topology-operation-input.vnf-information.vnf-type`" />
<parameter name="resource-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
- <parameter name="action-name" value="resource-assignment-action"/>
- <parameter name="responsePrefix" value="sriovAssign" />
+ <parameter name="action-name" value="resource-assignment"/>
+ <parameter name="responsePrefix" value="raAssign" />
</set>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>
<outcome value=''>
@@ -98,18 +98,25 @@ </set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
- <parameter name="field1" value="BEFORE ConfigAssignmentNode"/>
+ <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <execute plugin='org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode' method='process'>
- <parameter name="request-id" value='`$request-id`' />
- <parameter name="resource-id" value='`$resource-id`' />
- <parameter name="resource-type" value='`$resource-type`' />
- <parameter name="action-name" value='`$action-name`' />
- <parameter name="template-names" value="`'["' + $tmp.sdnc-artifact-name + '"]'`" />
- <parameter name="service-template-name" value='`$tmp.sdnc-model-name`' />
- <parameter name="service-template-version" value='`$tmp.sdnc-model-version`' />
- <parameter name='input-data' value='`$tmp.json-payload`' />
- <parameter name="prifix" value="sriovAssign" />
+ <execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>
+ <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />
+ <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />
+ <parameter name='action' value='`$action-name`' />
+ <parameter name='mode' value='sync' />
+ <parameter name='force' value='false' />
+ <parameter name='ttl' value='0' />
+ <parameter name='prefix' value='`$responsePrefix`' />
+ <parameter name='payload' value="`'{
+ "resource-assignment-request": {
+ "template-prefix": [
+ "' + $tmp.sdnc-artifact-name + '"
+ ],
+ "resource-assignment-properties":
+ ' + $tmp.json-payload + '
+ }
+}'`"/>
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -127,10 +134,10 @@ </execute>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
- <parameter name="field1" value="AFTER ConfigAssignmentNode"/>
+ <parameter name="field1" value="AFTER BlueprintProcessingClient"/>
</record>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="`'sriovAssign.mashed-data.' + $tmp.sdnc-artifact-name`" />
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-params.' + $tmp.sdnc-artifact-name`" />
<parameter name="outputPath" value="jsonContextPrefix" />
<parameter name="isEscaped" value="false" />
</execute>
|