Refactored SOTN and SDWAN DG

Refactored SOTN and SDWAN DG to seperate sub directories for better
maintainability.

Change-Id: I49c57d20fc8fcb7de65d3634bceb691d0b7f80fd
Issue-ID: SDNC-350
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: d3d3ce137625a244accf736da3a8f6736b44300e

1 files changed, 0 insertions, 264 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
deleted file mode 100644
index ffd5ee73..00000000
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ /dev/null
@@ -1,264 +0,0 @@
-<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='GENERIC-RESOURCE-API' version='${project.version}'>

-    <method rpc='sdwan-network-topology-operation-activate' mode='sync'>

-        <block atomic="true">

-            <call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-network-input-parameters' mode='sync' ></call>

-            <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">

-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>

-                <parameter name="field1" value="__TIMESTAMP__"/>

-                <parameter name="field2" value="sdwan-network-topology-operation-activate"/>

-                <parameter name="field3" value="SDWAN-Activate"/>

-            </record>

-            <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>

-            <for index='idx' start='0' end='`$ctx.network-data.network-request-input.network-input-parameters.param_length`' >

-                <block>

-                    <switch test="`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`">

-                        <outcome value='true'>

-                            <set>

-                                <parameter name='prop.name' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />

-                            </set>

-                        </outcome>

-                    </switch>

-                    <switch test="`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].name == 'topology'`">

-                        <outcome value='true'>

-                            <set>

-                                <parameter name='prop.topology' value='`$ctx.network-data.network-request-input.network-input-parameters.param[$idx].value`' />

-                            </set>

-                        </outcome>

-                    </switch>

-                </block>

-            </for>

-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

-		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND 

-		     depth = '1'"

-        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >

-                <outcome value='success'>

-                    <set>

-                        <parameter name='prop.sdncRestApi.thirdpartySdnc.url' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />

-                        <parameter name='prop.sdncRestApi.thirdpartySdnc.user' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />

-                        <parameter name='prop.sdncRestApi.thirdpartySdnc.password' value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />

-                    </set>

-                </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`" />

-                    </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`" />

-                    </return>

-                </outcome>

-            </get-resource>

-            <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'>

-                    <return status='failure'>

-                        <parameter name='ack-final' value='Y'/>

-                        <parameter name="error-code" value="500" />

-                        <parameter name="error-message" value="Error executing get token rest api" />

-                    </return>

-                </outcome>

-            </execute>

-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

-		resource="service-subscription" 

-        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type 

-        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'

-      force="true" pfx="tmp.AnAI-data">

-                <outcome value='success'>

-                    <switch test='`$tmp.AnAI-data.temp-ub-sub-account-id`'>

-                        <outcome value=''>

-                            <block atomic="true">

-                                <set>

-                                    <parameter name='prop.customer-id' value='`$ctx.network-data.service-information.global-customer-id`' />

-                                </set>

-                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat' >

-                                    <parameter name="source" value='`$prop.customer-id`'/>

-                                    <parameter name="outputPath" value="tmp.userAccountEmail"/>

-                                    <parameter name="target" value="@test.com"/>

-                                </execute>

-                                <set>

-                                    <parameter name='prop.userAccount' value='`$tmp.userAccountEmail`' />

-                                    <parameter name='prop.userEmail' value='`$tmp.userAccountEmail`' />

-                                </set>

-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-tenant.json'`" />

-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants'`" />

-                                    <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="post"/>

-                                    <parameter name="responsePrefix" value="tenant-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                                </execute>

-                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 

-		resource="service-subscription" 

-        key= 'service-subscription.service-type = $service-data.networks.network[$tmp.nidx].network-data.service-information.subscription-service-type 

-        AND customer.global-customer-id = $service-data.networks.network[$tmp.nidx].network-data.service-information.global-customer-id'>

-                                    <parameter name='temp-ub-sub-account-id' value='`$tenant-result.data.tenantId`' />

-                                    <!--parameter name='temp-ub-sub-account-id' value='`$prop.customer-id`' /-->

-                                </update>

-                                <set>

-                                    <parameter name='prop.tenant-id' value='`$tenant-result.data.tenantId`' />

-                                </set>

-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />

-                                    <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="put"/>

-                                    <parameter name="responsePrefix" value="tenant-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                                </execute>

-                            </block>

-                        </outcome>

-                        <outcome value='Other'>

-                            <block atomic="true">

-                                <set>

-                                    <parameter name='prop.tenant-id' value='`$tmp.AnAI-data.temp-ub-sub-account-id`' />

-                                </set>

-                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/baseservice/tenants/authorization/' + $prop.tenant-id`" />

-                                    <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="put"/>

-                                    <parameter name="responsePrefix" value="tenant-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                                </execute>

-                            </block>

-                        </outcome>

-                    </switch>

-                </outcome>

-                <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 token rest api" />

-                    </return>

-                </outcome>

-            </get-resource>

-            <block atomic="true">

-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-network-orchestration.json'`" />

-                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/network-orchestration-resources'`" />

-                    <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="put"/>

-                    <parameter name="responsePrefix" value="orchestration-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                </execute>

-            </block>

-            <block atomic="true">

-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`" />

-                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />

-                    <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="post"/>

-                    <parameter name="responsePrefix" value="vpn-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                </execute>

-                <set>

-                    <parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />

-                    <parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />

-                </set>

-                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >

-                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`" />

-                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/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="post"/>

-                    <parameter name="responsePrefix" value="vpn-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='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

-                </execute>

-            </block>

-            <set>

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='tenant-id' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.tenant-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

-            </set>

-            <set>

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].name' value='vpn-id' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$network-topology-operation-input.network-request-input.network-input-parameters.param_length].value' value='`$prop.vpn-id`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1`' />

-            </set>

-            <set>

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />

-            </set>

-            <set>

-                <parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />

-                <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $network-topology-operation-input.network-information.network-id  + '/network-data/'` " />

-            </set>

-            <set>

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Active' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />

-                <parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />

-            </set>

-            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' 

-      key='sdwan-vpn.sdwan-vpn-id = $network-topology-operation-input.network-information.network-id' >

-                <parameter name='sdwan-vpn-id' value='`$network-topology-operation-input.network-information.network-id`' />

-                <parameter name='operational-status' value='Active' />

-                <parameter name='tenanat-id' value='`$prop.tenant-id`' />

-                <parameter name='vpn-id' value='`$prop.vpn-id`' />

-            </update>

-            <return status='success'>

-                <parameter name="ack-final-indicator" value="Y" />

-                <parameter name="error-code" value="200" />

-                <parameter name="error-message" value="`$error-message`" />

-            </return>

-        </block>

-    </method>

-</service-logic>