SDWAN sdnc DGs aai resource changes

SDWAN configuration save in aai resource-name changes are updated in SDWAN DGs

Change-Id: I9097f205751af47b5db8f228142f27786e9d190d
Issue-ID: SDNC-357
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: fad8ff4f0b3660a5c1dd4b7abdb5ac5b95c8fec2

1 files changed, 12 insertions, 10 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
index 30e20974..07cd7181 100644
--- 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
@@ -34,7 +34,7 @@
             </for>

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

 		resource="esr-thirdparty-sdnc" 

-		key="esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWAN-Controller' AND 

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

 		     depth = '1'"

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

                 <outcome value='success'>

@@ -179,9 +179,8 @@
                     <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                 </execute>

                 <set>

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

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

-                    <parameter name='prop.vpn1Id' value='10' />

+                    <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.json'`" />

@@ -201,9 +200,12 @@
             <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[$network-topology-operation-input.network-request-input.network-input-parameters.param_length + 1].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 + 1].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 + 2`' />

+                <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.`' />

@@ -221,10 +223,10 @@
                 <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.id = $network-topology-operation-input.network-information.network-id' >

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

+      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='tenanatId' value='`$prop.tenant-id`' />

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

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

             </update>

             <return status='success'>