X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2Fcloud_leased_line%2FGENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml;h=d01140f67959d004304a94c39abc0d9b3b2a5290;hb=22d596935f2edeefbe3f0d5acc72cf39e27e17aa;hp=76cea192c71906415b4458cf46b844988e739c7a;hpb=b7cd528f9b720b4f820ac5eb38f01df2b16c9817;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index 76cea192..d01140f6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
@@ -1127,64 +1127,74 @@
                                                                                                                                                                         <outcome value='true'>
                                                                                                                                                                             <block atomic='true'>
                                                                                                                                                                                 <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                    <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                 </set>
-                                                                                                                                                                                <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                                </set>
-                                                                                                                                                                                <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
-                                                                                                                                                                                    <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
-                                                                                                                                                                                        <outcome value='connectivity'>
-                                                                                                                                                                                            <block atomic="true">
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                            </block>
-                                                                                                                                                                                        </outcome>
-                                                                                                                                                                                    </switch>
-                                                                                                                                                                                </for>
-                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                <switch test="`$foundVpnName`">
                                                                                                                                                                                     <outcome value='true'>
                                                                                                                                                                                         <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                        </block>
-                                                                                                                                                                                    </outcome>
-                                                                                                                                                                                    <outcome value='false'>
-                                                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
+                                                                                                                                                                                                <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
+                                                                                                                                                                                                    <outcome value='connectivity'>
+                                                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.' value='' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </switch>
+                                                                                                                                                                                            </for>
+                                                                                                                                                                                            <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                <outcome value='false'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                            </switch>
                                                                                                                                                                                         </block>
                                                                                                                                                                                     </outcome>
                                                                                                                                                                                 </switch>
@@ -1611,6 +1621,9 @@
                                                                                                                                                         <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
                                                                                                                                                     </set>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.aai.all-vpn-bindings.' value='' />
+                                                                                                                                                    </set>
                                                                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                                                                   resource="vpn-bindings"
                                                                                                                                                                   key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
@@ -1625,19 +1638,29 @@
                                                                                                                                                                                 <outcome value='true'>
                                                                                                                                                                                     <block atomic='true'>
                                                                                                                                                                                         <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
-                                                                                                                                                                                        </set>
-                                                                                                                                                                                        <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                         </set>
-                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
-                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
-                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                        </update>
+                                                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                        <switch test="`$foundVpnName`">
+                                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                        <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                    </update>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                        </switch>
                                                                                                                                                                                     </block>
                                                                                                                                                                                 </outcome>
                                                                                                                                                                                 <outcome value='false'></outcome>