Bug fix to add restconf api node in DG

[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 1553f97..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"/>\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,29 +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 BlueprintProcessingClient"/>\r
             </record>\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.vf-module-label + '&quot;\r
-    ],\r
-    &quot;resource-assignment-properties&quot;: \r
-        ' + $tmp.config-name-value-payload91 + '\r
-  }\r
-}'`"/>\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