Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Completing the logic and the call flow for Transport Slicing operations:
[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 007f3bf..98585db 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
@@ -1,21 +1,23 @@
-<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
-    <method rpc="esr-thirdparty-sdnc-discovery" mode="sync">\r
+<service-logic\r
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
+    <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\r
         <block atomic="true">\r
             <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">\r
-                <outcome value="false">\r
+                <outcome value='false'>\r
                     <switch test="`$data-change-notification-input.aai-event-trigger`">\r
-                        <outcome value="Update">\r
+                        <outcome value='Update'>\r
                             <block>\r
                                 <switch test="`$prop.sdncRestApi.type`">\r
-                                    <outcome value="SOTN">\r
+                                    <outcome value='SOTN'>\r
                                         <block atomic="true">\r
-                                            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">\r
-                                                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>\r
-                                                <parameter name="contextPrefix" value="prop"/>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\r
+                                                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\r
+                                                <parameter name='contextPrefix' value='prop' />\r
                                             </execute>\r
-                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
-                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>\r
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />\r
                                                 <parameter name="format" value="json"/>\r
                                                 <parameter name="httpMethod" value="post"/>\r
                                                 <parameter name="responsePrefix" value="token-result"/>\r
@@ -23,21 +25,21 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\r
-                                                <outcome value="success">\r
+                                                <outcome value='success'>\r
                                                     <set>\r
-                                                        <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>\r
+                                                        <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\r
                                                     </set>\r
                                                 </outcome>\r
-                                                <outcome value="failure">\r
-                                                    <block/>\r
+                                                <outcome value='failure'>\r
+                                                    <block></block>\r
                                                 </outcome>\r
                                             </execute>\r
                                             <switch test="`$prop.sdncRestApi.token_id`">\r
-                                                <outcome value="">\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
+                                                <outcome value=''>\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
@@ -45,53 +47,53 @@
                                                         <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                         <parameter name="keyStorePassword" value="adminadmin"/>\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
+                                                        <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
-                                                        <outcome value="success">\r
+                                                        <outcome value='success'>\r
                                                             <block atomic="true">\r
-                                                                <for index="nidx" start="0" end="`$topology.networks.network_length`">\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
+                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
-                                                                        <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>\r
+                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
-                                                                <switch test="`$topology.networks.network_length >= 2`">\r
-                                                                    <outcome value="true">\r
-                                                                        <block atomic="true">\r
-                                                                            <for index="netidx" start="0" end="`$topology.networks.network_length`">\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <block atomic='true'>\r
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                                 <block>\r
                                                                                     <set>\r
-                                                                                        <parameter name="network." value=""/>\r
+                                                                                        <parameter name='network.' value='' />\r
                                                                                     </set>\r
                                                                                     <set>\r
-                                                                                        <parameter name="network." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                     </set>\r
-                                                                                    <switch test="`$network.te-topology-id`">\r
-                                                                                        <outcome value="11">\r
+                                                                                    <switch test='`$network.te-topology-id`'>\r
+                                                                                        <outcome value='1'>\r
                                                                                             <block>\r
                                                                                                 <set>\r
-                                                                                                    <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                                 </set>\r
                                                                                             </block>\r
                                                                                         </outcome>\r
-                                                                                        <outcome value="33">\r
+                                                                                        <outcome value='2'>\r
                                                                                             <block>\r
                                                                                                 <set>\r
-                                                                                                    <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                                 </set>\r
                                                                                             </block>\r
                                                                                         </outcome>\r
                                                                                     </switch>\r
                                                                                 </block>\r
                                                                             </for>\r
-                                                                            <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>\r
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                         </block>\r
                                                                     </outcome>\r
                                                                 </switch>\r
@@ -99,11 +101,11 @@
                                                         </outcome>\r
                                                     </execute>\r
                                                 </outcome>\r
-                                                <outcome value="Other">\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
+                                                <outcome value='Other'>\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
@@ -111,54 +113,54 @@
                                                         <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="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
+                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\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
-                                                        <outcome value="success">\r
+                                                        <outcome value='success'>\r
                                                             <block atomic="true">\r
-                                                                <for index="nidx" start="0" end="`$topology.networks.network_length`">\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
+                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />\r
                                                                         </set>\r
-                                                                        <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>\r
+                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>\r
                                                                     </block>\r
                                                                 </for>\r
-                                                                <switch test="`$topology.networks.network_length >= 2`">\r
-                                                                    <outcome value="true">\r
-                                                                        <block atomic="true">\r
-                                                                            <for index="netidx" start="0" end="`$topology.networks.network_length`">\r
+                                                                <switch test='`$topology.networks.network_length >= 2`'>\r
+                                                                    <outcome value='true'>\r
+                                                                        <block atomic='true'>\r
+                                                                            <for index='netidx' start='0' end='`$topology.networks.network_length`' >\r
                                                                                 <block>\r
                                                                                     <set>\r
-                                                                                        <parameter name="network." value=""/>\r
+                                                                                        <parameter name='network.' value='' />\r
                                                                                     </set>\r
                                                                                     <set>\r
-                                                                                        <parameter name="network." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                        <parameter name='network.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                     </set>\r
-                                                                                    <switch test="`$network.te-topology-id`">\r
-                                                                                        <outcome value="11">\r
+                                                                                    <switch test='`$network.te-topology-id`'>\r
+                                                                                        <outcome value='1'>\r
                                                                                             <block>\r
                                                                                                 <set>\r
-                                                                                                    <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                    <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                                 </set>\r
                                                                                             </block>\r
                                                                                         </outcome>\r
-                                                                                        <outcome value="33">\r
+                                                                                        <outcome value='2'>\r
                                                                                             <block>\r
                                                                                                 <set>\r
-                                                                                                    <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>\r
+                                                                                                    <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />\r
                                                                                                 </set>\r
                                                                                             </block>\r
                                                                                         </outcome>\r
                                                                                     </switch>\r
                                                                                 </block>\r
                                                                             </for>\r
-                                                                            <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>\r
+                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>\r
                                                                         </block>\r
                                                                     </outcome>\r
                                                                 </switch>\r
@@ -168,32 +170,32 @@
                                                 </outcome>\r
                                             </switch>\r
                                             <set>\r
-                                                <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>\r
-                                                <parameter name="`$input + 'encoding'`" value="encode-json"/>\r
+                                                <parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\r
+                                                <parameter name="`$input + 'encoding'`" value="encode-json" />\r
                                             </set>\r
-                                            <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription">\r
-                                                <parameter name="subscriberId" value="sotn-controller"/>\r
-                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`"/>\r
-                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
-                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
-                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`"/>\r
-                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification"/>\r
-                                                <parameter name="format" value="json"/>\r
-                                                <parameter name="httpMethod" value="post"/>\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\r
+                                                <parameter name="subscriberId" value="sotn-controller" />\r
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />\r
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />\r
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />\r
+                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`" />\r
+                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />\r
+                                                <parameter name="format" value="json" />\r
+                                                <parameter name="httpMethod" value="post" />\r
                                                 <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.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
-                                                <parameter name="module" value="DataChange"/>\r
-                                                <parameter name="rpc" value="sotn-notification-handler"/>\r
-                                                <parameter name="mode" value="sync"/>\r
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />\r
+                                                <parameter name="module" value="DataChange" />\r
+                                                <parameter name="rpc" value="sotn-notification-handler" />\r
+                                                <parameter name="mode" value="sync" />\r
                                             </execute>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value="TAPI">\r
+                                    <outcome value='TAPI'>\r
                                         <block atomic="true">\r
-                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`"/>\r
                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
@@ -204,21 +206,21 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\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 get topology TAPI rest api"/>\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 get topology TAPI rest api" />\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value="success">\r
+                                                <outcome value='success'>\r
                                                     <block atomic="true">\r
-                                                        <for index="tidx" start="0" end="`$topologies.topology_length`">\r
+                                                        <for index='tidx' start='0' end="`$topologies.topology_length`" >\r
                                                             <block>\r
                                                                 <set>\r
-                                                                    <parameter name="topology." value="`$topologies.topology[$tidx].`"/>\r
+                                                                    <parameter name='topology.' value='`$topologies.topology[$tidx].`' />\r
                                                                 </set>\r
-                                                                <call module="DataChange" rpc="tapi-update-network-to-aai" mode="sync"/>\r
+                                                                <call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' ></call>\r
                                                             </block>\r
                                                         </for>\r
                                                     </block>\r
@@ -226,9 +228,9 @@
                                             </execute>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value="MSA">\r
+                                    <outcome value='MSA'>\r
                                         <block atomic="true">\r
-                                            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\r
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r
                                                 <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`"/>\r
                                                 <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>\r
                                                 <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>\r
@@ -239,91 +241,103 @@
                                                 <parameter name="trustStorePassword" value="adminadmin"/>\r
                                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>\r
                                                 <parameter name="keyStorePassword" value="adminadmin"/>\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 get topology MSA rest api"/>\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 get topology MSA rest api" />\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value="success">\r
+                                                <outcome value='success'>\r
                                                     <block atomic="true">\r
-                                                        <call module="DataChange" rpc="msa-update-network-to-aai" mode="sync"/>\r
+                                                        <call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' ></call>\r
                                                     </block>\r
                                                 </outcome>\r
                                             </execute>\r
                                         </block>\r
                                     </outcome>\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="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>\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="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
                                         </return>\r
                                     </outcome>\r
                                 </switch>\r
                             </block>\r
                         </outcome>\r
-                        <outcome value="Delete">\r
+                        <outcome value='Delete'>\r
                             <block atomic="true">\r
                                 <switch test="`$prop.sdncRestApi.type`">\r
-                                    <outcome value="MSA">\r
-                                        <block atomic="true">\r
+                                    <outcome value='MSA'>\r
+                                        <block atomic='true'>\r
                                             <set>\r
-                                                <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>\r
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
                                             </set>\r
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT controller_id from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid" pfx="dbcontrollerid">\r
-                                                <outcome value="success">\r
-                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>\r
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+                                                          key='SELECT controller_id\r
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
+WHERE controller_id = $controllerid'\r
+                                                          pfx='dbcontrollerid'>\r
+                                                <outcome value='success'>\r
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
+                                                            resource="SQL"\r
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\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="Failure in getting controller-id from DB"/>\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="Failure in getting controller-id from DB" />\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value="not-found">\r
-                                                    <return status="failure">\r
-                                                        <parameter name="ack-final" value="Y"/>\r
-                                                        <parameter name="error-code" value="500"/>\r
-                                                        <parameter name="error-message" value="controller-id could not be found in DB"/>\r
+                                                <outcome value='not-found'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
                                         </block>\r
                                     </outcome>\r
-                                    <outcome value="TAPI">\r
+                                    <outcome value='TAPI'>\r
                                         <block>\r
                                             <set>\r
-                                                <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>\r
+                                                <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />\r
                                             </set>\r
-                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="SELECT controller_id from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid" pfx="dbcontrollerid">\r
-                                                <outcome value="success">\r
-                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>\r
+                                            <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\r
+                                                          key='SELECT controller_id\r
+from TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE\r
+WHERE controller_id = $controllerid'\r
+                                                          pfx='dbcontrollerid'>\r
+                                                <outcome value='success'>\r
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'\r
+                                                            resource="SQL"\r
+                                                            key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>\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="Failure in getting controller-id from DB"/>\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="Failure in getting controller-id from DB" />\r
                                                     </return>\r
                                                 </outcome>\r
-                                                <outcome value="not-found">\r
-                                                    <return status="failure">\r
-                                                        <parameter name="ack-final" value="Y"/>\r
-                                                        <parameter name="error-code" value="500"/>\r
-                                                        <parameter name="error-message" value="controller-id could not be found in DB"/>\r
+                                                <outcome value='not-found'>\r
+                                                    <return status='failure'>\r
+                                                        <parameter name='ack-final' value='Y'/>\r
+                                                        <parameter name="error-code" value="500" />\r
+                                                        <parameter name="error-message" value="controller-id could not be found in DB" />\r
                                                     </return>\r
                                                 </outcome>\r
                                             </get-resource>\r
                                         </block>\r
                                     </outcome>\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="`'Unsupported type = ' + $prop.sdncRestApi.type`"/>\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="`'Unsupported type = ' + $prop.sdncRestApi.type`" />\r
                                         </return>\r
                                     </outcome>\r
                                 </switch>\r
@@ -331,8 +345,8 @@
                         </outcome>\r
                     </switch>\r
                 </outcome>\r
-                <outcome value="true">\r
-                    <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"/>\r
+                <outcome value='true'>\r
+                    <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' ></call>\r
                 </outcome>\r
             </switch>\r
         </block>\r
SDNC OA&M tools