From eeeaab5e03c72410c9607e00e90ddb09d6ec8a94 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= <adetalhouet89@gmail.com>
Date: Fri, 17 May 2019 09:15:49 -0400
Subject: [PATCH] Use CDS HTTP instead of gRPC
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Id15af2a55b40a535836f8170973faf290ae88b18
Issue-ID: SDNC-768
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: 88efc22be9444a9a217d5e2ac87c9278d6e855d4
---
 .../properties/generic-resource-api-dg.properties  |  3 +++
 ...-RESOURCE-API_self-serve-pnf-ra-assignment.json |  2 +-
 ...URCE-API_self-serve-vfmodule-ra-assignment.json |  4 ++--
 ...-RESOURCE-API_self-serve-vnf-ra-assignment.json |  2 +-
 ...C-RESOURCE-API_self-serve-pnf-ra-assignment.xml | 25 +++++++-------------
 ...OURCE-API_self-serve-vfmodule-ra-assignment.xml | 27 ++++++++--------------
 ...C-RESOURCE-API_self-serve-vnf-ra-assignment.xml | 25 +++++++-------------
 .../src/main/json/cds-processor-payload.json       | 22 ++++++++++++++++++
 8 files changed, 54 insertions(+), 56 deletions(-)
 create mode 100644 platform-logic/restapi-templates/src/main/json/cds-processor-payload.json

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 8c21e687..ae162d48 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -13,6 +13,9 @@ restapi.connection-oof-url=http://oof-osdf:8698/api/oof/v1/route
 naming.gen-name.url=http://neng-serv:8080
 naming.gen-name.user=ccsdkapps
 naming.gen-name.pwd=ccsdkapps
+cds.url=http://cds-blueprints-processor-http:8080
+cds.user=ccsdkapps
+cds.pwd=ccsdkapps
 
 # Templates
 restapi.sz.templatefile=security-zone-allotted-resource.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
index d2164e72..b483f84d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json
@@ -379,7 +379,7 @@
         "id": "e221b302.f0199",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>\n <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n <parameter name='action' value='`$action-name`' />\n <parameter name='mode' value='sync' />\n <parameter name='force' value='false' />\n <parameter name='ttl' value='0' />\n <parameter name='prefix' value='`$responsePrefix`' />\n <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.sdnc-artifact-name + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.json-payload + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n    <parameter name='format' value='json' />\r\n    <parameter name='httpMethod' value='POST' />\r\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
         "x": 463.33331298828125,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
index 9f86a0e4..5d4d6e05 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
@@ -252,7 +252,7 @@
         "id": "7f7fcb9e.5c0444",
         "type": "set",
         "name": "set configAssignment JsonString",
-        "xml": "<set>\n\t<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n\t<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;,'`\"/>\n\t<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;,'`\"/>\n\t<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;'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload91\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n\t\n",
+        "xml": "<set>\n\t<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n\t<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;,'`\"/>\n\t<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;,'`\"/>\n\t<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;'`\"/>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n\t\n",
         "comments": "",
         "x": 371,
         "y": 708,
@@ -263,7 +263,7 @@
         "id": "eb354f8e.b9f91",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest' >\n     <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n     <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n     <parameter name='action' value='`$action-name`' />\n     <parameter name='mode' value='sync' />\n     <parameter name='force' value='false' />\n     <parameter name='ttl' value='0' />\n     <parameter name='prefix' value='`$responsePrefix`' />\n     <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.vf-module-label + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.config-name-value-payload91 + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n    <parameter name='format' value='json' />\r\n    <parameter name='httpMethod' value='POST' />\r\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
         "x": 385.33331298828125,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
index 97111877..4bede874 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
@@ -379,7 +379,7 @@
         "id": "91dde7fd.fe86a",
         "type": "execute",
         "name": "execute BlueprintProcessingClient",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.grpc.cds.BlueprintProcessingClient' method='sendRequest'>\n <parameter name='blueprint_name' value='`$tmp.sdnc-model-name`' />\n <parameter name='blueprint_version' value='`$tmp.sdnc-model-version`' />\n <parameter name='action' value='`$action-name`' />\n <parameter name='mode' value='sync' />\n <parameter name='force' value='false' />\n <parameter name='ttl' value='0' />\n <parameter name='prefix' value='`$responsePrefix`' />\n <parameter name='payload' value=\"`'{\n  &quot;resource-assignment-request&quot;: {\n    &quot;template-prefix&quot;: [\n      &quot;' + $tmp.sdnc-artifact-name + '&quot;\n    ],\n    &quot;resource-assignment-properties&quot;: \n        ' + $tmp.json-payload + '\n  }\n}'`\"/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n    <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n    <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n    <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n    <parameter name='format' value='json' />\r\n    <parameter name='httpMethod' value='POST' />\r\n    <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
         "comments": "",
         "outputs": 1,
         "x": 449.33331298828125,
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..cbc78c8a 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
@@ -100,23 +100,14 @@
                 <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.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+                <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="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..5b30bba8 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
@@ -119,29 +119,20 @@
                 <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 + '}'`" />
+                <parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
             </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.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+                <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="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..c65b7c03 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
@@ -100,23 +100,14 @@
                 <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.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+                <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="responsePrefix" value="`$responsePrefix`" />
                 <outcome value='failure'>
                     <return status='failure'>
                         <parameter name='ack-final' value='Y'/>
diff --git a/platform-logic/restapi-templates/src/main/json/cds-processor-payload.json b/platform-logic/restapi-templates/src/main/json/cds-processor-payload.json
new file mode 100644
index 00000000..13aa57c1
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cds-processor-payload.json
@@ -0,0 +1,22 @@
+{
+  "commonHeader": {
+    "originatorId": "SDNC_DG",
+    "requestId": ${request-id},
+    "subRequestId": ${resource-id}
+  },
+  "actionIdentifiers": {
+    "blueprintName": ${tmp.sdnc-model-name},
+    "blueprintVersion": ${tmp.sdnc-model-version},
+    "actionName": ${action-name},
+    "mode": "sync"
+  },
+  "payload": {
+    "resource-assignment-request": {
+      "template-prefix": [
+        ${tmp.sdnc-artifact-name}
+      ],
+      "resource-assignment-properties":
+        ${tmp.json-payload}
+    }
+  }
+}
\ No newline at end of file
-- 
2.16.6