diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2017-05-07 18:17:30 +0000 |
|---|---|---|
| committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-05-07 18:40:23 +0000 |
| commit | ba015255599bb7bb4cc1a0232a5f62a1ef067644 (patch) | |
| tree | a69b25264d90d0451b667b1662a3f95568fe9dd8 /platform-logic/vnfapi/src/main | |
| parent | d69660831c9dab695b1a89f8dcb7e522fbb25651 (diff) | |
update copyright to avoid noisy diff after build
Change-Id: Ida725825312f9be2349cf1a1562c122e61efbcaa
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Former-commit-id: 53d11b9c8fa4a13c58f5b248998e9f8ce818e12a
Diffstat (limited to 'platform-logic/vnfapi/src/main')
33 files changed, 342 insertions, 247 deletions
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml index a08a7a26..027c29db 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml index 5903707d..dc8e4392 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml index 5e787c7c..b9e37ffb 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml index 006c65d6..acad7356 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml index fd31513d..54751599 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml index 7352d888..4edb5186 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml index 83c181a9..8301b210 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml index 2652e033..87d5ac3f 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml index 3fb8483d..699ccac7 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml index b9ed2a27..efd277b6 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml index 7908deca..387961f3 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml index 388939f2..fef19fbb 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml index 808fffd8..bf7fe92a 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml index 99d52408..0b44711d 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml index 5461fa54..a55a8321 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml index 10a265aa..c9c3b2ed 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml index c0359f45..61b266c7 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml index d5e27b1f..7666d51e 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml index 88a2c634..ff1d473b 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml index acee4ff1..9bc5bba6 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml index 047f9cb5..d2fc7655 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml index ff828b7b..37204780 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml index a7fc602f..a2d84f12 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml index 23e915c1..8d0ac4f8 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml index 9b185f90..6e0ec559 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml index 1b5ad0c8..80ff4c00 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml index d8c211fd..b69faa62 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml index b365142d..15d767c5 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml @@ -1,54 +1,73 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-assign' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='true'>
-<return status='failure'>
- <parameter name='error-code' value='500'/>
- <parameter name='error-message' value='vnf-id is already present in config-tree'/></return></outcome></switch><get-resource plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="vf-module"
- key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
- and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
- local-only="false"
- pfx="tmp.AnAI.vfmodule" ><outcome value='failure'>
-<return status='failure'>
- <parameter name='error-code' value='500'/>
- <parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'>
-<return status='failure'>
- <parameter name='error-code' value='500'/>
- <parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>
-<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />
-</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="vf-module:relationship-list"
- key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
- and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
- force="true"
- local-only="false">
-
- <parameter name="relationship-list.relationship[0].related-to" value="l3-network" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>
-<block atomic='true'><delete plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="vf-module:relationship-list"
- key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
- AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
- AND related-to = l3-network"
- force="true"
- local-only="false"></delete><return status='failure'>
- <parameter name='error-code' value='500'/>
- <parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="vf-module"
- key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
- and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
- local-only="false" >
- <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>
-<block atomic="true">
-<delete plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="vf-module:relationship-list"
- key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
- AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
- AND related-to = l3-network"
- force="true"
- local-only="false"></delete><return status='failure'>
- <parameter name='error-code' value='500'/>
- <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>
- <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file +<!-- + ============LICENSE_START======================================================= + openECOMP : SDN-C + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights + reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-assign' mode='sync'> +<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='true'> +<return status='failure'> + <parameter name='error-code' value='500'/> + <parameter name='error-message' value='vnf-id is already present in config-tree'/></return></outcome></switch><get-resource plugin="com.att.sdnctl.sli.aai.AAIService" + resource="vf-module" + key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id + and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" + local-only="false" + pfx="tmp.AnAI.vfmodule" ><outcome value='failure'> +<return status='failure'> + <parameter name='error-code' value='500'/> + <parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'> +<return status='failure'> + <parameter name='error-code' value='500'/> + <parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set> +<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' /> +</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="com.att.sdnctl.sli.aai.AAIService" + resource="vf-module:relationship-list" + key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id + and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" + force="true" + local-only="false"> + + <parameter name="relationship-list.relationship[0].related-to" value="l3-network" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" /> + <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'> +<block atomic='true'><delete plugin="com.att.sdnctl.sli.aai.AAIService" + resource="vf-module:relationship-list" + key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id + AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id + AND related-to = l3-network" + force="true" + local-only="false"></delete><return status='failure'> + <parameter name='error-code' value='500'/> + <parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="com.att.sdnctl.sli.aai.AAIService" + resource="vf-module" + key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id + and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" + local-only="false" > + <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'> +<block atomic="true"> +<delete plugin="com.att.sdnctl.sli.aai.AAIService" + resource="vf-module:relationship-list" + key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id + AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id + AND related-to = l3-network" + force="true" + local-only="false"></delete><return status='failure'> + <parameter name='error-code' value='500'/> + <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set> + <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set> +<parameter name="ack-final" value="Y"/></set><return status='success'> + <parameter name="error-code" value="200" /></return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml index 10aaaf98..a1e76722 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml @@ -3,7 +3,7 @@ openECOMP : SDN-C ================================================================================ Copyright (C) 2017 AT&T Intellectual Property. All rights - reserved. + reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml index a16e5bba..0b57d013 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml @@ -1,32 +1,51 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-changedelete' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="'$service-data.oper-status.order-status == Active'">
-
-<!--
-leaf order-status {
- type enumeration {
- enum "Active";
- enum "PendingAssignment";
- enum "PendingCreate";
- enum "PendingUpdate";
- enum "Deleted";
- }
-}
---><outcome value='false'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="com.att.sdnctl.sli.aai.AAIService"
- resource="generic-vnf"
- key="generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
- force="true"
- local-only="false" >
- <parameter name="orchestration-status" value="pending-delete" />
-</update><set>
- <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
- <parameter name="service-data.oper-status.order-status" value="PendingDelete"/></set><set>
- <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
- <parameter name="service-data." value="vnf-topology-operation-input." />
-</set><return status='success'>
- <parameter name="error-code" value="200" />
-</return></block></method></service-logic>
+<!-- + ============LICENSE_START======================================================= + openECOMP : SDN-C + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights + reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-changedelete' mode='sync'> +<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'> +<return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="'$service-data.oper-status.order-status == Active'"> + +<!-- +leaf order-status { + type enumeration { + enum "Active"; + enum "PendingAssignment"; + enum "PendingCreate"; + enum "PendingUpdate"; + enum "Deleted"; + } +} +--><outcome value='false'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="com.att.sdnctl.sli.aai.AAIService" + resource="generic-vnf" + key="generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" + force="true" + local-only="false" > + <parameter name="orchestration-status" value="pending-delete" /> +</update><set> + <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set> + <parameter name="service-data.oper-status.order-status" value="PendingDelete"/></set><set> + <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set> + <parameter name="service-data." value="vnf-topology-operation-input." /> +</set><return status='success'> + <parameter name="error-code" value="200" /> +</return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml index f44c8d2f..6e6a6dc4 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml @@ -1,15 +1,34 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='Other'>
-<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome></switch><set>
- <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
- <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
- <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
- <parameter name="service-data." value="" />
-</set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file +<!-- + ============LICENSE_START======================================================= + openECOMP : SDN-C + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights + reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'> +<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'> +<return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='Other'> +<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome></switch><set> + <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set> + <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set> + <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set> + <parameter name="service-data." value="" /> +</set><set> +<parameter name="ack-final" value="Y"/></set><return status='success'> + <parameter name="error-code" value="200" /></return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml index db0f8cba..e1cd9cb7 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml @@ -1,105 +1,124 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-operation' mode='sync'>
-<block atomic="true"><record plugin="com.att.sdnctl.sli.recording.FileRecorder">
-<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
-<parameter name="field1" value="__TIMESTAMP__"/>
-<parameter name="field2" value="svc-topology-operation"/>
-<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/>
-<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>
-<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/>
-<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/>
-<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/>
-<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/>
-<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/>
-<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/>
-<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/>
-<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/>
-<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/>
-<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/>
-<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/>
-<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/>
-<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/>
-<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'>
-<return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'>
-<return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`">
-<!--
-leaf svc-action {
- type enumeration {
- enum "reserve";
- enum "assign";
- enum "activate"; // equal to commit
- enum "delete"; // equal to commit
- enum "changeassign";
- enum "changedelete";
- enum "rollback";
- }
-}
--->
-
-<outcome value='assign'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +<!-- + ============LICENSE_START======================================================= + openECOMP : SDN-C + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights + reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-operation' mode='sync'> +<block atomic="true"><record plugin="com.att.sdnctl.sli.recording.FileRecorder"> +<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/> +<parameter name="field1" value="__TIMESTAMP__"/> +<parameter name="field2" value="svc-topology-operation"/> +<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/> +<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/> +<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/> +<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/> +<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/> +<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/> +<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/> +<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/> +<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/> +<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/> +<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/> +<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/> +<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/> +<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/> +<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/> +<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'> +<return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'> +<return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"> +<!-- +leaf svc-action { + type enumeration { + enum "reserve"; + enum "assign"; + enum "activate"; // equal to commit + enum "delete"; // equal to commit + enum "changeassign"; + enum "changedelete"; + enum "rollback"; + } +} +--> + +<outcome value='assign'><block> +<block atomic="true"> +<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block> +<block atomic="true"> +<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block> +<block atomic="true"> +<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block> +<block atomic="true"> +<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='svc-action not recognized'/> +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml index cbb1be63..244696f8 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml @@ -1,13 +1,32 @@ -<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-rollback' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value="`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'>
- <parameter name='error-code' value='400'/>
- <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch><set>
- <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
- <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
- <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
- <parameter name="service-data." value="" />
-</set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file +<!-- + ============LICENSE_START======================================================= + openECOMP : SDN-C + ================================================================================ + Copyright (C) 2017 AT&T Intellectual Property. All rights + reserved. + ================================================================================ + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + ============LICENSE_END========================================================= + --> + +<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-rollback' mode='sync'> +<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'> +<return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value="`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'> + <parameter name='error-code' value='400'/> + <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch><set> + <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set> + <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set> + <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set> + <parameter name="service-data." value="" /> +</set><return status='success'> + <parameter name="error-code" value="200" /></return></block></method></service-logic> |