Code Review / sdnc / oam.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Buf fixing for creation, deletion, and modification of a cloud leased-line (CLL)...
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / xml / cloud_leased_line / GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
index be49338..0fc5dcd 100644 (file)
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
@@ -194,6 +194,10 @@
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\r
                                                                                                         <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>\r
                                                                                                     </execute>\r
+                                                                                                    <set>\r
+                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->\r
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />\r
+                                                                                                    </set>\r
                                                                                                     <set>\r
                                                                                                         <parameter name='network-route-one' value="`$tmp.aai.logical-link.link-name`" />\r
                                                                                                     </set>\r
@@ -748,6 +752,7 @@
                                                                                                                     <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\r
                                                                                                                     <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\r
                                                                                                                     <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
+                                                                                                                    <parameter name='data-source' value='`$gfp`' />\r
                                                                                                                 </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
                                                                                                                       key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'\r
@@ -813,6 +818,7 @@
                                                                                                                     <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\r
                                                                                                                     <parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\r
                                                                                                                     <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\r
+                                                                                                                    <parameter name='data-source' value='`$gfp`' />\r
                                                                                                                 </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
                                                                                                                       key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'\r
@@ -893,6 +899,22 @@
                                                                                                                         </return>\r
                                                                                                                     </outcome>\r
                                                                                                                 </get-resource>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
+                                                                                                                      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'\r
+                                                                                                                      force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.LEAF.uni-p-interface-long`" />\r
+                                                                                                                </save>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
+                                                                                                                      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'\r
+                                                                                                                      force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ROOT.uni-p-interface-long`" />\r
+                                                                                                                </save>\r
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
                                                                                                                       key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'\r
                                                                                                                       force="true" pfx="tmp.AnAI-data">\r
@@ -914,6 +936,56 @@
                                                                                                         </outcome>\r
                                                                                                         <outcome value='true'>\r
                                                                                                             <block atomic='true'>\r
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"\r
+                                                                                                                              resource="uni"\r
+                                                                                                                              key="uni.id = $tmp.ROOT.uni-p-interface-long"\r
+                                                                                                                              local-only="false"\r
+                                                                                                                              pfx="tmp.aai.rootuni" >\r
+                                                                                                                    <outcome value='not-found'>\r
+                                                                                                                        <return status='failure'>\r
+                                                                                                                            <parameter name='ack-final' value='Y'/>\r
+                                                                                                                            <parameter name="error-code" value="500" />\r
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />\r
+                                                                                                                        </return>\r
+                                                                                                                    </outcome>\r
+                                                                                                                    <outcome value='failure'>\r
+                                                                                                                        <return status='failure'>\r
+                                                                                                                            <parameter name='error-code' value='' />\r
+                                                                                                                            <parameter name='error-message' value='' />\r
+                                                                                                                        </return>\r
+                                                                                                                    </outcome>\r
+                                                                                                                    <outcome value='success'>\r
+                                                                                                                        <block atomic="true">\r
+                                                                                                                            <set>\r
+                                                                                                                                <parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\r
+                                                                                                                            </set>\r
+                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'\r
+                                                                                                                                    key='uni.id = $tmp.ROOT.uni-p-interface-long'>\r
+                                                                                                                                <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\r
+                                                                                                                                <parameter name='data-source' value='`$tmp.newbw`' />\r
+                                                                                                                            </update>\r
+                                                                                                                        </block>\r
+                                                                                                                    </outcome>\r
+                                                                                                                </get-resource>\r
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                      force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$middle-man-conn.connectivity-id`" />\r
+                                                                                                                    <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                    <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                    <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                    <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                    <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                    <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                    <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                    <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                    <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                </save>\r
                                                                                                                 <set>\r
                                                                                                                     <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
                                                                                                                     <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
@@ -933,6 +1005,7 @@
                                                                                                                                 <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\r
                                                                                                                                 <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\r
                                                                                                                                 <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
+                                                                                                                                <parameter name='data-source' value='`$gfp`' />\r
                                                                                                                             </save>\r
                                                                                                                             <switch test="`$found-connectivity`">\r
                                                                                                                                 <outcome value='false'>\r
@@ -999,9 +1072,41 @@
                                                                                                                                         <set>\r
                                                                                                                                             <parameter name='uuid.connectivity-domainA-uuid' value="`$tmp.the-connectivity.connectivity-id`" />\r
                                                                                                                                         </set>\r
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.the-connectivity.connectivity-id`" />\r
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                        </save>\r
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                                key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\r
+                                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\r
+                                                                                                                                            <parameter name='operational-status' value='Modified' />\r
+                                                                                                                                        </update>\r
                                                                                                                                     </block>\r
                                                                                                                                 </outcome>\r
                                                                                                                             </switch>\r
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
+                                                                                                                                  key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'\r
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.LEAF.uni-p-interface-long`" />\r
+                                                                                                                            </save>\r
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
                                                                                                                                   key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'\r
                                                                                                                                   force="true" pfx="tmp.AnAI-data">\r
@@ -1019,6 +1124,30 @@
                                                                                                                                             <!--OR-->\r
                                                                                                                                             <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.ROOT.connectivity.connectivity-id`" />\r
                                                                                                                                         </set>\r
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.ROOT.connectivity.connectivity-id`" />\r
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                        </save>\r
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                                key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\r
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\r
+                                                                                                                                            <parameter name='operational-status' value='Modified' />\r
+                                                                                                                                        </update>\r
                                                                                                                                     </block>\r
                                                                                                                                 </outcome>\r
                                                                                                                                 <outcome value='false'>\r
@@ -1038,6 +1167,15 @@
                                                                                                                                 <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\r
                                                                                                                                 <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\r
                                                                                                                                 <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\r
+                                                                                                                                <parameter name='data-source' value='`$gfp`' />\r
+                                                                                                                            </save>\r
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
+                                                                                                                                  key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'\r
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="uni" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />\r
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.LEAF.uni-p-interface-long`" />\r
                                                                                                                             </save>\r
                                                                                                                             <set>\r
                                                                                                                                 <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\r
