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

4 files changed, 6 insertions, 5 deletions

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
+]

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 521f40f5..aee8febb 100644
--- 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
@@ -12,6 +12,7 @@
                 <parameter name='restapiUser' value='`$prop.so.user`' />

                 <parameter name='restapiPassword' value='`$prop.so.pwd`' />

                 <parameter name='accept' value='text/plain' />

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

                 <parameter name='contentType' value='application/xml' />

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

                 <parameter name="responsePrefix" value="soResponse-vnf-assign" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
index b9589a70..4223b729 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml
@@ -1,6 +1,6 @@
 <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'>

+    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}'>

     <method rpc='vf-module-topology-operation-assign' mode='sync'>

         <block atomic="true">

             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >

@@ -1859,4 +1859,4 @@ key="INSERT INTO VIPR_CONFIGURATION (vnf_id, vnf_name, ecomp_service_instance_id
             </switch>

         </block>

     </method>

-</service-logic>
\ No newline at end of file
+</service-logic>