Fixes for async response to SO

1) Wrong user name configured for SO interface
2) Accept header needs to be set to 'text/plain'
3) Content-Type needs to be explicitly set to 'application/json'
4) Template is missing outer "input" tag
5) Message needs to be in XML format, not JSON

Change-Id: Icd06d12ff8576d2dd560ea452d0a14c3de643a00
Issue-ID: SDNC-927
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Former-commit-id: 4b19faedfa92b30c8d292d9a5f274c812764a99c

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 48c510b..b303d99 100644 (file)
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -13,7 +13,7 @@ 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
-so.user=InfraPortalClient
+so.user=sdncaBpmn
 so.pwd=password1$
 cds.url=http://cds-blueprints-processor-http:8080
 cds.user=ccsdkapps

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_send-so-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_send-so-response.json
index 1a8e85c..f608e97 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_send-so-response.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_send-so-response.json
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "1be7c5d.ad3cd3a",\r
+        "id": "55167d1e.ed2dbc",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 186.2630157470703,\r
-        "y": 83.76301574707031,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 142,\r
+        "y": 118,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "7fd0368c.d911a8"\r
+                "4fe16795.505a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bd2ce4a.136122",\r
+        "id": "12fd478e.613338",\r
         "type": "method",\r
         "name": "method send-so-response",\r
         "xml": "<method rpc='send-so-response' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 331.2749328613281,\r
-        "y": 148.46936988830566,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 287.0119171142578,\r
+        "y": 182.70635414123535,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "10c7b604.2a55ba"\r
+                "91e959be.0046b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fd0368c.d911a8",\r
+        "id": "4fe16795.505a68",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -38,142 +38,142 @@
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 448.50121307373047,\r
-        "y": 83.9535083770752,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 404.23819732666016,\r
+        "y": 118.19049263000488,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "3bd2ce4a.136122"\r
+                "12fd478e.613338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af9d7c89.15796",\r
+        "id": "153e93ce.9ebf4c",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode - POST ack-final to SO",\r
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + 'so-response.json'`\" />\n    <parameter name='restapiUrl' value=\"`$so.notification-url`\" />\n    <parameter name='restapiUser' value='`$prop.so.user`' />\n    <parameter name='restapiPassword' value='`$prop.so.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"soResponse-vnf-assign\" />\n\n",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + 'so-response.xml'`\" />\n    <parameter name='restapiUrl' value=\"`$so.notification-url`\" />\n    <parameter name='restapiUser' value='`$prop.so.user`' />\n    <parameter name='restapiPassword' value='`$prop.so.pwd`' />\n    <parameter name='accept' value='text/plain' />\n    <parameter name='contentType' value='application/xml' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"soResponse-vnf-assign\" />\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 788.8093566894531,\r
-        "y": 293.73350286483765,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 744.5463409423828,\r
+        "y": 327.97048711776733,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "d61676da.12fe28",\r
-                "87d46700.e01758"\r
+                "10150aac.baf595",\r
+                "7abea62f.e688e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d61676da.12fe28",\r
+        "id": "10150aac.baf595",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1075.700740814209,\r
-        "y": 270.31422758102417,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 1031.4377250671387,\r
+        "y": 304.55121183395386,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "7e23e4c2.43ac6c"\r
+                "c2af9654.82f04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "deb0a632.ae9ed8",\r
+        "id": "1138f7b0.eeb818",\r
         "type": "configure",\r
         "name": "set error-message",\r
         "xml": "<set>\n<parameter name=\"error-message\" value=\"`'Error sending SO response. ' + $error-message`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1529.511962890625,\r
-        "y": 247.45922470092773,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 1485.2489471435547,\r
+        "y": 281.6962089538574,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "87d46700.e01758",\r
+        "id": "7abea62f.e688e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1087.0593032836914,\r
-        "y": 317.4833388328552,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 1042.796287536621,\r
+        "y": 351.7203230857849,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "7e23e4c2.43ac6c"\r
+                "c2af9654.82f04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10c7b604.2a55ba",\r
+        "id": "91e959be.0046b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 469.0129928588867,\r
-        "y": 263.7629699707031,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 424.7499771118164,\r
+        "y": 297.9999542236328,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "af9d7c89.15796",\r
-                "aa7b88f3.7101b8"\r
+                "153e93ce.9ebf4c",\r
+                "de88f47c.4b8e38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa7b88f3.7101b8",\r
+        "id": "de88f47c.4b8e38",\r
         "type": "set",\r
         "name": "set so.response-message",\r
         "xml": "<set>\n<parameter name=\"so.response-message\" value=\"`$error-message`\" />",\r
         "comments": "",\r
-        "x": 715.0130081176758,\r
-        "y": 243.7629656791687,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 670.7499923706055,\r
+        "y": 277.9999499320984,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b71151b.49bd3c",\r
+        "id": "aed75eca.5a9ad",\r
         "type": "comment",\r
         "name": "Caller must set all the params required for SO response",\r
         "info": "so.ack-final-indicator\nso.notification-url\nso.response-code\nso.response-message\nso.svc-request-id\nso.service-instance-id\nso.service-type",\r
         "comments": "",\r
-        "x": 937.5130081176758,\r
-        "y": 152.51301765441895,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 893.2499923706055,\r
+        "y": 186.75000190734863,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "535d0ddc.6a9ff4",\r
+        "id": "d3ee031.03b0d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 1510.096477508545,\r
-        "y": 317.67168045043945,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 1465.8334617614746,\r
+        "y": 351.90866470336914,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e23e4c2.43ac6c",\r
+        "id": "c2af9654.82f04",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1303.762939453125,\r
-        "y": 288.76298904418945,\r
-        "z": "9c4d3573.f087a8",\r
+        "x": 1259.4999237060547,\r
+        "y": 322.99997329711914,\r
+        "z": "4c84aa17.c3c6dc",\r
         "wires": [\r
             [\r
-                "deb0a632.ae9ed8",\r
-                "535d0ddc.6a9ff4"\r
+                "1138f7b0.eeb818",\r
+                "d3ee031.03b0d8"\r
             ]\r
         ]\r
     }\r

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_send-so-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_send-so-response.xml
index bf4c264..521f40f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_send-so-response.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_send-so-response.xml
@@ -7,11 +7,12 @@
                 <parameter name="so.response-message" value="`$error-message`" />\r
             </set>\r
             <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'so-response.json'`" />\r
