integration test issues fix for sdwan and sotn

Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682

3 files changed, 27 insertions, 33 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 ba2ea398..3f2dc892 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
@@ -7,25 +7,6 @@
                 <outcome value='Update'>

                     <block atomic="true">

                         <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.openecomp.client.jks"/>

-                            <parameter name="trustStorePassword" value="adminadmin"/>

-                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

-                            <parameter name="keyStorePassword" value="adminadmin"/>

-                            <outcome value='success'>

-                                <set>

-                                    <parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />

-                                </set>

-                            </outcome>

-                            <outcome value='failure'>

-                                <block></block>

-                            </outcome>

-                        </execute>

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

@@ -64,4 +45,4 @@
             </switch>

         </block>

     </method>

-</service-logic>
\ No newline at end of file
+</service-logic>

diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
index 33d91a7c..edce7fbb 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc.xml
@@ -30,6 +30,13 @@
                     <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'esr-system-info-id'`">

                         <outcome value='true'>

                             <set>

+                                <parameter name='prop.sdncRestApi.thirdpartySdnc.system-info-id' value='`$data-change-notification-input.key-data[$idx].key-value`' />

+                            </set>

+                        </outcome>

+                    </switch>

+                    <switch test="`$data-change-notification-input.key-data[$idx].key-name == 'thirdparty-sdnc-id'`">

+                        <outcome value='true'>

+                            <set>

                                 <parameter name='prop.sdncRestApi.thirdpartySdnc.id' value='`$data-change-notification-input.key-data[$idx].key-value`' />

                             </set>

                         </outcome>

@@ -47,4 +54,4 @@
             <call module='DataChange' rpc='esr-thirdparty-sdnc-discovery' mode='sync' ></call>

         </block>

     </method>

-</service-logic>
\ No newline at end of file
+</service-logic>

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 f3f089a9..666d337a 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
@@ -21,8 +21,7 @@
                     <parameter name='node.' value='`$network.node[$pidx].`' />

                 </set>

                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' 

-      key='network-resource.network-id = $tmp.network-id

-      AND pnf.pnf-name = $node.node-id' >

+      key='pnf.pnf-name = $node.node-id' >

                     <parameter name='pnf-name' value='`$node.node-id`' />

                     <parameter name='pnf-id' value='`$node.node-id`' />

                     <parameter name='operational-status' value='`$node.te.oper-status`' />

@@ -40,7 +39,7 @@
       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/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />

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

@@ -52,8 +51,7 @@
                         <parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />

                     </set>

                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' 

-      key='network-resource.network-id = $tmp.network-id

-      AND pnf.pnf-name = $node.node-id

+      key='pnf.pnf-name = $node.node-id

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

@@ -61,13 +59,21 @@
                         <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" />

-                    </save>

-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' 

-      key='pnf.pnf-name = $node.node-id' 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/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/p-interfaces/p-interface/' + $unique-ltpId`" />

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

+                        <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 = $node.node-id

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

+                            </update>

+                        </outcome>

                     </save>

                 </for>

             </for>