X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fxml%2FGENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml;h=877c272d5259d3c3c9f3717696611ec0a87a6476;hb=59a7e4cd8a1712e67854e88b63cea75eb3a5a2b7;hp=e791088156789f31db84fe59fe290c7214d7db07;hpb=5ecaefd8c245ff4fd031d98ea81f53c05053e4d7;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
index e7910881..877c272d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-aai-vnf-put.xml
@@ -3,6 +3,15 @@
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
     <method rpc='self-serve-aai-vnf-put' mode='sync'>
         <block atomic="true">
+            <switch test='`$ss.capability-name`'>
+                <outcome value=''>
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500"/>
+                        <parameter name="error-message" value="ss.capability-name is null" />
+                    </return>
+                </outcome>
+            </switch>
             <switch test='`$ss.capability-action`'>
                 <outcome value=''>
                     <return status="failure">
@@ -44,6 +53,18 @@
                                         <parameter name='ss.param.aai-vnf-put-index' value='`$aidx`' />
                                     </set>
                                 </outcome>
+                                <outcome value='license-key'>
+                                    <set>
+                                        <parameter name='ss.param.license-key' value ='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$aidx].value`' />
+                                        <parameter name='ss.param.license-key-index' value='`$aidx`' />
+                                    </set>
+                                </outcome>
+                                <outcome value='entitlement-key'>
+                                    <set>
+                                        <parameter name='ss.param.entitlement-key' value ='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$aidx].value`' />
+                                        <parameter name='ss.param.entitlement-key-index' value='`$aidx`' />
+                                    </set>
+                                </outcome>
                             </switch>
                         </for>
                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -75,10 +96,27 @@
                                 </block>
                             </outcome>
                         </get-resource>
+                        <set>
+                            <parameter name="ss.selflink" 
+	value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + 
+	$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id + 
+	'/service-data/vnfs/vnf/' + 
+	$ss.param.vnf-id + 
+	'/vnf-data/vnf-topology/'`" />
+                        </set>
                         <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
 		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                            <parameter name="vnf-name" value='`$ss.param.vnf-name`' />
+                            <parameter name="vnf-name" value="`$ss.param.vnf-name`" />
+                            <parameter name="prov-status" value="PREPROV" />
+                            <parameter name="operational-status" value="out-of-service-path" />
+                            <parameter name="selflink" value="`$ss.selflink`" />
+                            <parameter name="model-customization-id" 
+	value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid`" />
+                            <parameter name="model-invariant-id" 
+	value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-invariant-uuid`" />
+                            <parameter name="model-version-id" 
+	value="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-uuid`" />
                             <outcome value='failure'>
                                 <block atomic='true'>
                                     <set>
@@ -104,230 +142,279 @@
                                 </block>
                             </outcome>
                         </update>
-                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                        <switch test="`$ss.param.license-assignment-group-uuid != ''`">
+                            <outcome value='true'>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                                    <parameter name='source' value='`$ss.param.license-assignment-group-uuid`' />
+                                    <parameter name='target' value='$' />
+                                    <outcome value='true'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="__TIMESTAMP__"/>
+                                            <parameter name="field2" value="`'ss.param.license-assignment-group-uuid = ' + $ss.param.license-assignment-group-uuid`"/>
+                                            <parameter name="field3" value="__SKIP saving license object in AnAI__"/>
+                                        </record>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="license"
 		key="license.group-uuid = $ss.param.license-assignment-group-uuid 
 		AND license.resource-uuid = $ss.param.license-key
 		AND generic-vnf.vnf-id = $ss.param.vnf-id" >
