SDN-C GR-API to RA Interface Enhancement

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml

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 c4f52fc..2834e11 100644 (file)
--- 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`"/>\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-action"/>\r
-                <parameter name="responsePrefix" value="sriovAssign" />\r
+                <parameter name="action-name" value="resource-assignment"/>\r
+                <parameter name="responsePrefix" value="raAssign" />\r
             </set>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\r
                 <outcome value=''>\r
@@ -98,18 +98,25 @@
             </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 ConfigAssignmentNode"/>\r
+                <parameter name="field1" value="BEFORE BlueprintProcessingClient"/>\r
             </record>\r
-            <execute plugin='org.onap.ccsdk.features.assignment.service.ConfigAssignmentNode' method='process'>\r
-                <parameter name="request-id" value='`$request-id`' />\r
-                <parameter name="resource-id" value='`$resource-id`' />\r
-                <parameter name="resource-type" value='`$resource-type`' />\r
-                <parameter name="action-name" value='`$action-name`' />\r
-                <parameter name="template-names" value="`'[&quot;' + $tmp.sdnc-artifact-name + '&quot;]'`" />\r
-                <parameter name="service-template-name" value='`$tmp.sdnc-model-name`' />\r
-                <parameter name="service-template-version" value='`$tmp.sdnc-model-version`' />\r
-                <parameter name='input-data' value='`$tmp.json-payload`' />\r
-                <parameter name="prifix" value="sriovAssign" />\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
+  &quot;resource-assignment-request&quot;: {\r
+    &quot;template-prefix&quot;: [\r
+      &quot;' + $tmp.sdnc-artifact-name + '&quot;\r
+    ],\r
+    &quot;resource-assignment-properties&quot;: \r
+        ' + $tmp.json-payload + '\r
+  }\r
+}'`"/>\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -127,10 +134,10 @@
             </execute>\r
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">\r
                 <parameter name="logger" value="message-log"/>\r
-                <parameter name="field1" value="AFTER ConfigAssignmentNode"/>\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="`'sriovAssign.mashed-data.' + $tmp.sdnc-artifact-name`" />\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="false" />\r
             </execute>\r