diff options
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/cloud_leased_line')
2 files changed, 91 insertions, 211 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml index f49b946f..9a35f126 100644 --- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml @@ -478,13 +478,7 @@ </for> </block> </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> - </return> - </outcome> + <outcome value='not-found'></outcome> <outcome value='failure'> <return status='failure'> <parameter name='error-code' value='' /> @@ -1058,13 +1052,7 @@ </outcome> </switch> </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> - </return> - </outcome> + <outcome value='not-found'></outcome> <outcome value='failure'> <return status='failure'> <parameter name='error-code' value='' /> @@ -1076,13 +1064,7 @@ </switch> </for> </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> - </return> - </outcome> + <outcome value='not-found'></outcome> <outcome value='failure'> <return status='failure'> <parameter name='error-code' value='' /> 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 6c46a403..76cea192 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 @@ -1112,206 +1112,104 @@ <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call> </block> <set> - <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' /> - <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' /> - <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />--> - <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />--> - <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />--> - <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />--> - <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />--> - <!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />--> + <parameter name='tmp.aai.all-vpn-bindings.' value='' /> </set> - <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' ></call> - <switch test="`$found-connectivity`"> - <outcome value='false'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." /> - </return> - </outcome> - <outcome value='true'> - <block atomic='true'> - <for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' > - <switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'> - <outcome value='vpn-binding'> - <block atomic="true"> - <set> - <parameter name='tmp.aai.vpn-binding.' value='' /> - </set> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="vpn-binding" - key="vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value" - local-only="false" - pfx="tmp.aai.vpn-binding" > - <outcome value='success'> - <block atomic='true'> - <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `"> - <outcome value='true'> - <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.vpn-binding.vpn-id' > - <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' /> - <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' /> - <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> - <parameter name='route-distinguisher' value='`$tmp.aai.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.vpn-binding.vpn-id' > - <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' /> - <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' /> - <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> - <parameter name='route-distinguisher' value='`$tmp.aai.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> - </outcome> - <outcome value='false'></outcome> - </switch> - </block> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> - </return> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='error-code' value='' /> - <parameter name='error-message' value='' /> - </return> - </outcome> - </get-resource> - </block> - </outcome> - </switch> - </for> - </block> - </outcome> - </switch> - <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call> - <switch test="`$found-root-connectivity`"> - <outcome value='true'> - <block atomic='true'> - <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' > - <switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'> - <outcome value='vpn-binding'> - <block atomic="true"> - <set> - <parameter name='tmp.aai.vpn-binding.' value='' /> - </set> - <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" - resource="vpn-binding" - key="vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value" - local-only="false" - pfx="tmp.aai.vpn-binding" > - <outcome value='success'> - <block atomic="true"> + <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" + resource="vpn-bindings" + key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings" + local-only="false" + pfx="tmp.aai.all-vpn-bindings" > + <outcome value='success'> + <block atomic="true"> + <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' > + <block atomic='true'> + <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `"> + <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> + <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`"> + <outcome value='true'> <block atomic='true'> - <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `"> - <outcome value='true'> - <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.vpn-binding.vpn-id' > - <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' /> - <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' /> - <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> - <parameter name='route-distinguisher' value='`$tmp.aai.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.vpn-binding.vpn-id' > - <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' /> - <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' /> - <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' /> - <parameter name='route-distinguisher' value='`$tmp.aai.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> - </outcome> - <outcome value='false'></outcome> - </switch> + <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> - </block> - </outcome> - <outcome value='not-found'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> - </return> - </outcome> - <outcome value='failure'> - <return status='failure'> - <parameter name='error-code' value='' /> - <parameter name='error-message' value='' /> - </return> - </outcome> - </get-resource> - </block> - </outcome> - </switch> + </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> + <outcome value='false'></outcome> + </switch> + </block> </for> </block> </outcome> - <outcome value='false'> + <outcome value='not-found'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" /> + </return> + </outcome> + <outcome value='failure'> <return status='failure'> <parameter name='error-code' value='' /> - <parameter name='error-message' value='Root Connectivity was not found but it should have been!' /> + <parameter name='error-message' value='' /> </return> </outcome> - </switch> + </get-resource> </block> </block> </outcome> |