X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml;h=347dd7184935a9e13505ac16b858c4410e5d4360;hb=d62222b32cb04696dd11917f893397a01c3ba49f;hp=cee988dd2ea9c65448da64771ab082cc0454d60d;hpb=15ab9a0704e2cf001284692c0a1fa99d97d2e504;p=sdnc%2Foam.git

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 cee988dd..347dd718 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
@@ -14,11 +14,15 @@
                 </outcome>
             </execute>
             <set>
-                <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
+                <parameter name="cds" value="execution-service_process."/>
+                <parameter name="`$cds + 'commonHeader.requestId'`" 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"/>
+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
+                <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
                 <parameter name="responsePrefix" value="raAssign" />
+                <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+                <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+                <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
             </set>
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>
                 <outcome value=''>
@@ -94,29 +98,26 @@
                 <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`"/>
                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`"/>
+            </set>
+            <set>
                 <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+                <parameter name="`$cds + 'payload.resource-assignment-request.template-prefix[0]'`" value='`$tmp.sdnc-artifact-name`' />
+                <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
             </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="`'{
-  &quot;resource-assignment-request&quot;: {
-    &quot;template-prefix&quot;: [
-      &quot;' + $tmp.sdnc-artifact-name + '&quot;
-    ],
-    &quot;resource-assignment-properties&quot;: 
-        ' + $tmp.json-payload + '
-  }
-}'`"/>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
+                <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='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name="responsePrefix" value="`$responsePrefix`" />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
@@ -137,7 +138,7 @@
                 <parameter name="field1" value="AFTER BlueprintProcessingClient"/>
             </record>
             <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
-                <parameter name="source" value="`'raAssign.payload.resource-assignment-params.' + $tmp.sdnc-artifact-name`" />
+                <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`" />
                 <parameter name="outputPath" value="jsonContextPrefix" />
                 <parameter name="isEscaped" value="false" />
             </execute>