From 7f48f7ffe672a307a931465b33a964482593d345 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Wed, 18 Sep 2019 11:19:15 -0400
Subject: Refactoring Netconf NetconfMessageUtils

Appending New Line before and after request body within doWrapRpc and removing new line is child API's which forms the request body

Issue-ID: CCSDK-1743
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ic58566e24a21c71d545c45fb95a667c17de2fe66
---
 .../vLB/Plans/CONFIG_ConfigDeploy.xml              |  6 +++---
 .../Plans/CONFIG_ResourceAssignment_1.0.0.xml      |  2 +-
 .../Plans/CONFIG_ExecAnsiblePlaybook.xml           |  6 +++---
 .../uat-blueprints/echo/Plans/TEST_echo.xml        | 24 +++++++++++-----------
 .../pnf_config/Plans/CONFIG_configAssign.xml       | 24 +++++++++++-----------
 .../pnf_config/Plans/CONFIG_configDeploy.xml       | 24 +++++++++++-----------
 6 files changed, 43 insertions(+), 43 deletions(-)

(limited to 'components/model-catalog')

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml b/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
index d198a72dd..519aecf4d 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Plans/CONFIG_ConfigDeploy.xml
@@ -1,7 +1,7 @@
 <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='CONFIG' version='1.0.0'>
+        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='CONFIG' version='1.0.0'>
     <method rpc='ConfigDeploy' mode='sync'>
         <block atomic="true">
             <execute plugin="nf-account-collection" method="process">
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Plans/CONFIG_ResourceAssignment_1.0.0.xml b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Plans/CONFIG_ResourceAssignment_1.0.0.xml
index a197877f5..4ed910b47 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Plans/CONFIG_ResourceAssignment_1.0.0.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Plans/CONFIG_ResourceAssignment_1.0.0.xml
@@ -20,7 +20,7 @@
     <method rpc='ResourceAssignment' mode='sync'>
         <block atomic="true">
             <execute plugin="resource-assignment" method="process">
-                 <outcome value='failure'>
+                <outcome value='failure'>
                     <return status="failure">
                     </return>
                 </outcome>
diff --git a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Plans/CONFIG_ExecAnsiblePlaybook.xml b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Plans/CONFIG_ExecAnsiblePlaybook.xml
index aad0a0d69..bee836eec 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Plans/CONFIG_ExecAnsiblePlaybook.xml
+++ b/components/model-catalog/blueprint-model/test-blueprint/remote_scripts/Plans/CONFIG_ExecAnsiblePlaybook.xml
@@ -1,7 +1,7 @@
 <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='CONFIG' version='1.0.0'>
+        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='CONFIG' version='1.0.0'>
     <method rpc='ResolveAnsibleVar' mode='sync'>
         <block atomic="true">
             <execute plugin="resolve-ansible-vars" method="process">
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/echo/Plans/TEST_echo.xml b/components/model-catalog/blueprint-model/uat-blueprints/echo/Plans/TEST_echo.xml
index 4305c7dd8..b0ab5c62e 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/echo/Plans/TEST_echo.xml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/echo/Plans/TEST_echo.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="CONFIG" version="1.0.0">
-   <method rpc="ResourceAssignAndActivate" mode="sync">
-      <block atomic="true">
-         <execute plugin="echo" method="process">
-            <outcome value="failure">
-               <return status="failure" />
-            </outcome>
-            <outcome value="success">
-               <return status="success" />
-            </outcome>
-         </execute>
-      </block>
-   </method>
+    <method rpc="ResourceAssignAndActivate" mode="sync">
+        <block atomic="true">
+            <execute plugin="echo" method="process">
+                <outcome value="failure">
+                    <return status="failure" />
+                </outcome>
+                <outcome value="success">
+                    <return status="success" />
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configAssign.xml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configAssign.xml
index 220cba9f7..f8005611e 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configAssign.xml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configAssign.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="CONFIG" version="1.0.0">
-   <method rpc="ResourceAssignAndActivate" mode="sync">
-      <block atomic="true">
-         <execute plugin="config-assign" method="process">
-            <outcome value="failure">
-               <return status="failure" />
-            </outcome>
-            <outcome value="success">
-               <return status="success" />
-            </outcome>
-         </execute>
-      </block>
-   </method>
+    <method rpc="ResourceAssignAndActivate" mode="sync">
+        <block atomic="true">
+            <execute plugin="config-assign" method="process">
+                <outcome value="failure">
+                    <return status="failure" />
+                </outcome>
+                <outcome value="success">
+                    <return status="success" />
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configDeploy.xml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configDeploy.xml
index fbed3d575..39774b5f0 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configDeploy.xml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Plans/CONFIG_configDeploy.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="CONFIG" version="1.0.0">
-   <method rpc="ResourceAssignAndActivate" mode="sync">
-      <block atomic="true">
-         <execute plugin="config-deploy" method="process">
-            <outcome value="failure">
-               <return status="failure" />
-            </outcome>
-            <outcome value="success">
-               <return status="success" />
-            </outcome>
-         </execute>
-      </block>
-   </method>
+    <method rpc="ResourceAssignAndActivate" mode="sync">
+        <block atomic="true">
+            <execute plugin="config-deploy" method="process">
+                <outcome value="failure">
+                    <return status="failure" />
+                </outcome>
+                <outcome value="success">
+                    <return status="success" />
+                </outcome>
+            </execute>
+        </block>
+    </method>
 </service-logic>
-- 
cgit 1.2.3-korg