@@ -1059,6 +1197,50 @@
                                                                                                                                 </outcome>\r
                                                                                                                                 <outcome value='true'>\r
                                                                                                                                     <block>\r
+                                                                                                                                        <block>\r
+                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>\r
+                                                                                                                                            <switch test="`$found-root-connectivity`">\r
+                                                                                                                                                <outcome value='true'>\r
+                                                                                                                                                    <block atomic='true'>\r
+                                                                                                                                                        <set>\r
+                                                                                                                                                            <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->\r
+                                                                                                                                                            <!--OR-->\r
+                                                                                                                                                            <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.ROOT.connectivity.connectivity-id`" />\r
+                                                                                                                                                        </set>\r
+                                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`" />\r
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.ROOT.connectivity.connectivity-id`" />\r
+                                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                                        </save>\r
+                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'\r
+                                                                                                                                                                key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\r
+                                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\r
+                                                                                                                                                            <parameter name='operational-status' value='Modified' />\r
+                                                                                                                                                        </update>\r
+                                                                                                                                                    </block>\r
+                                                                                                                                                </outcome>\r
+                                                                                                                                                <outcome value='false'>\r
+                                                                                                                                                    <return status='failure'>\r
+                                                                                                                                                        <parameter name='error-code' value='' />\r
+                                                                                                                                                        <parameter name='error-message' value='Root Connectivity was not found' />\r
+                                                                                                                                                    </return>\r
+                                                                                                                                                </outcome>\r
+                                                                                                                                            </switch>\r
+                                                                                                                                        </block>\r
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'\r
                                                                                                                                               key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'\r
                                                                                                                                               force="true" pfx="tmp.AnAI-data">\r
@@ -1072,6 +1254,25 @@
                                                                                                                                             <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\r
                                                                                                                                             <parameter name='operational-status' value='Modified' />\r
                                                                                                                                         </update>\r
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'\r
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\r
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />\r
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.the-connectivity.connectivity-id`" />\r
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\r
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\r
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\r
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\r
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->\r
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->\r
+                                                                                                                                        </save>\r
                                                                                                                                         <set>\r
                                                                                                                                             <parameter name='allNetworksList.' value='' />\r
                                                                                                                                         </set>\r
@@ -1136,36 +1337,29 @@
                                                                                                                                                 <block atomic="true">\r
                                                                                                                                                     <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\r
                                                                                                                                                         <block atomic='true'>\r
-                                                                                                                                                            <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->\r
-                                                                                                                                                            <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\r
-                                                                                                                                                            <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `">\r
-                                                                                                                                                                <outcome value='false'></outcome>\r
-                                                                                                                                                                <outcome value='true'>\r
-                                                                                                                                                                    <block atomic='true'>\r
-                                                                                                                                                                        <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">\r
-                                                                                                                                                                            <outcome value='true'>\r
-                                                                                                                                                                                <block atomic='true'>\r
-                                                                                                                                                                                    <set>\r
-                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />\r
-                                                                                                                                                                                    </set>\r
-                                                                                                                                                                                    <set>\r
-                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />\r
-                                                                                                                                                                                    </set>\r
-                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
-                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\r
-                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\r
-                                                                                                                                                                                        <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\r
-                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\r
-                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\r
-                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />\r
-                                                                                                                                                                                    </update>\r
-                                                                                                                                                                                </block>\r
-                                                                                                                                                                            </outcome>\r
-                                                                                                                                                                            <outcome value='false'></outcome>\r
-                                                                                                                                                                        </switch>\r
-                                                                                                                                                                    </block>\r
-                                                                                                                                                                </outcome>\r
-                                                                                                                                                            </switch>\r
+                                                                                                                                                            <block atomic='true'>\r
+                                                                                                                                                                <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">\r
+                                                                                                                                                                    <outcome value='true'>\r
+                                                                                                                                                                        <block atomic='true'>\r
+                                                                                                                                                                            <set>\r
+                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />\r
+                                                                                                                                                                            </set>\r
+                                                                                                                                                                            <set>\r
+                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />\r
+                                                                                                                                                                            </set>\r
+                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'\r
+                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\r
+                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\r
+                                                                                                                                                                                <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\r
+                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\r
+                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\r
+                                                                                                                                                                                <parameter name='operational-status' value='Modified' />\r
+                                                                                                                                                                            </update>\r
+                                                                                                                                                                        </block>\r
+                                                                                                                                                                    </outcome>\r
+                                                                                                                                                                    <outcome value='false'></outcome>\r
+                                                                                                                                                                </switch>\r
+                                                                                                                                                            </block>\r
                                                                                                                                                         </block>\r
                                                                                                                                                     </for>\r
                                                                                                                                                 </block>\r
SDNC OA&M tools