diff options
| author |   Cheung, Pat <kc1472@att.com> | 2018-10-04 18:35:55 +0000 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2018-10-04 20:01:45 +0000 |
| commit | 7f70731621bcd7cdb4f4157eba0d66b3638f1519 (patch) | |
| tree | ee4a185b69efe53321284766027e26c514771b8b /platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml | |
| parent | 0d607948ff5a38a1ca0306bc68f7985a94b0be37 (diff) | |
self-serve dg patch
inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name
Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136
Issue-ID: CCSDK-604
Signed-off-by: Cheung, Pat <kc1472@att.com>
Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml')
| -rw-r--r-- | platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml index 5b98ce48..5aed4fc8 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-changeassign.xml @@ -13,24 +13,23 @@ </outcome> </switch> <for index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' > - <block atomic='true'> - <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`'> - <outcome value='Other'> + <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length == ''`"> + <outcome value='false'> + <block atomic='true'> + <set> + <parameter name='ss.input.param.found.in.service.param' value='false' /> + </set> <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' > <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].name == $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'> - <outcome value='false'> - <return status='failure'> - <parameter name='ack-final' value='Y'/> - <parameter name="error-code" value="500" /> - <parameter name="error-message" value="`'No param with param[].name = ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" /> - </return> - </outcome> <outcome value='true'> <block atomic='true'> <set> <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$j].resource-resolution-data.status`' value='PENDING'/> <parameter name='ss.input.param.index' value='`$i`' /> <parameter name='ss.service-data.param.index' value='`$j`' /> + <parameter name='ss.input.param.found.in.service.param' value='true' /> + <parameter name='ss.capability-type' value='vf-module' /> + <parameter name='ss.capability-action' value='changeassign' /> </set> <call module='GENERIC-RESOURCE-API' rpc='self-serve-generate-name-changeassign' mode='sync' > <outcome value='failure'> @@ -48,13 +47,23 @@ </return> </outcome> </call> + <return status='success'></return> </block> </outcome> </switch> </for> - </outcome> - </switch> - </block> + <switch test='`$ss.input.param.found.in.service.param`'> + <outcome value='false'> + <return status='failure'> + <parameter name='ack-final' value='Y'/> + <parameter name="error-code" value="500" /> + <parameter name="error-message" value="`'No param with param[].name = ' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + ' found in service-data.'`" /> + </return> + </outcome> + </switch> + </block> + </outcome> + </switch> </for> </block> </method> |