integration test issues fix for sdwan and sotn

[sdnc/oam.git] / platform-logic / datachange / src / main / xml / DataChange_update-network-to-aai.xml

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 f3f089a..666d337 100644 (file)
--- 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].`' />\r
                 </set>\r
                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \r
-      key='network-resource.network-id = $tmp.network-id\r
-      AND pnf.pnf-name = $node.node-id' >\r
+      key='pnf.pnf-name = $node.node-id' >\r
                     <parameter name='pnf-name' value='`$node.node-id`' />\r
                     <parameter name='pnf-id' value='`$node.node-id`' />\r
                     <parameter name='operational-status' value='`$node.te.oper-status`' />\r
@@ -40,7 +39,7 @@
       key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \r
       force="true" pfx="tmp.AnAI-data">\r
                     <parameter name="relationship-list.relationship[0].related-to" value="pnf" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id`" />\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />\r
                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />\r
                 </save>\r
@@ -52,8 +51,7 @@
                         <parameter name='unique-ltpId' value="`'nodeId-' + $node.node-id + '-ltpId-' + $tp.te-tp-id`" />\r
                     </set>\r
                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
-      key='network-resource.network-id = $tmp.network-id\r
-      AND pnf.pnf-name = $node.node-id\r
+      key='pnf.pnf-name = $node.node-id\r
       AND p-interface.interface-name = $unique-ltpId' >\r
                         <parameter name='interface-name' value='`$unique-ltpId`' />\r
                         <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
@@ -61,13 +59,21 @@
                         <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
                         <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
                         <parameter name='in-maint' value="true" />\r
-                    </save>\r
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \r
-      key='pnf.pnf-name = $node.node-id' force="true" pfx="tmp.AnAI-data">\r
-                        <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />\r
-                        <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`" />\r
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-ltpId`" />\r
+                        <outcome value='success'>\r
+                            <block></block>\r
+                        </outcome>\r
+                        <outcome value='failure'>\r
+                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \r
+      key='pnf.pnf-name = $node.node-id\r
+      AND p-interface.interface-name = $unique-ltpId' >\r
+                                <parameter name='interface-name' value='`$unique-ltpId`' />\r
+                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
+                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
+                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
+                                <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
+                                <parameter name='in-maint' value="true" />\r
+                            </update>\r
+                        </outcome>\r
                     </save>\r
                 </for>\r
             </for>\r