+                <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + 'so-response.xml'`" />\r
                 <parameter name='restapiUrl' value="`$so.notification-url`" />\r
                 <parameter name='restapiUser' value='`$prop.so.user`' />\r
                 <parameter name='restapiPassword' value='`$prop.so.pwd`' />\r
-                <parameter name='format' value='json' />\r
+                <parameter name='accept' value='text/plain' />\r
+                <parameter name='contentType' value='application/xml' />\r
                 <parameter name='httpMethod' value='POST' />\r
                 <parameter name="responsePrefix" value="soResponse-vnf-assign" />\r
                 <outcome value='failure'>\r

diff --git a/platform-logic/restapi-templates/src/main/json/so-response.json b/platform-logic/restapi-templates/src/main/json/so-response.json
index 2e47fb0..33d54c8 100644 (file)
--- a/platform-logic/restapi-templates/src/main/json/so-response.json
+++ b/platform-logic/restapi-templates/src/main/json/so-response.json
@@ -1,4 +1,5 @@
 {
+    "input" : {
        "service-information": {
                "service-instance-id": ${so.service-instance-id},
                "service-type": ${so.service-type}
@@ -7,4 +8,5 @@
        "response-code": ${so.response-code},
        "response-message": ${so.response-message},
        "ack-final-indicator": ${so.ack-final-indicator}
+    }
 }

diff --git a/platform-logic/restapi-templates/src/main/xml/so-response.xml b/platform-logic/restapi-templates/src/main/xml/so-response.xml
new file mode 100644 (file)
index 0000000..0913c1b
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/xml/so-response.xml
@@ -0,0 +1,10 @@
+<input>
+    <service-information>
+        <service-instance-id>${so.service-instance-id}</service-instance-id>
+        <service-type>${so.service-type}</service-type>
+    </service-information>
+    <svc-request-id>${so.svc-request-id}</svc-request-id>
+    <response-code>${so.response-code}</response-code>
+    <response-message>${so.response-message}</response-message>
+    <ack-final-indicator>${so.ack-final-indicator}</ack-final-indicator>
+</input>