diff options
| author |   Hesam Rahimi <hesam.rahimi@huawei.com> | 2022-10-28 18:13:38 -0400 |
|---|---|---|
| committer |   Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2022-11-02 13:05:43 +0000 |
| commit | 51946551fe9016b38ba03747a3376febf7124b8e (patch) | |
| tree | 2003f306ab93af177e20836562eba0c014bbccfa /platform-logic/datachange/src/main/xml | |
| parent | 2889b7c726947c26a03ed83bc49169c4b41e36d4 (diff) | |
Support for integration of E-Line based Cloud Leased Line service with hardware domain controller.
Issue-ID: SDNC-1732
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: Iaa49d272769b47148bcb05a5c8e35db49e85dfb7
Former-commit-id: ac7a2377e8fea65230d3403b9dd8413daf65c70a
Diffstat (limited to 'platform-logic/datachange/src/main/xml')
| -rw-r--r-- | platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml | 130 | ||||
| -rw-r--r-- | platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml | 69 |
2 files changed, 182 insertions, 17 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 ebed9d63..b9e143d8 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 @@ -21,10 +21,16 @@ <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"/>
+ <!--<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="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="disableHostVerification" value="true"/>
+ <parameter name="ssl" value="false"/>
<outcome value='success'>
<set>
<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />
@@ -43,10 +49,12 @@ <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="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="disableHostVerification" value="true"/>
+ <parameter name="ssl" value="false"/>
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -78,7 +86,39 @@ <set>
<parameter name='network.' value='`$topology.networks.network[$netidx].`' />
</set>
- <switch test='`$network.te-topology-identifier.topology-id`'>
+ <set>
+ <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />
+ <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+ <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />
+ </set>
+ <switch test="`length($tmpo.client-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.client-id' value='`$network.client-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmpo.te-topo-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmpo.provider-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.provider-id' value='`$network.provider-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$tmpo.te-topo-id`'>
<outcome value='1'>
<block>
<set>
@@ -93,6 +133,20 @@ </set>
</block>
</outcome>
+ <outcome value='11'>
+ <block>
+ <set>
+ <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='33'>
+ <block>
+ <set>
+ <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
+ </set>
+ </block>
+ </outcome>
</switch>
</block>
</for>
@@ -112,10 +166,12 @@ <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="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="disableHostVerification" value="true"/>
+ <parameter name="ssl" value="false"/>
<parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
<outcome value='failure'>
<return status='failure'>
@@ -148,7 +204,39 @@ <set>
<parameter name='network.' value='`$topology.networks.network[$netidx].`' />
</set>
- <switch test='`$network.te-topology-identifier.topology-id`'>
+ <set>
+ <parameter name='tmpo.client-id' value='`$network.te-topology-identifier.client-id`' />
+ <parameter name='tmpo.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+ <parameter name='tmpo.provider-id' value='`$network.te-topology-identifier.provider-id`' />
+ </set>
+ <switch test="`length($tmpo.client-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.client-id' value='`$network.client-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmpo.te-topo-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.te-topo-id' value='`$network.te-topology-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmpo.provider-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmpo.provider-id' value='`$network.provider-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test='`$tmpo.te-topo-id`'>
<outcome value='1'>
<block>
<set>
@@ -163,6 +251,20 @@ </set>
</block>
</outcome>
+ <outcome value='11'>
+ <block>
+ <set>
+ <parameter name='network-otn.' value='`$topology.networks.network[$netidx].`' />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='33'>
+ <block>
+ <set>
+ <parameter name='network-eth.' value='`$topology.networks.network[$netidx].`' />
+ </set>
+ </block>
+ </outcome>
</switch>
</block>
</for>
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 311514bd..c5aeb2a1 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 @@ -13,12 +13,75 @@ <!--<parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />-->
<parameter name='tmp.network-id' value="`$tmp.original-network-id`" />
</set>
+ <set>
+ <parameter name='tmp.client-id' value='`$network.te-topology-identifier.client-id`' />
+ <parameter name='tmp.te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
+ <parameter name='tmp.provider-id' value='`$network.te-topology-identifier.provider-id`' />
+ </set>
+ <switch test="`length($tmp.client-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmp.client-id' value='`$network.client-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmp.te-topo-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmp.te-topo-id' value='`$network.te-topology-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <switch test="`length($tmp.provider-id) == 0`">
+ <outcome value='true'>
+ <block>
+ <set>
+ <parameter name='tmp.provider-id' value='`$network.provider-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="network-resource"
+ key="network-resource.network-id = $tmp.network-id"
+ local-only="false"
+ pfx="tmpo.aai.network-resource" >
+ <outcome value='success'>
+ <block>
+ <set>
+ <parameter name='tmpo.provider-id' value="`$tmp.provider-id + 'new' `" />
+ </set>
+ <set>
+ <parameter name='tmp.provider-id' value="`$tmpo.provider-id`" />
+ </set>
+ <set>
+ <!--<parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />-->
+ <parameter name='tmp.network-id' value="" />
+ </set>
+ <set>
+ <!--<parameter name='tmp.network-id' value="`$prop.sdncRestApi.thirdpartySdnc.id + '-' + $tmp.original-network-id`" />-->
+ <parameter name='tmp.network-id' value="`'providerId-' + $tmp.provider-id + '-clientId-' + $tmp.client-id + '-topologyId-' + $tmp.te-topo-id `" />
+ <!--<parameter name='tmp.network-id' value="`'providerId-' + $tmpo.provider-id `" />-->
+ </set>
+ </block>
+ </outcome>
+ <outcome value='not-found'>
+ <block></block>
+ </outcome>
+ </get-resource>
<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.te-topology-identifier.client-id`' />
- <parameter name='te-topo-id' value='`$network.te-topology-identifier.topology-id`' />
- <parameter name='provider-id' value='`$network.te-topology-identifier.provider-id`' />
+ <parameter name='client-id' value='`$tmp.client-id`' />
+ <parameter name='te-topo-id' value='`$tmp.te-topo-id`' />
+ <parameter name='provider-id' value='`$tmp.provider-id`' />
+ <!--<parameter name='client-id' value='`$network.te-topology-identifier.client-id`' />-->
+ <!--<parameter name='te-topo-id' value='`$network.te-topology-identifier.topology-id`' />-->
+ <!--<parameter name='provider-id' value='`$network.te-topology-identifier.provider-id`' />-->
<parameter name='network-type' value='`$network.network-types`' />
</save>
<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
|