Adding support for connecting a single ONU port to multiple clouds with different...

[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 0fc5dcd..b928dba 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
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />\r
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->\r
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />\r
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />\r
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />\r
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />\r
                                                                                                     </set>\r
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\r
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />\r
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->\r
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />\r
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />\r
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />\r
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />\r
                                                                                                     </set>\r
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>\r
@@ -1342,19 +1342,29 @@
                                                                                                                                                                     <outcome value='true'>\r
                                                                                                                                                                         <block atomic='true'>\r
                                                                                                                                                                             <set>\r
-                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />\r
+                                                                                                                                                                                <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />\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
+                                                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>\r
+                                                                                                                                                                            <switch test="`$foundVpnName`">\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
+                                                                                                                                                                            </switch>\r
                                                                                                                                                                         </block>\r
                                                                                                                                                                     </outcome>\r
                                                                                                                                                                     <outcome value='false'></outcome>\r