X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fdatachange%2Fsrc%2Fmain%2Fxml%2FDataChange_update-network-links-to-aai.xml;h=0a5d05ec83eaee32f21d5367de2be2bb53e81102;hb=03a1b2b63cf77790d357e15f2cd20a197ec6d26f;hp=f870e369e76358382b4b0bbcfe9c5e76bb1bfbdb;hpb=ccf839a4815dc7e26deaf36627d04c0a4587780b;p=sdnc%2Foam.git

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index f870e369..0a5d05ec 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,6 +1,6 @@
 <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='DataChange' version='${project.version}'>
+        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='DataChange' version='${project.version}'>
     <method rpc='update-network-links-to-aai' mode='sync'>
         <block atomic="true">
             <for index='pidx' start='0' end='`$network.link_length`' >
@@ -30,12 +30,12 @@
                                 <parameter name='tmp.aai.p-interface' value='' />
                                 <parameter name='tmp.aai.p-interface.inter-domain-plug-id' value='' />
                             </set>
-                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="p-interface"
-	    key="pnf.pnf-name = $unique-src-node-Id
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                          resource="p-interface"
+                                          key="pnf.pnf-name = $unique-src-node-Id
 	        and p-interface.interface-name = $src-tpId"
-		local-only="false" 
-		pfx="tmp.aai.p-interface" >
+                                          local-only="false"
+                                          pfx="tmp.aai.p-interface" >
                                 <outcome value='success'>
                                     <switch test='`$tmp.aai.p-interface.inter-domain-plug-id`'>
                                         <outcome value=''>
@@ -83,11 +83,11 @@
                     <outcome value='false'>
                         <switch test='`$is-open-ended-link`'>
                             <outcome value='true'>
-                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
-	resource="logical-link"
-	    key="logical-link.link-name = $alt-unique-linkId"
-		local-only="false" 
-		pfx="tmp.aai.logical-link" >
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-link"
+                                              key="logical-link.link-name = $alt-unique-linkId"
+                                              local-only="false"
+                                              pfx="tmp.aai.logical-link" >
                                     <outcome value='success'>
                                         <block>
                                             <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
@@ -100,8 +100,8 @@
                                                 <parameter name="field6" value="relationship-value" />
                                                 <parameter name="field7" value='`$tmp.aai.logical-link.relationship-list.relationship[0].relationship-data[1].relationship-value`' />
                                             </record>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                                  key='logical-link.link-name = $alt-unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />-->
                                                 <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />-->
@@ -139,12 +139,12 @@
                                                     </block>
                                                 </outcome>
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                                  key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
-                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                            <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                                 <outcome value=''>
                                                     <block></block>
                                                 </outcome>
@@ -152,49 +152,49 @@
                                                     <block></block>
                                                 </outcome>
                                                 <outcome value='Other'>
-                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >
                                                         <set>
                                                             <parameter name='label-restriction.' value='' />
                                                             <parameter name='unique-lrId' value="" />
                                                         </set>
                                                         <set>
-                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                         </set>
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                         </set>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
-                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
-                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                             <outcome value='success'>
                                                                 <block></block>
                                                             </outcome>
                                                             <outcome value='failure'>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                                      key='label-restriction.id = $unique-lrId' >
                                                                     <parameter name='id' value='`$unique-lrId`' />
-                                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
-                                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                                 </save>
                                                             </outcome>
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />
@@ -207,26 +207,26 @@
                                     </outcome>
                                     <outcome value='not-found'>
                                         <block atomic='true'>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
-      key='logical-link.link-name = $alt-unique-linkId' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
+                                                  key='logical-link.link-name = $alt-unique-linkId' >
                                                 <parameter name='link-name' value='`$alt-unique-linkId`' />
                                                 <parameter name='link-id' value='`$link.link-id`' />
                                                 <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
                                                 <parameter name='link-role' value='cross-domain' />
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                                  key='logical-link.link-name = $alt-unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
                                                 <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="`$src-tpId`" />
                                             </save>
-                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                                  key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                                 <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                                 <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                             </save>
-                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                            <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                                 <outcome value=''>
                                                     <block></block>
                                                 </outcome>
@@ -234,50 +234,50 @@
                                                     <block></block>
                                                 </outcome>
                                                 <outcome value='Other'>
