Fix for overlay DGs.

[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index d0a402c..59ffb6f 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -137,7 +137,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -148,10 +148,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -159,10 +159,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -295,7 +295,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -306,10 +306,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -317,10 +317,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />