X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fxml%2FDataChange_esr-thirdparty-sdnc-discovery.xml;h=a80f8710650d2b7a2bc41bfefcc0d16df4fad296;hb=58acc1cd194f7d61b22f875bccc6738e6dfb0b7c;hp=e11dadddfc2fafb13319bdb90f0e376866f01874;hpb=76c5155fb4262a1aa2872c7e34e29ed2bcefac5c;p=sdnc%2Foam.git

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 e11daddd..a80f8710 100644
--- 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,149 +1,390 @@
-<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="DataChange" version="${project.version}">
-  <method rpc="esr-thirdparty-sdnc-discovery" mode="sync"> 
-    <block atomic="true"> 
-      <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`"> 
-        <outcome value="false"> 
-          <switch test="`$data-change-notification-input.aai-event-trigger`"> 
-            <outcome value="Update"> 
-              <block> 
-                <switch test="`$prop.sdncRestApi.type`"> 
-                  <outcome value="SOTN"> 
-                    <block atomic="true">
-                      <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties"> 
-                        <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties"/>  
-                        <parameter name="contextPrefix" value="prop"/> 
-                      </execute>
-                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`"/>  
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`"/>  
-                        <parameter name="format" value="json"/>  
-                        <parameter name="httpMethod" value="post"/>  
-                        <parameter name="responsePrefix" value="token-result"/>  
-                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
-                        <parameter name="trustStorePassword" value="adminadmin"/>  
-                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
-                        <parameter name="keyStorePassword" value="adminadmin"/>
-                        <outcome value="success"> 
-                          <set> 
-                            <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/> 
-                          </set>
+<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='DataChange' version='${project.version}'>
+    <method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>
+        <block atomic="true">
+            <switch test="`$prop.sdncRestApi.vendor == 'ZTE'`">
+                <outcome value='false'>
+                    <switch test="`$data-change-notification-input.aai-event-trigger`">
+                        <outcome value='Update'>
+                            <block>
+                                <switch test="`$prop.sdncRestApi.type`">
+                                    <outcome value='SOTN'>
+                                        <block atomic="true">
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                                                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                                                <parameter name='contextPrefix' value='prop' />
+                                            </execute>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />
+                                                <parameter name="format" value="json"/>
+                                                <parameter name="httpMethod" value="post"/>
+                                                <parameter name="responsePrefix" value="token-result"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <outcome value='success'>
+                                                    <set>
+                                                        <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
+                                                    </set>
+                                                </outcome>
+                                                <outcome value='failure'>
+                                                    <block></block>
+                                                </outcome>
+                                            </execute>
+                                            <switch test="`$prop.sdncRestApi.token_id`">
+                                                <outcome value=''>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
+                                                        <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="get"/>
+                                                        <parameter name="responsePrefix" value="topology"/>
+                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <for index='nidx' start='0' end='`$topology.networks.network_length`' >
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
+                                                                        </set>
+                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
+                                                                    </block>
+                                                                </for>
+                                                                <switch test='`$topology.networks.network_length`'>
+                                                                    <outcome value='2'>
+                                                                        <switch test='`$topology.networks.network[0].network-types`'>
+                                                                            <outcome value='ethernet-topology'>
+                                                                                <switch test='`$topology.networks.network[1].network-types`'>
+                                                                                    <outcome value='otn-topology'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
+                                                                                            </set>
+                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </outcome>
+                                                                            <outcome value='otn-topology'>
+                                                                                <switch test='`$topology.networks.network[1].network-types`'>
+                                                                                    <outcome value='ethernet-topology'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
+                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
+                                                                                            </set>
+                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="network-resources"
+                                                                              pfx='tmp.aai.network-resources' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <switch test='tmp.aai.network-resources_length'>
+                                                                            <outcome value='4'>
+                                                                                <block atomic='true'>
+                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='otnidx' value='0' />
+                                                                                            </set>
+                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
+                                                                                                <outcome value='otn-topology'>
+                                                                                                    <block>
+                                                                                                        <set>
+                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
+                                                                                                        </set>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </block>
+                                                                                    </for>
+                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </outcome>
+                                                                    <outcome value='not-found'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
+                                                                        </return>
+                                                                    </outcome>
+                                                                    <outcome value='Other'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                </outcome>
+                                                <outcome value='Other'>
+                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />
+                                                        <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="get"/>
+                                                        <parameter name="responsePrefix" value="topology"/>
+                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                        <outcome value='failure'>
+                                                            <return status='failure'>
+                                                                <parameter name='ack-final' value='Y'/>
+                                                                <parameter name="error-code" value="500" />
+                                                                <parameter name="error-message" value="Error executing Create vpn rest api" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value='success'>
+                                                            <block atomic="true">
+                                                                <for index='nidx' start='0' end='`$topology.networks.network_length`' >
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
+                                                                        </set>
+                                                                        <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
+                                                                    </block>
+                                                                </for>
+                                                                <switch test='`$topology.networks.network_length`'>
+                                                                    <outcome value='2'>
+                                                                        <switch test='`$topology.networks.network[0].network-types`'>
+                                                                            <outcome value='ethernet-topology'>
+                                                                                <switch test='`$topology.networks.network[1].network-types`'>
+                                                                                    <outcome value='otn-topology'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='network-eth.' value='`$topology.networks.network[0].`' />
+                                                                                                <parameter name='network-otn.' value='`$topology.networks.network[1].`' />
+                                                                                            </set>
+                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </outcome>
+                                                                            <outcome value='otn-topology'>
+                                                                                <switch test='`$topology.networks.network[1].network-types`'>
+                                                                                    <outcome value='ethernet-topology'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='network.eth' value='`$topology.networks.network[1].`' />
+                                                                                                <parameter name='network.otn' value='`$topology.networks.network[0].`' />
+                                                                                            </set>
+                                                                                            <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="network-resources"
+                                                                              pfx='tmp.aai.network-resources' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <switch test='tmp.aai.network-resources_length'>
+                                                                            <outcome value='4'>
+                                                                                <block atomic='true'>
+                                                                                    <for index='nridx' start='0' end='`$tmp.aai.network-resources.network-resource_length`' >
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='otnidx' value='0' />
+                                                                                            </set>
+                                                                                            <switch test='`$tmp.aai.network-resources.network-resource[$nridx].network-type`'>
+                                                                                                <outcome value='otn-topology'>
+                                                                                                    <block>
+                                                                                                        <set>
+                                                                                                            <parameter name='network-resource-otn[$otnidx].' value='`$tmp.aai.network-resources.network-resource[$nridx].`' />
+                                                                                                        </set>
+                                                                                                        <set>
+                                                                                                            <parameter name='otnidx' value='`$otnidx + 1`' />
+                                                                                                        </set>
+                                                                                                    </block>
+                                                                                                </outcome>
+                                                                                            </switch>
+                                                                                        </block>
+                                                                                    </for>
+                                                                                    <call module='DataChange' rpc='update-open-ended-links' mode='sync' ></call>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                    </outcome>
+                                                                    <outcome value='not-found'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
+                                                                        </return>
+                                                                    </outcome>
+                                                                    <outcome value='Other'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value='' />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
+                                                </outcome>
+                                            </switch>
+                                            <set>
+                                                <parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />
+                                                <parameter name="`$input + 'encoding'`" value="encode-json" />
+                                            </set>
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >
+                                                <parameter name="subscriberId" value="sotn-controller" />
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`" />
+                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                <parameter name="format" value="json" />
+                                                <parameter name="httpMethod" value="post" />
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                <parameter name="module" value="DataChange" />
+                                                <parameter name="rpc" value="sotn-notification-handler" />
+                                                <parameter name="mode" value="sync" />
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='TAPI'>
+                                        <block atomic="true">
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/tapi/v2/topologies?topology-id-or-name=otn'`"/>
+                                                <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="get"/>
+                                                <parameter name="responsePrefix" value="topologies"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.tapi.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing get topology TAPI rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true">
+                                                        <for index='tidx' start='0' end="`$topologies.topology_length`" >
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='topology.' value='`$topologies.topology[$tidx].`' />
+                                                                </set>
+                                                                <call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' ></call>
+                                                            </block>
+                                                        </for>
+                                                    </block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='MSA'>
+                                        <block atomic="true">
+                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/otn-topology'`"/>
+                                                <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="get"/>
+                                                <parameter name="responsePrefix" value="networks"/>
+                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks"/>
+                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                <outcome value='failure'>
+                                                    <return status='failure'>
+                                                        <parameter name='ack-final' value='Y'/>
+                                                        <parameter name="error-code" value="500" />
+                                                        <parameter name="error-message" value="Error executing get topology MSA rest api" />
+                                                    </return>
+                                                </outcome>
+                                                <outcome value='success'>
+                                                    <block atomic="true">
+                                                        <call module='DataChange' rpc='msa-update-network-to-aai' mode='sync' ></call>
+                                                    </block>
+                                                </outcome>
+                                            </execute>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`" />
+                                        </return>
+                                    </outcome>
+                                </switch>
+                            </block>
                         </outcome>
-                        <outcome value="failure"> 
-                          <block></block>
+                        <outcome value='delete'>
+                            <block atomic="true"></block>
                         </outcome>
-                      </execute>
-                      <switch test="`$prop.sdncRestApi.token_id`"> 
-                        <outcome value=""> 
-                          <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>  
-                            <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="get"/>  
-                            <parameter name="responsePrefix" value="topology"/>  
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
-                            <parameter name="trustStorePassword" value="adminadmin"/>  
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
-                            <parameter name="keyStorePassword" value="adminadmin"/>  
-                            <outcome value="failure"> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="Error executing Create vpn rest api"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="success"> 
-                              <block atomic="true">
-                                <for index="nidx" start="0" end="`$topology.networks.network_length`"> 
-                                  <block> 
-                                    <set> 
-                                      <parameter name="network." value="`$topology.networks.network[$nidx].`"/> 
-                                    </set>
-                                    <call module="DataChange" rpc="update-network-to-aai" mode="sync"></call>
-                                  </block>
-                                </for>
-                              </block>
-                            </outcome>
-                          </execute>
-                        </outcome>
-                        <outcome value="Other"> 
-                          <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest"> 
-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`"/>  
-                            <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="get"/>  
-                            <parameter name="responsePrefix" value="topology"/>  
-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
-                            <parameter name="trustStorePassword" value="adminadmin"/>  
-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
-                            <parameter name="keyStorePassword" value="adminadmin"/>  
-                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>
-                            <outcome value="failure"> 
-                              <return status="failure"> 
-                                <parameter name="ack-final" value="Y"/>  
-                                <parameter name="error-code" value="500"/>  
-                                <parameter name="error-message" value="Error executing Create vpn rest api"/> 
-                              </return>
-                            </outcome>
-                            <outcome value="success"> 
-                              <block atomic="true">
-                                <for index="nidx" start="0" end="`$topology.networks.network_length`"> 
-                                  <block> 
-                                    <set> 
-                                      <parameter name="network." value="`$topology.networks.network[$nidx].`"/> 
-                                    </set>
-                                    <call module="DataChange" rpc="update-network-to-aai" mode="sync"></call>
-                                  </block>
-                                </for>
-                              </block>
-                            </outcome>
-                          </execute>
-                        </outcome>
-                      </switch>
-                      <set> 
-                        <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>  
-                        <parameter name="`$input + 'encoding'`" value="encode-json"/>
-                      </set>
-                      <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription"> 
-                        <parameter name="subscriberId" value="sotn-controller"/>  
-                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`"/>  
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`"/>  
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`"/>  
-                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`"/>  
-                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification"/>  
-                        <parameter name="format" value="json"/>  
-                        <parameter name="httpMethod" value="post"/>  
-                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>  
-                        <parameter name="trustStorePassword" value="adminadmin"/>  
-                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>  
-                        <parameter name="keyStorePassword" value="adminadmin"/>  
-                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`"/>  
-                        <parameter name="module" value="DataChange"/>  
-                        <parameter name="rpc" value="sotn-notification-handler"/>  
-                        <parameter name="mode" value="sync"/>
-                      </execute>
-                    </block>
-                  </outcome>
-                  <outcome value="Other"> 
-                    <return status="failure"> 
-                      <parameter name="ack-final" value="Y"/>  
-                      <parameter name="error-code" value="500"/>  
-                      <parameter name="error-message" value="`'Unsupported type = ' + $prop.sdncRestApi.type`"/> 
-                    </return>
-                  </outcome>
-                </switch>
-              </block>
-            </outcome>
-            <outcome value="delete"> 
-              <block atomic="true"/>
-            </outcome>
-          </switch>
-        </outcome>
-        <outcome value="true"> 
-          <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"></call>
-        </outcome>
-      </switch>
-    </block>
-  </method>
+                    </switch>
+                </outcome>
+                <outcome value='true'>
+                    <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' ></call>
+                </outcome>
+            </switch>
+        </block>
+    </method>
 </service-logic>
\ No newline at end of file