Fix Overlay DG testing issue

[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 55ff864..7f4eb8f 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
@@ -29,7 +29,47 @@
                                 </outcome>\r
                             </switch>\r
                             <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">\r
-                                <outcome value="true" />\r
+                                <outcome value="true">\r
+                                    <block atomic="true">\r
+                                        <set>\r
+                                            <parameter name="tmp.dci-connects.local_networks.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />\r
+                                        </set>\r
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">\r
+                                            <parameter name="original_string" value="`$tmp.dci-connects.local_networks.original`" />\r
+                                            <parameter name="regex" value="," />\r
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />\r
+                                            <outcome value="success">\r
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">\r
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">\r
+                                                        <outcome value="success">\r
+                                                            <set>\r
+                                                                <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />\r
+                                                            </set>\r
+                                                        </outcome>\r
+                                                        <outcome value="not-found">\r
+                                                            <return status="failure">\r
+                                                                <parameter name="error-code" value="" />\r
+                                                                <parameter name="error-message" value="" />\r
+                                                            </return>\r
+                                                        </outcome>\r
+                                                        <outcome value="Other">\r
+                                                            <return status="failure">\r
+                                                                <parameter name="error-code" value="" />\r
+                                                                <parameter name="error-message" value="" />\r
+                                                            </return>\r
+                                                        </outcome>\r
+                                                    </get-resource>\r
+                                                </for>\r
+                                            </outcome>\r
+                                            <outcome value="failure">\r
+                                                <return status="failure">\r
+                                                    <parameter name="error-code" value="" />\r
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />\r
+                                                </return>\r
+                                            </outcome>\r
+                                        </execute>\r
+                                    </block>\r
+                                </outcome>\r
                             </switch>\r
                             <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">\r
                                 <outcome value="true">\r
@@ -147,7 +187,7 @@
                         <switch test="`$prop.dci-connects.tunnelType`">\r
                             <outcome value="L3-DCI">\r
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />\r
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />\r
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
@@ -158,7 +198,7 @@
                             </outcome>\r
                             <outcome value="L2-DCI">\r
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />\r
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />\r
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
@@ -204,7 +244,7 @@
                                             <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />\r
                                             <outcome value="success">\r
                                                 <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">\r
-                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">\r
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">\r
                                                         <outcome value="success">\r
                                                             <set>\r
                                                                 <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />\r
@@ -344,7 +384,7 @@
                         <switch test="`$prop.dci-connects.tunnelType`">\r
                             <outcome value="L3-DCI">\r
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />\r
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />\r
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
@@ -355,7 +395,7 @@
                             </outcome>\r
                             <outcome value="L2-DCI">\r
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />\r
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />\r
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />\r
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r