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
---
 ...RESOURCE-API_self-serve-unresolved-composite-data.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
index 58bb677f..eab4d555 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-unresolved-composite-data.xml
@@ -30,7 +30,7 @@
                     </return>
                 </outcome>
                 <outcome value='vnf'>
-                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`">
+                    <for silentFailure='true' index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`">
                         <set>
                             <parameter name='tmp.ss.param.capability-name' 
 	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />
@@ -85,7 +85,7 @@
                                                     <parameter name="regex" value=","/>
                                                     <parameter name="ctx_memory_result_key" value="splits" />
                                                 </execute>
-                                                <for index="split-index" start="0" end="`$splits_length`">
+                                                <for silentFailure='true' index="split-index" start="0" end="`$splits_length`">
                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='trim' >
                                                         <parameter name="source" value="`$splits[$split-index]`" />
                                                         <parameter name="outputPath" value="tmp.ss.trim"/>
@@ -113,7 +113,7 @@
                                                     </record>
                                                     <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`">
+                                                            <for silentFailure='true' index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`">
                                                                 <set>
                                                                     <parameter name='tmp.ss.param-name' 
 	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name`' />
@@ -132,7 +132,7 @@
                                                             </for>
                                                         </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`">
+                                                            <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`">
                                                                 <set>
                                                                     <parameter name='tmp.ss.param-name' 
 	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].name`' />
@@ -231,7 +231,7 @@
                     </for>
                 </outcome>
                 <outcome value='vf-module'>
-                    <for index="pidx" 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`">
+                    <for silentFailure='true' index="pidx" 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`">
                         <set>
                             <parameter name='tmp.ss.param.capability-name' 
 	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[$pidx].resource-resolution-data.capability-name`' />
@@ -286,7 +286,7 @@
                                                     <parameter name="regex" value=","/>
                                                     <parameter name="ctx_memory_result_key" value="splits" />
                                                 </execute>
-                                                <for index="split-index" start="0" end="`$splits_length`">
+                                                <for silentFailure='true' index="split-index" start="0" end="`$splits_length`">
                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='trim' >
                                                         <parameter name="source" value="`$splits[$split-index]`" />
                                                         <parameter name="outputPath" value="tmp.ss.trim"/>
@@ -314,7 +314,7 @@
                                                     </record>
                                                     <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`">
+                                                            <for silentFailure='true' index="i" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`">
                                                                 <set>
                                                                     <parameter name='tmp.ss.param-name' 
 	value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name`' />
@@ -333,7 +333,7 @@
                                                             </for>
                                                         </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`">
+                                                            <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`">
                                                                 <set>
                                                                     <parameter name='tmp.ss.param-name' 
 	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].name`' />
-- 
cgit 1.2.3-korg