-                            <parameter name="group-uuid" value='`$ss.param.license-assignment-group-uuid`' />
-                            <parameter name="resource-uuid" value='`$ss.param.license-key`' />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log"/>
-                                            <parameter name="field1" value="ROLLBACK generic-vnf update"/>
-                                        </record>
-                                        <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
+                                            <parameter name="group-uuid" value='`$ss.param.license-assignment-group-uuid`' />
+                                            <parameter name="resource-uuid" value='`$ss.param.license-key`' />
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <block>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                            <parameter name="logger" value="message-log"/>
+                                                            <parameter name="field1" value="ROLLBACK generic-vnf update"/>
+                                                        </record>
+                                                        <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                        </set>
-                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                        </set>
+                                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
 		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                                            <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
-                                            <outcome value='failure'>
-                                                <set>
-                                                    <parameter name='error-message' value="`' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                </set>
+                                                            <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
+                                                            <outcome value='failure'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                </set>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                </set>
+                                                            </outcome>
+                                                            <outcome value='success'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Rollback of generic-vnf update completed. '`" />
+                                                                </set>
+                                                            </outcome>
+                                                        </update>
+                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'Failed to save license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AA. ' + $error-message`" />
+                                                    </return>
+                                                </block>
                                             </outcome>
                                             <outcome value='not-found'>
-                                                <set>
-                                                    <parameter name='error-message' value="`' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='success'>
-                                                <set>
-                                                    <parameter name='error-message' value=" Rollback of generic-vnf update completed. " />
-                                                </set>
-                                            </outcome>
-                                        </update>
-                                    </block>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="`'Failed to save license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <block>
-                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                            <parameter name="logger" value="message-log"/>
-                                            <parameter name="field1" value="ROLLBACK generic-vnf update"/>
-                                        </record>
-                                        <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
+                                                <block atomic='true'>
+                                                    <block>
+                                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                            <parameter name="logger" value="message-log"/>
+                                                            <parameter name="field1" value="ROLLBACK generic-vnf update"/>
+                                                        </record>
+                                                        <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                        </set>
-                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                        </set>
+                                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
 		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                                            <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
-                                            <outcome value='failure'>
-                                                <set>
-                                                    <parameter name='error-message' value="`' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                </set>
-                                            </outcome>
-                                            <outcome value='not-found'>
-                                                <set>
-                                                    <parameter name='error-message' value="`' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                </set>
+                                                            <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
+                                                            <outcome value='failure'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                </set>
+                                                            </outcome>
+                                                            <outcome value='not-found'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                </set>
+                                                            </outcome>
+                                                            <outcome value='success'>
+                                                                <set>
+                                                                    <parameter name='error-message' value="`$error-message + ' Rollback of generic-vnf update completed. '`" />
+                                                                </set>
+                                                            </outcome>
+                                                        </update>
+                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' is not found in AAI. ' + $error-message`" />
+                                                    </return>
+                                                </block>
                                             </outcome>
                                             <outcome value='success'>
                                                 <set>
-                                                    <parameter name='error-message' value=" Rollback of generic-vnf update completed. " />
+                                                    <parameter name='ss.license-updated' value='true' />
                                                 </set>
                                             </outcome>
-                                        </update>
-                                    </block>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="`'license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' is not found in AAI'`" />
-                                    </return>
-                                </block>
+                                        </save>
+                                    </outcome>
+                                </execute>
                             </outcome>
-                        </save>
-                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                        </switch>
+                        <switch test="`$ss.param.entitlement-assignment-group-uuid != ''`">
+                            <outcome value='true'>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' emitsOutcome='true' >
+                                    <parameter name='source' value='`$ss.param.entitlement-assignment-group-uuid`' />
+                                    <parameter name='target' value='$' />
+                                    <outcome value='true'>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log"/>
+                                            <parameter name="field1" value="__TIMESTAMP__"/>
+                                            <parameter name="field2" value="`'ss.param.entitlement-assignment-group-uuid = ' + $ss.param.entitlement-assignment-group-uuid`"/>
+                                            <parameter name="field3" value="__SKIP saving entitlement object in AnAI__"/>
+                                        </record>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="entitlement"
 		key="entitlement.group-uuid = $ss.param.entitlement-assignment-group-uuid 
 		AND entitlement.resource-uuid = $ss.param.entitlement-key
 		AND generic-vnf.vnf-id = $ss.param.vnf-id" >
