Bug fix in self-serve api

[sdnc/oam.git] / 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 56a52ff..a2fa941 100644 (file)
--- 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
@@ -14,11 +14,15 @@
                 </outcome>\r
             </execute>\r
             <set>\r
-                <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>\r
+                <parameter name="cds" value="execution-service_process."/>\r
+                <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>\r
                 <parameter name="resource-type" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-type`" />\r
-                <parameter name="resource-id" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />\r
-                <parameter name="action-name" value="resource-assignment-action"/>\r
-                <parameter name="responsePrefix" value="sriovAssign" />\r
+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />\r
+                <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>\r
+                <parameter name="responsePrefix" value="raAssign" />\r
+                <parameter name="`$cds + 'isNonAppend'`" value="true"/>\r
+                <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>\r
+                <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>\r
             </set>\r
             <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`'>\r
                 <outcome value=''>\r
@@ -119,22 +123,26 @@
                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`"/>\r
                 <parameter name="tmp.config-name-value-payload8" value="`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`"/>\r
                 <parameter name="tmp.config-name-value-payload9" value="`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`"/>\r
-                <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />\r
+            </set>\r
+            <set>\r
+                <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />\r
+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />\r
+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />\r
+                <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />\r
+                <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />\r
             </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.vf-module-label + '&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.config-name-value-payload91`' />\r
-                <parameter name="prifix" value="sriovAssign" />\r
+            <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\r
+                <parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />\r
+                <parameter name='restapiUser' value='`$prop.cds.user`' />\r
+                <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />\r
+                <parameter name='format' value='json' />\r
+                <parameter name='httpMethod' value='POST' />\r
+                <parameter name="responsePrefix" value="`$responsePrefix`" />\r
                 <outcome value='failure'>\r
                     <return status='failure'>\r
                         <parameter name='ack-final' value='Y'/>\r
@@ -152,10 +160,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.vf-module-label`" />\r
+                <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`" />\r
                 <parameter name="outputPath" value="jsonContextPrefix" />\r
                 <parameter name="isEscaped" value="false" />\r
             </execute>\r