diff options
author | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-05-17 09:15:49 -0400 |
---|---|---|
committer | Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-05-17 17:48:51 +0000 |
commit | eeeaab5e03c72410c9607e00e90ddb09d6ec8a94 (patch) | |
tree | d1b2ff41561f34004ec4bc6406f74dd9ecebe5aa /platform-logic/generic-resource-api/src/main/xml | |
parent | 56dbfc16ccc332a2f86fa93b83f3c79682edb69f (diff) |
Use CDS HTTP instead of gRPC
Change-Id: Id15af2a55b40a535836f8170973faf290ae88b18
Issue-ID: SDNC-768
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
Former-commit-id: 88efc22be9444a9a217d5e2ac87c9278d6e855d4
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
3 files changed, 25 insertions, 52 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml index fb782ada..cbc78c8a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml @@ -100,23 +100,14 @@ <parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <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 + '
- }
-}'`"/>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+ <parameter name='restapiUser' value='`$prop.cds.user`' />
+ <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='POST' />
+ <parameter name="responsePrefix" value="`$responsePrefix`" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
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 1553f977..5b30bba8 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 @@ -119,29 +119,20 @@ <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '"vnf-model-customization-uuid":"' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '",'`"/>
<parameter name="tmp.config-name-value-payload8" value="`$tmp.config-name-value-payload7 + '"vf-module-id":"' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '",'`"/>
<parameter name="tmp.config-name-value-payload9" value="`$tmp.config-name-value-payload8 + '"aic-cloud-region":"' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '"'`"/>
- <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
+ <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
</set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <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 + '
- }
-}'`"/>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+ <parameter name='restapiUser' value='`$prop.cds.user`' />
+ <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='POST' />
+ <parameter name="responsePrefix" value="`$responsePrefix`" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
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 2834e11f..c65b7c03 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 @@ -100,23 +100,14 @@ <parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <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 + '
- }
-}'`"/>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
+ <parameter name='restapiUser' value='`$prop.cds.user`' />
+ <parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='POST' />
+ <parameter name="responsePrefix" value="`$responsePrefix`" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
|