-                            <parameter name="group-uuid" value='`$ss.param.entitlement-assignment-group-uuid`' />
-                            <parameter name="resource-uuid" value='`$ss.param.entitlement-key`' />
-                            <outcome value='failure'>
-                                <block atomic='true'>
-                                    <block>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="ROLLBACK generic-vnf update"/>
-                                            </record>
-                                            <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
+                                            <parameter name="group-uuid" value='`$ss.param.entitlement-assignment-group-uuid`' />
+                                            <parameter name="resource-uuid" value='`$ss.param.entitlement-key`' />
+                                            <outcome value='failure'>
+                                                <block atomic='true'>
+                                                    <block>
+                                                        <block>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                <parameter name="logger" value="message-log"/>
+                                                                <parameter name="field1" value="ROLLBACK generic-vnf update"/>
+                                                            </record>
+                                                            <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                            </set>
-                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                            </set>
+                                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
 		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                                                <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
-                                                <outcome value='failure'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='error-message' value=" Rollback of generic-vnf update completed. " />
-                                                    </set>
-                                                </outcome>
-                                            </update>
-                                        </block>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="ROLLBACK license"/>
-                                            </record>
-                                            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
+                                                                <outcome value='failure'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                                <outcome value='not-found'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Rollback of generic-vnf update completed. '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                            </update>
+                                                        </block>
+                                                        <switch test="`$ss.license-updated`">
+                                                            <outcome value='true'>
+                                                                <block>
+                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                        <parameter name="logger" value="message-log"/>
+                                                                        <parameter name="field1" value="ROLLBACK license"/>
+                                                                    </record>
+                                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="license"
 		key="license.group-uuid = $ss.param.license-assignment-group-uuid 
 		AND license.resource-uuid = $ss.param.license-key" >