-                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`' >
                                                         <set>
                                                             <parameter name='label-restriction.' value='' />
                                                             <parameter name='unique-lrId' value="" />
                                                         </set>
                                                         <set>
-                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                         </set>
                                                         <set>
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                         </set>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
-                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
-                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                             <outcome value='success'>
                                                                 <block></block>
                                                             </outcome>
                                                             <outcome value='failure'>
-                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='logical-link.link-name = $alt-unique-linkId
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                                      key='logical-link.link-name = $alt-unique-linkId
       AND label-restriction.id = $unique-lrId' >
                                                                     <parameter name='id' value='`$unique-lrId`' />
                                                                     <parameter name='label-start' value='`$label-restriction.label-start`' />
                                                                     <parameter name='label-end' value='`$label-restriction.label-end`' />
                                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                                 </save>
                                                             </outcome>
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />
                                                         </save>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                              key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                             <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                             <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                             <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />
@@ -292,24 +292,14 @@
                             </outcome>
                             <outcome value='false'>
                                 <block atomic='true'>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' 
-      key='logical-link.link-name = $unique-linkId' >
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
+                                          key='logical-link.link-name = $unique-linkId' >
                                         <parameter name='link-name' value='`$unique-linkId`' />
                                         <parameter name='link-id' value='`$link.link-id`' />
                                         <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />
                                     </save>
-                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
-                                        <parameter name="file" value="/opt/onap/logTopologyDiscovery.txt" />
-                                        <parameter name="field1" value="__TIMESTAMP__" />
-                                        <parameter name="field2" value="uniqueLinkId" />
-                                        <parameter name="field3" value="`$unique-linkId`" />
-                                        <parameter name="field4" value="srcTpId" />
-                                        <parameter name="field5" value="`$src-tpId`" />
-                                        <parameter name="field6" value="dstTpId" />
-                                        <parameter name="field7" value="`$dst-tpId`" />
-                                    </record>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' 
-      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
+                                          key='logical-link.link-name = $unique-linkId' 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/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
                                         <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
@@ -319,12 +309,12 @@
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
                                     </save>
-                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' >
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute'
+                                          key='te-link-attribute.id = $link.te.te-link-attributes.name' >
                                         <parameter name='id' value='`$link.te.te-link-attributes.name`' />
                                         <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />
                                     </save>
-                                    <switch test='`$link.te.te-link-attributes.label-restriction_length`'>
+                                    <switch test='`$link.te.te-link-attributes.label-restrictions.label-restriction_length`'>
                                         <outcome value=''>
                                             <block></block>
                                         </outcome>
@@ -332,50 +322,50 @@
                                             <block></block>
                                         </outcome>
                                         <outcome value='Other'>
-                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
+                                            <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restrictions.label-restrictions.label-restriction_length`' >
                                                 <set>
                                                     <parameter name='label-restriction.' value='' />
                                                     <parameter name='unique-lrId' value="" />
                                                 </set>
                                                 <set>
-                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
+                                                    <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restrictions.label-restriction[$tidx].`' />
                                                 </set>
                                                 <set>
                                                     <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
                                                 </set>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='label-restriction.id = $unique-lrId' >
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                      key='label-restriction.id = $unique-lrId' >
                                                     <parameter name='id' value='`$unique-lrId`' />
-                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />
-                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />
+                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label.otn-tpn`' />
+                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label.otn-tpn`' />
                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                    <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                     <outcome value='success'>
                                                         <block></block>
                                                     </outcome>
                                                     <outcome value='failure'>
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' 
-      key='logical-link.link-name = $unique-linkId
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
+                                                              key='logical-link.link-name = $unique-linkId
       AND label-restriction.id = $unique-lrId' >
                                                             <parameter name='id' value='`$unique-lrId`' />
                                                             <parameter name='label-start' value='`$label-restriction.label-start`' />
                                                             <parameter name='label-end' value='`$label-restriction.label-end`' />
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
+                                                            <parameter name='label-step' value='`$label-restriction.label-step.otn-tpn`' />
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.restriction`' />
                                                         </save>
                                                     </outcome>
                                                 </save>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                     <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />
                                                     <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`" />
                                                 </save>
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' 
-      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list'
+                                                      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">
                                                     <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />
                                                     <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />