X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fxml%2FDataChange_update-network-to-aai.xml;h=666d337a6ce84ff35aeb83ca8c246684847fd9c6;hb=3e4fa46160a5d6d52bb7eccf08dbb790d96a4682;hp=f3f089a982bf08ed69aeedf3fcc3e5dac4b606f6;hpb=059370a180fc6630eea5f771fb61e303132f4352;p=sdnc%2Foam.git

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>