integration test issues fix for sdwan and sotn

[sdnc/oam.git] / platform-logic / datachange / src / main / xml / DataChange_esr-thirdparty-sdnc-discovery.xml

diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index 3f2dc89..55c1bd3 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -5,38 +5,51 @@
         <block atomic="true">\r
             <switch test="`$data-change-notification-input.aai-event-trigger`">\r
                 <outcome value='Update'>\r
-                    <block atomic="true">\r
-                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
-                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
-                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
-                            <parameter name="format" value="json"/>\r
-                            <parameter name="httpMethod" value="get"/>\r
-                            <parameter name="responsePrefix" value="topology"/>\r
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
-                            <parameter name="trustStorePassword" value="adminadmin"/>\r
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
-                            <parameter name="keyStorePassword" value="adminadmin"/>\r
-                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
-                            <outcome value='success'>\r
-                                <block atomic="true"></block>\r
+                    <block>\r
+                        <switch test="`$prop.sdncRestApi.type`">\r
+                            <outcome value='SOTN'>\r
+                                <block atomic="true">\r
+                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />\r
+                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                        <parameter name="format" value="json"/>\r
+                                        <parameter name="httpMethod" value="get"/>\r
+                                        <parameter name="responsePrefix" value="topology"/>\r
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>\r
+                                        <parameter name="trustStorePassword" value="adminadmin"/>\r
+                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
+                                        <parameter name="keyStorePassword" value="adminadmin"/>\r
+                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                        <outcome value='success'>\r
+                                            <block atomic="true"></block>\r
+                                        </outcome>\r
+                                        <outcome value='failure'>\r
+                                            <return status='failure'>\r
+                                                <parameter name='ack-final' value='Y'/>\r
+                                                <parameter name="error-code" value="500" />\r
+                                                <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                            </return>\r
+                                        </outcome>\r
+                                    </execute>\r
+                                    <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
+                                        <block>\r
+                                            <set>\r
+                                                <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
+                                            </set>\r
+                                            <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
+                                        </block>\r
+                                    </for>\r
+                                </block>\r
                             </outcome>\r
-                            <outcome value='failure'>\r
+                            <outcome value='Other'>\r
                                 <return status='failure'>\r
                                     <parameter name='ack-final' value='Y'/>\r
                                     <parameter name="error-code" value="500" />\r
-                                    <parameter name="error-message" value="Error executing Create vpn rest api" />\r
+                                    <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
                                 </return>\r
                             </outcome>\r
-                        </execute>\r
-                        <for index='nidx' start='0' end='`$topology.networks.network_length`' >\r
-                            <block>\r
-                                <set>\r
-                                    <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
-                                </set>\r
-                                <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
-                            </block>\r
-                        </for>\r
+                        </switch>\r
                     </block>\r
                 </outcome>\r
                 <outcome value='delete'>\r