Bug fix to add restconf api node in DG

Restconf api node in DG

Change-Id: I5bcd79073a442cc8ca532f3c2a1560f2867803c4
Issue-ID: CCSDK-1344
Signed-off-by: janani <janani.b@huawei.com>

Former-commit-id: bd8f3c044a690772dc1855a0b8f678d9b56f5142

3 files changed, 64 insertions, 61 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
index fb782ada..c1f8931e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml
@@ -14,11 +14,15 @@
                 </outcome>

             </execute>

             <set>

-                <parameter name="request-id" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>

+                <parameter name="cds" value="execution-service_process."/>

+                <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>

                 <parameter name="resource-type" value="`$pnf-topology-operation-input.pnf-details.pnf-type`" />

-                <parameter name="resource-id" value="`$pnf-topology-operation-input.pnf-details.pnf-id`" />

-                <parameter name="action-name" value="resource-assignment"/>

+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$pnf-topology-operation-input.pnf-details.pnf-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.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`'>

                 <outcome value=''>

@@ -94,29 +98,26 @@
                 <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '&quot;pnf-model-customization-uuid&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '&quot;,'`"/>

                 <parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '&quot;pnf-id&quot;:&quot;' + $pnf-topology-operation-input.pnf-details.pnf-id + '&quot;,'`"/>

                 <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $pnf-topology-operation-input.pnf-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.template-prefix'`" 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'/>

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 1553f977..a2fa9417 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
@@ -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="`$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"/>

+                <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-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.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'>

                 <outcome value=''>

@@ -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;,'`"/>

                 <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;,'`"/>

                 <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;'`"/>

-                <parameter name="tmp.config-name-value-payload91" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />

+            </set>

+            <set>

+                <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />

+                <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />

+                <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />

+                <parameter name="`$cds + 'payload.template-prefix'`" 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.vf-module-label + '&quot;

-    ],

-    &quot;resource-assignment-properties&quot;: 

-        ' + $tmp.config-name-value-payload91 + '

-  }

-}'`"/>

+            <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='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />

+                <parameter name='format' value='json' />

+                <parameter name='httpMethod' value='POST' />

+                <parameter name="responsePrefix" value="`$responsePrefix`" />

                 <outcome value='failure'>

                     <return status='failure'>

                         <parameter name='ack-final' value='Y'/>

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 2834e11f..b279626a 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.template-prefix'`" 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'/>