diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-10-30 08:58:07 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2020-10-30 08:58:07 -0400 |
| commit | dc1e8fb7c47e339eb78f77f68ed2e885c26d44ba (patch) | |
| tree | 0ff35b845cb3ffbebf1ee5cb47465e3ae197e8c8 /platform-logic/datachange/src/main | |
| parent | 67dffb876a7cf68fe2d82c3b961087fd266e6c51 (diff) | |
Fixed syntax errors in DGs
A few directed graphs were failing to load on startup due to
syntax errors. Most of the errors had to do with a corrupted
first line (missing xsi namespace declaration). One dg had
a misplaced backtick.
Change-Id: I4d0fae3f70ee7025f78f91986d695bba6e6d6dfb
Issue-ID: SDNC-1403
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: e4338c03378d0e4ea9c580603768056c27d0679d
Diffstat (limited to 'platform-logic/datachange/src/main')
3 files changed, 396 insertions, 366 deletions
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 007f3bf5..057f6313 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,21 +1,23 @@ -<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
- <method rpc="esr-thirdparty-sdnc-discovery" mode="sync">
+<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">
+ <outcome value='false'>
<switch test="`$data-change-notification-input.aai-event-trigger`">
- <outcome value="Update">
+ <outcome value='Update'>
<block>
<switch test="`$prop.sdncRestApi.type`">
- <outcome value="SOTN">
+ <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 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'`"/>
+ <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"/>
@@ -23,21 +25,21 @@ <parameter name="trustStorePassword" value="adminadmin"/>
<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
<parameter name="keyStorePassword" value="adminadmin"/>
- <outcome value="success">
+ <outcome value='success'>
<set>
- <parameter name="prop.sdncRestApi.token_id" value="`$token-result.data.token_id`"/>
+ <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
</set>
</outcome>
- <outcome value="failure">
- <block/>
+ <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`"/>
+ <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"/>
@@ -45,53 +47,53 @@ <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"/>
+ <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">
+ <outcome value='success'>
<block atomic="true">
- <for index="nidx" start="0" end="`$topology.networks.network_length`">
+ <for index='nidx' start='0' end='`$topology.networks.network_length`' >
<block>
<set>
- <parameter name="network." value="`$topology.networks.network[$nidx].`"/>
+ <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
</set>
- <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>
+ <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
</block>
</for>
- <switch test="`$topology.networks.network_length >= 2`">
- <outcome value="true">
- <block atomic="true">
- <for index="netidx" start="0" end="`$topology.networks.network_length`">
+ <switch test='`$topology.networks.network_length >= 2`'>
+ <outcome value='true'>
+ <block atomic='true'>
+ <for index='netidx' start='0' end='`$topology.networks.network_length`' >
<block>
<set>
- <parameter name="network." value=""/>
+ <parameter name='network.' value='' />
</set>
<set>
- <parameter name="network." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
</set>
- <switch test="`$network.te-topology-id`">
- <outcome value="11">
+ <switch test='`$network.te-topology-id`'>
+ <outcome value='11'>
<block>
<set>
- <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
</set>
</block>
</outcome>
- <outcome value="33">
+ <outcome value='33'>
<block>
<set>
- <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
</set>
</block>
</outcome>
</switch>
</block>
</for>
- <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>
+ <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
</block>
</outcome>
</switch>
@@ -99,11 +101,11 @@ </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`"/>
+ <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"/>
@@ -111,54 +113,54 @@ <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"/>
+ <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">
+ <outcome value='success'>
<block atomic="true">
- <for index="nidx" start="0" end="`$topology.networks.network_length`">
+ <for index='nidx' start='0' end='`$topology.networks.network_length`' >
<block>
<set>
- <parameter name="network." value="`$topology.networks.network[$nidx].`"/>
+ <parameter name='network.' value='`$topology.networks.network[$nidx].`' />
</set>
- <call module="DataChange" rpc="update-network-to-aai" mode="sync"/>
+ <call module='DataChange' rpc='update-network-to-aai' mode='sync' ></call>
</block>
</for>
- <switch test="`$topology.networks.network_length >= 2`">
- <outcome value="true">
- <block atomic="true">
- <for index="netidx" start="0" end="`$topology.networks.network_length`">
+ <switch test='`$topology.networks.network_length >= 2`'>
+ <outcome value='true'>
+ <block atomic='true'>
+ <for index='netidx' start='0' end='`$topology.networks.network_length`' >
<block>
<set>
- <parameter name="network." value=""/>
+ <parameter name='network.' value='' />
</set>
<set>
- <parameter name="network." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network.' value='`$topology.networks.network[$netidx].`' />
</set>
- <switch test="`$network.te-topology-id`">
- <outcome value="11">
+ <switch test='`$network.te-topology-id`'>
+ <outcome value='11'>
<block>
<set>
- <parameter name="network-otn." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
</set>
</block>
</outcome>
- <outcome value="33">
+ <outcome value='33'>
<block>
<set>
- <parameter name="network-eth." value="`$topology.networks.network[$netidx].`"/>
+ <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
</set>
</block>
</outcome>
</switch>
</block>
</for>
- <call module="DataChange" rpc="update-tp-ttp-relationship" mode="sync"/>
+ <call module='DataChange' rpc='update-tp-ttp-relationship' mode='sync' ></call>
</block>
</outcome>
</switch>
@@ -168,32 +170,32 @@ </outcome>
</switch>
<set>
- <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>
- <parameter name="`$input + 'encoding'`" value="encode-json"/>
+ <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"/>
+ <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"/>
+ <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">
+ <outcome value='TAPI'>
<block atomic="true">
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <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`"/>
@@ -204,21 +206,21 @@ <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"/>
+ <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">
+ <outcome value='success'>
<block atomic="true">
- <for index="tidx" start="0" end="`$topologies.topology_length`">
+ <for index='tidx' start='0' end="`$topologies.topology_length`" >
<block>
<set>
- <parameter name="topology." value="`$topologies.topology[$tidx].`"/>
+ <parameter name='topology.' value='`$topologies.topology[$tidx].`' />
</set>
- <call module="DataChange" rpc="tapi-update-network-to-aai" mode="sync"/>
+ <call module='DataChange' rpc='tapi-update-network-to-aai' mode='sync' ></call>
</block>
</for>
</block>
@@ -226,9 +228,9 @@ </execute>
</block>
</outcome>
- <outcome value="MSA">
+ <outcome value='MSA'>
<block atomic="true">
- <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+ <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`"/>
@@ -239,91 +241,103 @@ <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"/>
+ <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">
+ <outcome value='success'>
<block atomic="true">
- <call module="DataChange" rpc="msa-update-network-to-aai" mode="sync"/>
+ <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`"/>
+ <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">
+ <outcome value='Delete'>
<block atomic="true">
<switch test="`$prop.sdncRestApi.type`">
- <outcome value="MSA">
- <block atomic="true">
+ <outcome value='MSA'>
+ <block atomic='true'>
<set>
- <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
+ <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
</set>
- <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">
- <outcome value="success">
- <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>
+ <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'>
+ <outcome value='success'>
+ <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+ resource="SQL"
+ key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Failure in getting controller-id from DB"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Failure in getting controller-id from DB" />
</return>
</outcome>
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="controller-id could not be found in DB"/>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="controller-id could not be found in DB" />
</return>
</outcome>
</get-resource>
</block>
</outcome>
- <outcome value="TAPI">
+ <outcome value='TAPI'>
<block>
<set>
- <parameter name="controllerid" value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
+ <parameter name='controllerid' value="`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url + '_' + $prop.sdncRestApi.thirdpartySdnc.id`" />
</set>
- <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">
- <outcome value="success">
- <delete plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"/>
+ <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'>
+ <outcome value='success'>
+ <delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
+ resource="SQL"
+ key="DELETE FROM TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE WHERE controller_id = $controllerid"></delete>
</outcome>
- <outcome value="failure">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="Failure in getting controller-id from DB"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Failure in getting controller-id from DB" />
</return>
</outcome>
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="controller-id could not be found in DB"/>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="controller-id could not be found in DB" />
</return>
</outcome>
</get-resource>
</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`"/>
+ <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>
@@ -331,8 +345,8 @@ </outcome>
</switch>
</outcome>
- <outcome value="true">
- <call module="DataChange" rpc="esr-thirdparty-sdnc-of-zte" mode="sync"/>
+ <outcome value='true'>
+ <call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' ></call>
</outcome>
</switch>
</block>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml index afe1fc0e..4b3906ee 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml @@ -1,247 +1,260 @@ -<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
- <method rpc="update-network-to-aai" mode="sync">
+<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='update-network-to-aai' mode='sync'>
<block atomic="true">
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$network.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
<set>
- <parameter name="tmp.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`"/>
+ <parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
- <parameter name="network-id" value="`$tmp.network-id`"/>
- <parameter name="client-id" value="`$network.client-id`"/>
- <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
- <parameter name="provider-id" value="`$network.provider-id`"/>
- <parameter name="network-type" value="`$network.network-types`"/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'
+ key='network-resource.network-id = $tmp.network-id' >
+ <parameter name='network-id' value='`$tmp.network-id`' />
+ <parameter name='client-id' value='`$network.client-id`' />
+ <parameter name='te-topo-id' value='`$network.te-topology-id`' />
+ <parameter name='provider-id' value='`$network.provider-id`' />
+ <parameter name='network-type' value='`$network.network-types`' />
</save>
- <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
- <outcome value="success">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="esr-thirdparty-sdnc"
+ key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id AND
+ depth = '1'"
+ pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >
+ <outcome value='success'>
<block>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource:relationship-list" key="network-resource.network-id = $tmp.network-id" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc"/>
- <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`"/>
- <!--
- /aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2
- -->
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource:relationship-list'
+ key='network-resource.network-id = $tmp.network-id'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="esr-thirdparty-sdnc" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/' + $prop.sdncRestApi.thirdpartySdnc.id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="esr-thirdparty-sdnc.thirdparty-sdnc-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sdncRestApi.thirdpartySdnc.id`" />
+ <!--/aai/v19/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/SOTNControllerDomain2-->
</save>
</block>
</outcome>
- <outcome value="not-found">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
</return>
</outcome>
- <outcome value="Other">
- <return status="failure">
- <parameter name="ack-final" value="Y"/>
- <parameter name="error-code" value="500"/>
- <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`"/>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`" />
</return>
</outcome>
</get-resource>
- <for index="pidx" start="0" end="`$network.node_length`">
+ <for index='pidx' start='0' end='`$network.node_length`' >
<set>
- <parameter name="node." value=""/>
+ <parameter name='node.' value='' />
</set>
<set>
- <parameter name="node." value="`$network.node[$pidx].`"/>
- <parameter name="unique-networkId" value="`$tmp.network-id`"/>
+ <parameter name='node.' value='`$network.node[$pidx].`' />
+ <parameter name='unique-networkId' value='`$tmp.network-id`' />
</set>
<set>
- <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
+ <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
- <parameter name="pnf-name" value="`$unique-nodeId`"/>
- <parameter name="pnf-id" value="`$node.node-id`"/>
- <parameter name="operational-status" value="`$node.te.oper-status`"/>
- <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
- <parameter name="in-maint" value="true"/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
+ key='pnf.pnf-name = $unique-nodeId' >
+ <parameter name='pnf-name' value='`$unique-nodeId`' />
+ <parameter name='pnf-id' value='`$node.node-id`' />
+ <parameter name='operational-status' value='`$node.te.oper-status`' />
+ <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
+ <parameter name='in-maint' value='true' />
</save>
- <switch test="`$node.termination-point_length`">
- <outcome value="">
- <block/>
+ <switch test='`$node.termination-point_length`'>
+ <outcome value=''>
+ <block></block>
</outcome>
- <outcome value="0">
- <block/>
+ <outcome value='0'>
+ <block></block>
</outcome>
- <outcome value="Other">
- <for index="tidx" start="0" end="`$node.termination-point_length`">
+ <outcome value='Other'>
+ <for index='tidx' start='0' end='`$node.termination-point_length`' >
<set>
- <parameter name="tp." value=""/>
+ <parameter name='tp.' value='' />
</set>
<set>
- <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
+ <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
</set>
<set>
- <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
+ <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
</set>
- <switch test="`length($tp.te.inter-domain-plug-id) == 0`">
- <outcome value="true">
+ <switch test='`length($tp.te.inter-domain-plug-id) == 0`'>
+ <outcome value='true'>
<set>
- <parameter name="tmp.decoded-plug-id" value=""/>
+ <parameter name='tmp.decoded-plug-id' value='' />
</set>
</outcome>
- <outcome value="false">
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="base64DecodingAlgo">
- <parameter name="encodedValue" value="`$tp.te.inter-domain-plug-id`"/>
+ <outcome value='false'>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='base64DecodingAlgo' >
+ <parameter name="encodedValue" value='`$tp.te.inter-domain-plug-id`'/>
<parameter name="decodedValue" value="tmp.decoded-plug-id"/>
- <outcome value="success">
- <block/>
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value="failure">
+ <outcome value='failure'>
<set>
- <parameter name="tmp.decoded-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+ <parameter name='tmp.decoded-plug-id' value='`$tp.te.inter-domain-plug-id`' />
</set>
</outcome>
</execute>
</outcome>
</switch>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
- <parameter name="interface-name" value="`$unique-ltpId`"/>
- <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
- <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
- <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
- <parameter name="operational-status" value="`$tp.te.oper-status`"/>
- <parameter name="in-maint" value="true"/>
- <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
- <!--
- <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
- -->
- <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
- <outcome value="success">
- <block/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $unique-nodeId
+ AND p-interface.interface-name = $unique-ltpId' >
+ <parameter name='interface-name' value='`$unique-ltpId`' />
+ <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+ <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+ <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+ <parameter name='operational-status' value='`$tp.te.oper-status`' />
+ <parameter name='in-maint' value="true" />
+ <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
+ <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
+ <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value="failure">
- <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
- <parameter name="interface-name" value="`$unique-ltpId`"/>
- <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
- <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
- <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
- <parameter name="operational-status" value="`$tp.te.oper-status`"/>
- <parameter name="in-maint" value="true"/>
- <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
- <!--
- <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
- -->
- <parameter name="inter-domain-plug-id" value="`$tmp.decoded-plug-id`"/>
+ <outcome value='failure'>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
+ key='pnf.pnf-name = $unique-nodeId
+ AND p-interface.interface-name = $unique-ltpId' >
+ <parameter name='interface-name' value='`$unique-ltpId`' />
+ <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
+ <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
+ <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
+ <parameter name='operational-status' value='`$tp.te.oper-status`' />
+ <parameter name='in-maint' value="true" />
+ <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
+ <!--<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />-->
+ <parameter name='inter-domain-plug-id' value='`$tmp.decoded-plug-id`' />
</update>
</outcome>
</save>
</for>
</outcome>
</switch>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
+ key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
</save>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list'
+ key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
</save>
- <switch test="`$node.te.tunnel-termination-point_length`">
- <outcome value="">
- <block/>
+ <switch test='`$node.te.tunnel-termination-point_length`'>
+ <outcome value=''>
+ <block></block>
</outcome>
- <outcome value="0">
- <block/>
+ <outcome value='0'>
+ <block></block>
</outcome>
- <outcome value="Other">
- <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
+ <outcome value='Other'>
+ <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
<set>
- <parameter name="ttp." value=""/>
+ <parameter name='ttp.' value='' />
</set>
<set>
- <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
+ <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
</set>
<set>
- <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+ <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
- <parameter name="ttp-id" value="`$unique-ttpId`"/>
- <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
- <parameter name="name" value="`$ttp.name`"/>
- <parameter name="admin-status" value="`$ttp.admin-status`"/>
- <parameter name="oper-status" value="`$ttp.oper-status`"/>
- <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
- <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
- <parameter name="protection-type" value="`$ttp.protection-type`"/>
- <parameter name="encoding" value="`$ttp.encoding`"/>
- <outcome value="success">
- <block/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
+ key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+ <parameter name='ttp-id' value='`$unique-ttpId`' />
+ <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
+ <parameter name='name' value='`$ttp.name`' />
+ <parameter name='admin-status' value='`$ttp.admin-status`' />
+ <parameter name='oper-status' value='`$ttp.oper-status`' />
+ <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />
+ <parameter name='switching-capability' value='`$ttp.switching-capability`' />
+ <parameter name='protection-type' value='`$ttp.protection-type`' />
+ <parameter name='encoding' value='`$ttp.encoding`' />
+ <outcome value='success'>
+ <block></block>
</outcome>
- <outcome value="failure">
- <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="tunnel-termination-point.ttp-id = $unique-ttpId">
- <parameter name="ttp-id" value="`$unique-ttpId`"/>
- <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
- <parameter name="name" value="`$ttp.name`"/>
- <parameter name="admin-status" value="`$ttp.admin-status`"/>
- <parameter name="oper-status" value="`$ttp.oper-status`"/>
- <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id[0]`"/>
- <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
- <parameter name="protection-type" value="`$ttp.protection-type`"/>
- <parameter name="encoding" value="`$ttp.encoding`"/>
+ <outcome value='failure'>
+ <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
+ key='tunnel-termination-point.ttp-id = $unique-ttpId' >
+ <parameter name='ttp-id' value='`$unique-ttpId`' />
+ <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
+ <parameter name='name' value='`$ttp.name`' />
+ <parameter name='admin-status' value='`$ttp.admin-status`' />
+ <parameter name='oper-status' value='`$ttp.oper-status`' />
+ <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id[0]`' />
+ <parameter name='switching-capability' value='`$ttp.switching-capability`' />
+ <parameter name='protection-type' value='`$ttp.protection-type`' />
+ <parameter name='encoding' value='`$ttp.encoding`' />
</update>
</outcome>
</save>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
- <!--
- <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
- -->
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
- <outcome value="success">
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
+ key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
+ <!--<parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />-->
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
+ <outcome value='success'>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="sucess executing Hesam log file"/>
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
- <parameter name="field4" value="`$node.termination-point_length`"/>
- <parameter name="field5" value="sucessfully saved ttp"/>
- <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+ <parameter name="field1" value="__TIMESTAMP__" />
+ <parameter name="field2" value="sucess executing Hesam log file" />
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+ <parameter name="field4" value="`$node.termination-point_length`" />
+ <parameter name="field5" value="sucessfully saved ttp" />
+ <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
</record>
</outcome>
- <outcome value="failure">
+ <outcome value='failure'>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="sucess executing Hesam log file"/>
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
- <parameter name="field4" value="`$node.termination-point_length`"/>
- <parameter name="field5" value="failuire on saving ttp"/>
- <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`"/>
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+ <parameter name="field1" value="__TIMESTAMP__" />
+ <parameter name="field2" value="sucess executing Hesam log file" />
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+ <parameter name="field4" value="`$node.termination-point_length`" />
+ <parameter name="field5" value="failuire on saving ttp" />
+ <parameter name="field6" value="`relationship-list.relationship[$ttidx].related-link`" />
</record>
</outcome>
</save>
- <switch test="`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`">
- <outcome value="">
- <block/>
+ <switch test='`$node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity_length`'>
+ <outcome value=''>
+ <block></block>
</outcome>
- <outcome value="0">
- <block/>
+ <outcome value='0'>
+ <block></block>
</outcome>
- <outcome value="Other">
+ <outcome value='Other'>
<block>
<set>
- <parameter name="unique-ltpId-second" value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`"/>
+ <parameter name='unique-ltpId-second' value="`$unique-nodeId + '-ltpId-' + $node.te.tunnel-termination-point[$ttidx].local-link-connectivities.local-link-connectivity[0].link-tp-ref`" />
</set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point:relationship-list" key="tunnel-termination-point.ttp-id = $unique-ttpId" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`"/>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point:relationship-list'
+ key='tunnel-termination-point.ttp-id = $unique-ttpId' force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId + '/p-interfaces/p-interface/' + $unique-ltpId-second`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId-second`" />
</save>
</block>
</outcome>
@@ -250,14 +263,14 @@ </outcome>
</switch>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
- <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt"/>
- <parameter name="field1" value="__TIMESTAMP__"/>
- <parameter name="field2" value="sucess executing Hesam log file"/>
- <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
- <parameter name="field4" value="`$node.termination-point_length`"/>
+ <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
+ <parameter name="field1" value="__TIMESTAMP__" />
+ <parameter name="field2" value="sucess executing Hesam log file" />
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`" />
+ <parameter name="field4" value="`$node.termination-point_length`" />
</record>
</for>
- <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
+ <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
</block>
</method>
</service-logic>
\ No newline at end of file diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml index 4ce33625..30eddfd8 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml @@ -1,96 +1,99 @@ -<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
- <method rpc="update-tp-ttp-relationship" mode="sync">
+<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='update-tp-ttp-relationship' mode='sync'>
<block atomic="true">
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$network-eth.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-eth.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
- <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$network-otn.network-id`"/>
<parameter name="outputPath" value="tmp.original-network-otn.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
<set>
- <parameter name="tmp.network-eth.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`"/>
- <parameter name="tmp.network-otn.network-id" value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`"/>
+ <parameter name='tmp.network-eth.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-eth.network-id`" />
+ <parameter name='tmp.network-otn.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-otn.network-id`" />
</set>
- <for index="pethidx" start="0" end="`$network-eth.node_length`">
+ <for index='pethidx' start='0' end='`$network-eth.node_length`' >
<set>
- <parameter name="node-eth." value="`$network-eth.node[$pethidx].`"/>
+ <parameter name='node-eth.' value='`$network-eth.node[$pethidx].`' />
</set>
<set>
- <parameter name="unique-network-ethId" value="`$tmp.network-eth.network-id`"/>
+ <parameter name='unique-network-ethId' value='`$tmp.network-eth.network-id`' />
</set>
<set>
- <parameter name="unique-node-ethId" value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`"/>
+ <parameter name='unique-node-ethId' value="`'networkId-' + $unique-network-ethId + '-nodeId-' + $node-eth.node-id`" />
</set>
- <switch test="`$node-eth.termination-point_length`">
- <outcome value="">
- <block/>
+ <switch test='`$node-eth.termination-point_length`'>
+ <outcome value=''>
+ <block></block>
</outcome>
- <outcome value="0">
- <block/>
+ <outcome value='0'>
+ <block></block>
</outcome>
- <outcome value="Other">
- <for index="tidx" start="0" end="`$node-eth.termination-point_length`">
+ <outcome value='Other'>
+ <for index='tidx' start='0' end='`$node-eth.termination-point_length`' >
<set>
- <parameter name="tp-eth." value=""/>
+ <parameter name='tp-eth.' value='' />
</set>
<set>
- <parameter name="tp-eth." value="`$node-eth.termination-point[$tidx].`"/>
+ <parameter name='tp-eth.' value='`$node-eth.termination-point[$tidx].`' />
</set>
<set>
- <parameter name="unique-ltpethId" value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`"/>
+ <parameter name='unique-ltpethId' value="`$unique-node-ethId + '-ltpId-' + $tp-eth.te-tp-id`" />
</set>
<set>
- <parameter name="tp-inter-layer-lock-id" value="`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`"/>
+ <parameter name='tp-inter-layer-lock-id' value='`$node-eth.termination-point[$tidx].te.inter-layer-lock-id[0]`' />
</set>
- <for index="potnidx" start="0" end="`$network-otn.node_length`">
+ <for index='potnidx' start='0' end='`$network-otn.node_length`' >
<set>
- <parameter name="node-otn." value=""/>
- <parameter name="unique-network-otnId" value=""/>
- <parameter name="unique-node-otnId" value=""/>
+ <parameter name='node-otn.' value='' />
+ <parameter name='unique-network-otnId' value='' />
+ <parameter name='unique-node-otnId' value="" />
</set>
<set>
- <parameter name="node-otn." value="`$network-otn.node[$potnidx].`"/>
+ <parameter name='node-otn.' value='`$network-otn.node[$potnidx].`' />
</set>
<set>
- <parameter name="unique-network-otnId" value="`$tmp.network-otn.network-id`"/>
+ <parameter name='unique-network-otnId' value='`$tmp.network-otn.network-id`' />
</set>
<set>
- <parameter name="unique-node-otnId" value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`"/>
+ <parameter name='unique-node-otnId' value="`'networkId-' + $unique-network-otnId + '-nodeId-' + $node-otn.node-id`" />
</set>
- <switch test="`$node-otn.te.tunnel-termination-point_length`">
- <outcome value="">
- <block/>
+ <switch test='`$node-otn.te.tunnel-termination-point_length`'>
+ <outcome value=''>
+ <block></block>
</outcome>
- <outcome value="0">
- <block/>
+ <outcome value='0'>
+ <block></block>
</outcome>
- <outcome value="Other">
- <for index="ttidx" start="0" end="`$node-otn.te.tunnel-termination-point_length`">
+ <outcome value='Other'>
+ <for index='ttidx' start='0' end='`$node-otn.te.tunnel-termination-point_length`' >
<set>
- <parameter name="ttp." value=""/>
+ <parameter name='ttp.' value='' />
</set>
<set>
- <parameter name="ttp." value="`$node-otn.te.tunnel-termination-point[$ttidx].`"/>
+ <parameter name='ttp.' value='`$node-otn.te.tunnel-termination-point[$ttidx].`' />
</set>
<set>
- <parameter name="unique-ttpId" value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+ <parameter name='unique-ttpId' value="`$unique-node-otnId + '-ttpId-' + $ttp.tunnel-tp-id`" />
</set>
<set>
- <parameter name="ttp-inter-layer-lock-id" value="`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`"/>
+ <parameter name='ttp-inter-layer-lock-id' value='`$node-otn.te.tunnel-termination-point[$ttidx].inter-layer-lock-id[0]`' />
</set>
- <switch test="`$tp-inter-layer-lock-id`">
- <outcome value="`$ttp-inter-layer-lock-id`">
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface:relationship-list" key="p-interface.interface-name = $unique-ltpethId" force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point"/>
- <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id"/>
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+ <switch test='`$tp-inter-layer-lock-id`'>
+ <outcome value='`$ttp-inter-layer-lock-id`'>
+ <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
+ key='p-interface.interface-name = $unique-ltpethId' force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="tunnel-termination-point" />
+ <parameter name="relationship-list.relationship[0].related-link" value="/network/tunnel-termination-points/tunnel-termination-point/ + `$unique-ttpId`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="tunnel-termination-point.tunnel-tp-id" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
</save>
</outcome>
</switch>
|