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/xml/GENERIC-RESOURCE-API_send-so-response.xml            | 1 +
 .../xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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

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>
-- 
cgit 1.2.3-korg