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
---
 ...URCE-API_self-serve-generate-name-changeassign.xml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml')

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
index ba153ffe..6456f73b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-generate-name-changeassign.xml
@@ -43,7 +43,7 @@
                             </outcome>
                         </switch>
                         <set>
-                            <parameter name="tmp.vnf.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]'`"/>
+                            <parameter name="tmp.vnf.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
                         </set>
                         <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
                             <parameter name='payload' value='`$tmp.vnf.changeassign.naming-data-payload`' />
@@ -75,11 +75,8 @@
                         </execute>
                         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
-		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                            <parameter name="ipv4-loopback0-address" value='`$ss.param.ipv4-loopback0-address`' />
-                            <parameter name="ipv4-oam-address" value='`$ss.param.ipv4-oam-address`' />
-                            <parameter name="as-number" value='`$ss.param.as-number`' />
-                            <parameter name="vlan-id-outer" value='`$ss.param.vlan-id-outer`' />
+		key="generic-vnf.vnf-id =  $service-data.vnfs.vnf[$vnf-index].vnf-id " >
+                            <parameter name="vnf-name" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$ss.input.param.index].value`' />
                             <outcome value='failure'>
                                 <block atomic='true'>
                                     <set>
@@ -132,7 +129,7 @@
                             </outcome>
                         </switch>
                         <set>
-                            <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]'`"/>
+                            <parameter name="tmp.vf-module.changeassign.naming-data-payload" value="`'{&quot;elements&quot;:[{' + '&quot;resource-name&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].name + '&quot;,&quot;resource-value&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value + '&quot;,&quot;external-key&quot;:&quot;' + $tmp.external-key.value + '&quot;}]}'`"/>
                         </set>
                         <execute plugin='org.openecomp.sdnc.prov.namegeneration.node.AssignNameNode' method='process'>
                             <parameter name='payload' value='`$tmp.vf-module.changeassign.naming-data-payload`' />
@@ -162,11 +159,9 @@
                                 </block>
                             </outcome>
                         </execute>
-                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-	resource="vf-module"
-		key="generic-vnf.vnf-id = $ss.param.vnf-id 
-			AND vf-module.vf-module-id = $ss.param.vf-module-id " >
-                            <parameter name="vf-module-name" value='`$ss.param.vf-module-name`' />
+                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="vf-module" key="generic-vnf.vnf-id = $service-data.vnfs.vnf[$vnf-index].vnf-id AND vf-module.vf-module-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id " >
+                            <parameter name="vf-module-name" value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$ss.input.param.index].value`' />
                             <outcome value='failure'>
                                 <block atomic='true'>
                                     <set>
-- 
cgit 1.2.3-korg