-                                                <outcome value='failure'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AAI. MANUAL ROLLBACK IS REQUIRED!'`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback license because license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' NOT FOUND in AAI. SILENT SUCCESS! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='error-message' value=" Rollback of license completed. " />
-                                                    </set>
-                                                </outcome>
-                                            </delete>
-                                        </block>
-                                    </block>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="`'Failed to save entitlement with group-uuid = ' + $ss.param.entitlement-assignment-group-uuid + ' AND entitlement.resource-uuid = ' + $ss.param.entitlement-key + ' in AAI'`" />
-                                    </return>
-                                </block>
-                            </outcome>
-                            <outcome value='not-found'>
-                                <block atomic='true'>
-                                    <block>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="ROLLBACK generic-vnf update"/>
-                                            </record>
-                                            <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
+                                                                        <outcome value='failure'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Failed to rollback license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AAI. MANUAL ROLLBACK IS REQUIRED!'`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Failed to rollback license because license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' NOT FOUND in AAI. SILENT SUCCESS! '`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Rollback of license completed. '`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </delete>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'Failed to save entitlement with group-uuid = ' + $ss.param.entitlement-assignment-group-uuid + ' AND entitlement.resource-uuid = ' + $ss.param.entitlement-key + ' in AAI. ' + $error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='not-found'>
+                                                <block atomic='true'>
+                                                    <block>
+                                                        <block>
+                                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                <parameter name="logger" value="message-log"/>
+                                                                <parameter name="field1" value="ROLLBACK generic-vnf update"/>
+                                                            </record>
+                                                            <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[$ss.param.aai-vf-put-index].resource-resolution-data.status' 
 	value='FAILED' />
-                                            </set>
-                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                            </set>
+                                                            <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="generic-vnf"
 		key="generic-vnf.vnf-id = $ss.param.vnf-id " >
-                                                <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
-                                                <outcome value='failure'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='error-message' value=" Rollback of generic-vnf update completed. " />
-                                                    </set>
-                                                </outcome>
-                                            </update>
-                                        </block>
-                                        <block>
-                                            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                                                <parameter name="logger" value="message-log"/>
-                                                <parameter name="field1" value="ROLLBACK license"/>
-                                            </record>
-                                            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                <parameter name="vnf-name" value='`$tmp.aai.vnf.vnf-anme`' />
+                                                                <outcome value='failure'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update in AnAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                                <outcome value='not-found'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Failed to rollback generic-vnf update because generic-vnf with vnf-id = ' + $ss.param.vnf-id + ' is not found in AAI. MANUAL ROLLBACK IS REQUIRED! '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                                <outcome value='success'>
+                                                                    <set>
+                                                                        <parameter name='error-message' value="`$error-message + ' Rollback of generic-vnf update completed. '`" />
+                                                                    </set>
+                                                                </outcome>
+                                                            </update>
+                                                        </block>
+                                                        <switch test="`$ss.license-updated`">
+                                                            <outcome value='true'>
+                                                                <block>
+                                                                    <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                                                        <parameter name="logger" value="message-log"/>
+                                                                        <parameter name="field1" value="ROLLBACK license"/>
+                                                                    </record>
+                                                                    <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
 	resource="license"
 		key="license.group-uuid = $ss.param.license-assignment-group-uuid 
 		AND license.resource-uuid = $ss.param.license-key" >
-                                                <outcome value='failure'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AAI. MANUAL ROLLBACK IS REQUIRED!'`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='not-found'>
-                                                    <set>
-                                                        <parameter name='error-message' value="`' Failed to rollback license because license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' NOT FOUND in AAI. SILENT SUCCESS! '`" />
-                                                    </set>
-                                                </outcome>
-                                                <outcome value='success'>
-                                                    <set>
-                                                        <parameter name='error-message' value=" Rollback of license completed. " />
-                                                    </set>
-                                                </outcome>
-                                            </delete>
-                                        </block>
-                                    </block>
-                                    <return status='failure'>
-                                        <parameter name='error-code' value='500' />
-                                        <parameter name='error-message' value="`'entitlement with group-uuid = ' + $ss.param.entitlement-assignment-group-uuid + ' AND entitlement.resource-uuid = ' + $ss.param.entitlement-key + ' is not found in AAI'`" />
-                                    </return>
-                                </block>
+                                                                        <outcome value='failure'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Failed to rollback license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' in AAI. MANUAL ROLLBACK IS REQUIRED!'`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Failed to rollback license because license with group-uuid = ' + $ss.param.license-assignment-group-uuid + ' AND license.resource-uuid = ' + $ss.param.license-key + ' NOT FOUND in AAI. SILENT SUCCESS! '`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <set>
+                                                                                <parameter name='error-message' value="`$error-message + ' Rollback of license completed. '`" />
+                                                                            </set>
+                                                                        </outcome>
+                                                                    </delete>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                    <return status='failure'>
+                                                        <parameter name='error-code' value='500' />
+                                                        <parameter name='error-message' value="`'entitlement with group-uuid = ' + $ss.param.entitlement-assignment-group-uuid + ' AND entitlement.resource-uuid = ' + $ss.param.entitlement-key + ' is not found in AAI. ' + $error-message`" />
+                                                    </return>
+                                                </block>
+                                            </outcome>
+                                        </save>
+                                    </outcome>
+                                </execute>
                             </outcome>
-                        </save>
+                        </switch>
                         <set>
                             <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.param.aai-vnf-put-index].resource-resolution-data.status' 
 	value='SUCCESS' />
@@ -335,8 +422,12 @@
                     </block>
                 </outcome>
             </switch>
+            <set>
+                <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$ss.param.aai-vnf-put-index].value' 
+	value='SUCCESS' />
+            </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                <parameter name='filename' value='/var/tmp/ss.aai.vfmoduleput.log' />
+                <parameter name='filename' value='/var/tmp/ss-aai-vnfput.log' />
             </execute>
         </block>
     </method>