NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay resources).

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

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 b867b56..f870e36 100644 (file)
--- 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
@@ -139,6 +139,70 @@
                                                     </block>\r
                                                 </outcome>\r
                                             </save>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                                <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                                <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                            </save>\r
+                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
+                                                <outcome value=''>\r
+                                                    <block></block>\r
+                                                </outcome>\r
+                                                <outcome value='0'>\r
+                                                    <block></block>\r
+                                                </outcome>\r
+                                                <outcome value='Other'>\r
+                                                    <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
+                                                        <set>\r
+                                                            <parameter name='label-restriction.' value='' />\r
+                                                            <parameter name='unique-lrId' value="" />\r
+                                                        </set>\r
+                                                        <set>\r
+                                                            <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
+                                                        </set>\r
+                                                        <set>\r
+                                                            <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />\r
+                                                        </set>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                            <parameter name='id' value='`$unique-lrId`' />\r
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                            <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                            <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                            <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
+                                                            <outcome value='success'>\r
+                                                                <block></block>\r
+                                                            </outcome>\r
+                                                            <outcome value='failure'>\r
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+      key='label-restriction.id = $unique-lrId' >\r
+                                                                    <parameter name='id' value='`$unique-lrId`' />\r
+                                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
+                                                                    <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
+                                                                    <parameter name='label-step' value='`$label-restriction.label-step`' />\r
+                                                                    <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
+                                                                </save>\r
+                                                            </outcome>\r
+                                                        </save>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />\r
+                                                        </save>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
+                                                        </save>\r
+                                                    </for>\r
+                                                </outcome>\r
+                                            </switch>\r
                                         </block>\r
                                     </outcome>\r
                                     <outcome value='not-found'>\r
@@ -148,6 +212,7 @@
                                                 <parameter name='link-name' value='`$alt-unique-linkId`' />\r
                                                 <parameter name='link-id' value='`$link.link-id`' />\r
                                                 <parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                                <parameter name='link-role' value='cross-domain' />\r
                                             </save>\r
                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
       key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">\r
@@ -156,22 +221,35 @@
                                                 <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="`$src-tpId`" />\r
                                             </save>\r
-                                            <switch test='`$link.te.te-link-attributes.label-restriction`'>\r
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                                <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                                <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                            </save>\r
+                                            <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
                                                 <outcome value=''>\r
                                                     <block></block>\r
                                                 </outcome>\r
+                                                <outcome value='0'>\r
+                                                    <block></block>\r
+                                                </outcome>\r
                                                 <outcome value='Other'>\r
                                                     <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
+                                                        <set>\r
+                                                            <parameter name='label-restriction.' value='' />\r
+                                                            <parameter name='unique-lrId' value="" />\r
+                                                        </set>\r
                                                         <set>\r
                                                             <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
+                                                        </set>\r
+                                                        <set>\r
                                                             <parameter name='unique-lrId' value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`" />\r
                                                         </set>\r
                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $alt-unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
+      key='label-restriction.id = $unique-lrId' >\r
                                                             <parameter name='id' value='`$unique-lrId`' />\r
-                                                            <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                            <parameter name='label-end' value='`$label-restriction.label-end`' />\r
+                                                            <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                            <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
                                                             <parameter name='label-step' value='`$label-restriction.label-step`' />\r
                                                             <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
@@ -179,7 +257,7 @@
                                                                 <block></block>\r
                                                             </outcome>\r
                                                             <outcome value='failure'>\r
-                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
       key='logical-link.link-name = $alt-unique-linkId\r
       AND label-restriction.id = $unique-lrId' >\r
                                                                     <parameter name='id' value='`$unique-lrId`' />\r
@@ -188,15 +266,22 @@
                                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
                                                                     <parameter name='label-step' value='`$label-restriction.label-step`' />\r
                                                                     <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                                </update>\r
+                                                                </save>\r
                                                             </outcome>\r
                                                         </save>\r
-                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $alt-unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />\r
-                                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $alt-unique-linkId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$alt-unique-linkId`" />\r
+                                                        </save>\r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                            <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
                                                         </save>\r
                                                     </for>\r
                                                 </outcome>\r
@@ -234,29 +319,35 @@
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />\r
                                         <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />\r
                                     </save>\r
-                                    <switch test='`$link.te.te-link-attributes.label-restriction`'>\r
+                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' >\r
+                                        <parameter name='id' value='`$link.te.te-link-attributes.name`' />\r
+                                        <parameter name='access-type' value='`$link.te.te-link-attributes.access-type`' />\r
+                                    </save>\r
+                                    <switch test='`$link.te.te-link-attributes.label-restriction_length`'>\r
                                         <outcome value=''>\r
                                             <block></block>\r
                                         </outcome>\r
+                                        <outcome value='0'>\r
+                                            <block></block>\r
+                                        </outcome>\r
                                         <outcome value='Other'>\r
                                             <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\r
-                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \r
-      key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">\r
-                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />\r
-                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
-                                                </save>\r
+                                                <set>\r
+                                                    <parameter name='label-restriction.' value='' />\r
+                                                    <parameter name='unique-lrId' value="" />\r
+                                                </set>\r
                                                 <set>\r
                                                     <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\r
+                                                </set>\r
+                                                <set>\r
                                                     <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />\r
                                                 </set>\r
                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
-      key='logical-link.link-name = $unique-linkId\r
-      AND label-restriction.id = $unique-lrId' >\r
+      key='label-restriction.id = $unique-lrId' >\r
                                                     <parameter name='id' value='`$unique-lrId`' />\r
-                                                    <parameter name='label-start' value='`$label-restriction.label-start`' />\r
-                                                    <parameter name='label-end' value='`$label-restriction.label-end`' />\r
+                                                    <parameter name='label-start' value='`$label-restriction.label-start.te-label-tpn`' />\r
+                                                    <parameter name='label-end' value='`$label-restriction.label-end.te-label-tpn`' />\r
                                                     <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
                                                     <parameter name='label-step' value='`$label-restriction.label-step`' />\r
                                                     <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
@@ -264,7 +355,7 @@
                                                         <block></block>\r
                                                     </outcome>\r
                                                     <outcome value='failure'>\r
-                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
+                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \r
       key='logical-link.link-name = $unique-linkId\r
       AND label-restriction.id = $unique-lrId' >\r
                                                             <parameter name='id' value='`$unique-lrId`' />\r
@@ -273,9 +364,23 @@
                                                             <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\r
                                                             <parameter name='label-step' value='`$label-restriction.label-step`' />\r
                                                             <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\r
-                                                        </update>\r
+                                                        </save>\r
                                                     </outcome>\r
                                                 </save>\r
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="logical-link" />\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/logical-links/logical-link/' + $unique-linkId`" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="logical-link.link-name" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-linkId`" />\r
+                                                </save>\r
+                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='te-link-attribute:relationship-list' \r
+      key='te-link-attribute.id = $link.te.te-link-attributes.name' force="true" pfx="tmp.AnAI-data">\r
+                                                    <parameter name="relationship-list.relationship[0].related-to" value="label-restriction" />\r
+                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="label-restriction.id" />\r
+                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-lrId`" />\r
+                                                </save>\r
                                             </for>\r
                                         </outcome>\r
                                     </switch>\r