From 7f70731621bcd7cdb4f4157eba0d66b3638f1519 Mon Sep 17 00:00:00 2001
From: "Cheung, Pat" <kc1472@att.com>
Date: Thu, 4 Oct 2018 18:35:55 +0000
Subject: 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
---
 ...-API_self-serve-capability-param-resolution.xml | 340 ++++++++++-----------
 1 file changed, 168 insertions(+), 172 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
index cf3447f7..d59d3140 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-capability-param-resolution.xml
@@ -5,186 +5,182 @@
         <block atomic='true'>
             <switch test="`$ss.capability-type`">
                 <outcome value='vnf'>
-                    <for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                            <outcome value='true'>
-                                <for index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                        <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
-                                        <parameter name="target" value="$"/>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                </record>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                    <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />
-                                                    <parameter name='regex' value='\$\{' />
-                                                </execute>
-                                                <set>
-                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
-                                                    <parameter name="tmp.resolved.var.value" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                    <parameter name='ctx_memory_result_key' value='s2' />
-                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                    <parameter name='regex' value='\}' />
-                                                </execute>
-                                                <switch test='`$s2_length`'>
-                                                    <outcome value='1'>
-                                                        <set>
-                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='2'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
-                                                            </set>
-                                                            <set>
-                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                </switch>
-                                                <for index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
-                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>
+                    <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length == ''`">
+                        <outcome value='false'>
+                            <for silentFailure='true' index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                    <outcome value='true'>
+                                        <switch test="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length == ''`">
+                                            <outcome value='false'>
+                                                <for silentFailure='true' index='j' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key_length`' >
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
+                                                        <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
+                                                        <parameter name="target" value="$"/>
                                                         <outcome value='true'>
-                                                            <set>
-                                                                <parameter name='tmp.resolved.var.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].value`'/>
-                                                            </set>
+                                                            <block atomic='true'>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                    <parameter name="logger" value="message-log"/>
+                                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                                </record>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
+                                                                    <parameter name='original_string' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' />
+                                                                    <parameter name='regex' value='\$\{' />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
+                                                                    <parameter name="tmp.s2.s2" value=''/>
+                                                                    <parameter name="tmp.resolved.var.value" value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`'/>
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='s2' />
+                                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
+                                                                    <parameter name='regex' value='\}' />
+                                                                </execute>
+                                                                <switch test='`$s2_length`'>
+                                                                    <outcome value='1'>
+                                                                        <set>
+                                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='2'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <for silentFailure='true' index='cn' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >
+                                                                    <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].name == $tmp.s2.s1`'>
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='tmp.resolved.var.value' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cn].value`'/>
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                    <parameter name='source' value='`$tmp.s1`' />
+                                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
+                                                                    <parameter name='outputPath' value='tmp.result' />
+                                                                </execute>
+                                                                <switch test="`$tmp.s2.s2 == ''`">
+                                                                    <outcome value='true'></outcome>
+                                                                    <outcome value='false'>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                            <parameter name='source' value='`$tmp.result`' />
+                                                                            <parameter name='target' value='`$tmp.s2.s2`' />
+                                                                            <parameter name='outputPath' value='tmp.result' />
+                                                                        </execute>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <set>
+                                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
+                                                                </set>
+                                                            </block>
                                                         </outcome>
-                                                    </switch>
+                                                    </execute>
                                                 </for>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
-                                                    <parameter name='source' value='`$tmp.s1`' />
-                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
-                                                    <parameter name='outputPath' value='tmp.result' />
-                                                </execute>
-                                                <switch test='`$tmp.s2.s2`'>
-                                                    <outcome value=''></outcome>
-                                                    <outcome value='Other'>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
-                                                            <parameter name='source' value='`$tmp.result`' />
-                                                            <parameter name='target' value='`$tmp.s2.s2`' />
-                                                            <parameter name='outputPath' value='tmp.result' />
-                                                        </execute>
-                                                    </outcome>
-                                                </switch>
-                                                <set>
-                                                    <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                    <parameter name="source" value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
-                                                    <parameter name="target" value="$"/>
-                                                    <outcome value='true'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value= "`'Not able to resolve Capability ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].name + ':' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].resource-resolution-data.resource-key[$j].value`" />
-                                                        </return>
-                                                    </outcome>
-                                                </execute>
-                                            </block>
-                                        </outcome>
-                                    </execute>
-                                </for>
-                            </outcome>
-                        </switch>
-                    </for>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='vf-module'>
-                    <for index='i' 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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
-                            <outcome value='true'>
-                                <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[$i].resource-resolution-data.resource-key_length`' >
-                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                        <parameter name="source" value="`$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[$i].resource-resolution-data.resource-key[$j].value`" />
-                                        <parameter name="target" value="$"/>
-                                        <outcome value='true'>
-                                            <block atomic='true'>
-                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                    <parameter name="logger" value="message-log"/>
-                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $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[$i].resource-resolution-data.resource-key[$j].value`"/>
-                                                </record>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
-                                                    <parameter name='original_string' value='`$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[$i].resource-resolution-data.resource-key[$j].value`' />
-                                                    <parameter name='regex' value='\$\{' />
-                                                </execute>
-                                                <set>
-                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
-                                                    <parameter name="tmp.resolved.var.value" value='`$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[$i].resource-resolution-data.resource-key[$j].value`'/>
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
-                                                    <parameter name='ctx_memory_result_key' value='s2' />
-                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
-                                                    <parameter name='regex' value='\}' />
-                                                </execute>
-                                                <switch test='`$s2_length`'>
-                                                    <outcome value='1'>
-                                                        <set>
-                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
-                                                        </set>
-                                                    </outcome>
-                                                    <outcome value='2'>
-                                                        <block>
-                                                            <set>
-                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
-                                                            </set>
-                                                            <set>
-                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
-                                                            </set>
-                                                        </block>
-                                                    </outcome>
-                                                </switch>
-                                                <for index='cn' 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[$cn].name == $tmp.s2.s1`'>
+                    <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'>
+                            <for silentFailure='true' index='i' 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[$i].resource-resolution-data.capability-name == $ss.capability-name`'>
+                                    <outcome value='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[$i].resource-resolution-data.resource-key_length == ''`">
+                                            <outcome value='false'>
+                                                <for silentFailure='true' 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[$i].resource-resolution-data.resource-key_length`' >
+                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
+                                                        <parameter name="source" value="`$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[$i].resource-resolution-data.resource-key[$j].value`" />
+                                                        <parameter name="target" value="$"/>
                                                         <outcome value='true'>
-                                                            <set>
-                                                                <parameter name='tmp.resolved.var.value' value='`$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[$cn].value`'/>
-                                                            </set>
+                                                            <block atomic='true'>
+                                                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                    <parameter name="logger" value="message-log"/>
+                                                                    <parameter name="field1" value="`'SS: param[].value with leading $: ' + $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[$i].resource-resolution-data.resource-key[$j].value`"/>
+                                                                </record>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='resource-resolution-split' />
+                                                                    <parameter name='original_string' value='`$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[$i].resource-resolution-data.resource-key[$j].value`' />
+                                                                    <parameter name='regex' value='\$\{' />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name="tmp.s1" value='`$resource-resolution-split[0]`'/>
+                                                                    <parameter name="tmp.s2.s2" value=''/>
+                                                                    <parameter name="tmp.resolved.var.value" value='`$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[$i].resource-resolution-data.resource-key[$j].value`'/>
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split'>
+                                                                    <parameter name='ctx_memory_result_key' value='s2' />
+                                                                    <parameter name='original_string' value='`$resource-resolution-split[1]`' />
+                                                                    <parameter name='regex' value='\}' />
+                                                                </execute>
+                                                                <switch test='`$s2_length`'>
+                                                                    <outcome value='1'>
+                                                                        <set>
+                                                                            <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                        </set>
+                                                                    </outcome>
+                                                                    <outcome value='2'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s1" value='`$s2[0]`'/>
+                                                                            </set>
+                                                                            <set>
+                                                                                <parameter name="tmp.s2.s2" value='`$s2[1]`'/>
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <for silentFailure='true' index='cn' 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[$cn].name == $tmp.s2.s1`'>
+                                                                        <outcome value='true'>
+                                                                            <set>
+                                                                                <parameter name='tmp.resolved.var.value' value='`$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[$cn].value`'/>
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                    <parameter name='source' value='`$tmp.s1`' />
+                                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
+                                                                    <parameter name='outputPath' value='tmp.result' />
+                                                                </execute>
+                                                                <switch test="`$tmp.s2.s2 == ''`">
+                                                                    <outcome value='true'></outcome>
+                                                                    <outcome value='false'>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
+                                                                            <parameter name='source' value='`$tmp.result`' />
+                                                                            <parameter name='target' value='`$tmp.s2.s2`' />
+                                                                            <parameter name='outputPath' value='tmp.result' />
+                                                                        </execute>
+                                                                    </outcome>
+                                                                </switch>
+                                                                <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[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
+                                                                </set>
+                                                            </block>
                                                         </outcome>
-                                                    </switch>
+                                                    </execute>
                                                 </for>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
-                                                    <parameter name='source' value='`$tmp.s1`' />
-                                                    <parameter name='target' value='`$tmp.resolved.var.value`' />
-                                                    <parameter name='outputPath' value='tmp.result' />
-                                                </execute>
-                                                <switch test='`$tmp.s2.s2`'>
-                                                    <outcome value=''></outcome>
-                                                    <outcome value='Other'>
-                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='concat'>
-                                                            <parameter name='source' value='`$tmp.result`' />
-                                                            <parameter name='target' value='`$tmp.s2.s2`' />
-                                                            <parameter name='outputPath' value='tmp.result' />
-                                                        </execute>
-                                                    </outcome>
-                                                </switch>
-                                                <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[$i].resource-resolution-data.resource-key[$j].value`' value='`$tmp.result`'/>
-                                                </set>
-                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains'  emitsOutcome='true' >
-                                                    <parameter name="source" value="`$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[$i].resource-resolution-data.resource-key[$j].value`" />
-                                                    <parameter name="target" value="$"/>
-                                                    <outcome value='true'>
-                                                        <return status='failure'>
-                                                            <parameter name='ack-final' value='Y'/>
-                                                            <parameter name="error-code" value="500" />
-                                                            <parameter name="error-message" value= "`'Not able to resolve Capability ' + $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[$i].resource-resolution-data.resource-key[$j].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[$i].resource-resolution-data.resource-key[$j].value`" />
-                                                        </return>
-                                                    </outcome>
-                                                </execute>
-                                            </block>
-                                        </outcome>
-                                    </execute>
-                                </for>
-                            </outcome>
-                        </switch>
-                    </for>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
                 </outcome>
             </switch>
         </block>
-- 
cgit 1.2.3-korg