From 349b71ee6f91f807d023fd007df335cfce24844d Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 3 Oct 2019 10:02:13 -0400
Subject: Remove quotes in so response

Add 'format=xml' to restapi-call-node to prevent quotes from being
added around values in XML content

Change-Id: Ic1eacf64fa59002a913d248796fc9247eeeac853
Issue-ID: SDNC-927
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

Former-commit-id: 328a0562c256b4d3781765506dded054b58c3426
---
 .../src/main/json/GENERIC-RESOURCE-API_send-so-response.json          | 2 +-
 .../GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/json')

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 f608e97f..59139a44 100644
--- 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
@@ -51,7 +51,7 @@
         "id": "153e93ce.9ebf4c",
         "type": "execute",
         "name": "execute RestApiCallNode - POST ack-final to SO",
-        "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",
+        "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='format' value='xml' />\n    <parameter name='contentType' value='application/xml' />\n    <parameter name='httpMethod' value='POST' />\n    <parameter name=\"responsePrefix\" value=\"soResponse-vnf-assign\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 744.5463409423828,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
index ee58a701..4d907c16 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.json
@@ -20,7 +20,7 @@
         "module": "GENERIC-RESOURCE-API",
         "version": "${project.version}",
         "comments": "",
-        "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='1-4-2-20181108R1'>",
+        "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}'>",
         "outputs": 1,
         "x": 251.37015914916992,
         "y": 96.07254886627197,
@@ -7272,4 +7272,4 @@
             []
         ]
     }
-]
\ No newline at end of file
+]
-- 
cgit 1.2.3-korg