From c17046d827a463ca221912f80998f8fc4c733b88 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Thu, 28 Feb 2019 16:26:16 -0500
Subject: CDS integration in GR-API for self-serve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Iddf72ced078b15db726188b2dfb86ef0ee6e8f17
Issue-ID: CCSDK-466
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: 15ab9a0704e2cf001284692c0a1fa99d97d2e504
---
 ...OURCE-API_self-serve-vfmodule-ra-assignment.xml | 37 +++++++++++++---------
 1 file changed, 22 insertions(+), 15 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml')

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="`'[&quot;' + $tmp.vf-module-label + '&quot;]'`" />
-                <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="`'{
+  &quot;resource-assignment-request&quot;: {
+    &quot;template-prefix&quot;: [
+      &quot;' + $tmp.vf-module-label + '&quot;
+    ],
+    &quot;resource-assignment-properties&quot;: 
+        ' + $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>
-- 
cgit 1.2.3-korg