X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fxml%2FLCM_rollback.xml;h=8c57d02785324cc03c13d07eee0a7cc94fde9ac2;hb=93a7ad8c9fa1d9631fcaaad359f32e956ac984ed;hp=dd24063357de9c43ee3e312746f0be78dae15db2;hpb=f5a63c57879141bd9e1054de41a901cdbd802e7f;p=sdnc%2Foam.git

diff --git a/platform-logic/lcm/src/main/xml/LCM_rollback.xml b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
index dd240633..8c57d027 100644
--- a/platform-logic/lcm/src/main/xml/LCM_rollback.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_rollback.xml
@@ -11,6 +11,7 @@
                 <parameter name='status.code' value='200' />
                 <parameter name='status.message' value='unexpected return from DG' />
                 <parameter name='quote' value="'" />
+                <parameter name='outputPayloadField' value='.Output' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
                 <parameter name='source' value='rollback-input.payload' />
@@ -19,24 +20,58 @@
             </execute>
             <switch test='`$payloadJson.pnf-flag`'>
                 <outcome value='true'>
-                    <set>
-                        <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
-                        <parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>
-                    </set>
+                    <block>
+                        <set>
+                            <parameter name='nodelist' value="`'[' + $quote + $payloadJson.ipaddress-v4-oam +  $quote + ']'`"/>
+                            <parameter name='outputPayloadField' value="`'.' + $payloadJson.ipaddress-v4-oam + '.Output'`"/>
+                        </set>
+                        <switch test='`$payloadJson.playbook-name`'>
+                            <outcome value=''>
+                                <set>
+                                    <parameter name='playbookname' value='`$prop.lcm.pnf.rollback.playbookname`'/>
+                                </set>
+                            </outcome>
+                            <outcome value='Other'>
+                                <set>
+                                    <parameter name='playbookname' value='`$payloadJson.playbook-name`'/>
+                                </set>
+                            </outcome>
+                        </switch>
+                    </block>
                 </outcome>
                 <outcome value='Other'>
                     <block>
-                        <return status='failure'>
-                            <parameter name='status.code' value='401' />
-                            <parameter name='status.message' value='Currently only support PNF.' />
-                        </return>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                            <parameter name='outputPath' value='playbookname' />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.rollback.playbookname'`" />
+                        </execute>
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
+	resource="generic-vnf" 
+		key="generic-vnf.vnf-id = $rollback-input.action-identifiers.vnf-id" 
+		local-only="false" 
+		pfx='aai.generic-vnf'>
+                            <outcome value='success'>
+                                <block>
+                                    <switch test='`$playbookname`'>
+                                        <outcome value=''>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
+                                                <parameter name='outputPath' value='playbookname' />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.rollback.playbookname'`" />
+                                            </execute>
+                                        </outcome>
+                                    </switch>
+                                    <set>
+                                        <parameter name='nodelist' value="`'[' + $quote + $aai.generic-vnf.ipv4-oam-address +  $quote + ']'`"/>
+                                    </set>
+                                </block>
+                            </outcome>
+                        </get-resource>
                     </block>
                 </outcome>
             </switch>
             <switch test='`$playbookname`'>
                 <outcome value=''>
                     <set>
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
                         <parameter name='playbookname' value='`$prop.lcm.rollback.playbookname`'/>
                     </set>
                 </outcome>
@@ -256,46 +291,29 @@
                                             <parameter name='isEscaped' value='false' />
                                         </execute>
                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
                                             <parameter name='outputPath' value='outputPayload' />
                                         </execute>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                        </set>
                                         <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                </set>
-                                            </outcome>
                                             <outcome value='Other'>
                                                 <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                                     <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
                                                 </set>
                                             </outcome>
@@ -362,46 +380,29 @@
                                             <parameter name='isEscaped' value='false' />
                                         </execute>
                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
-                                            <parameter name='source' value="`'resultsJson.' + $payloadJson.ipaddress-v4-oam + '.Output'`" />
+                                            <parameter name='source' value="`'resultsJson' + $outputPayloadField`" />
                                             <parameter name='outputPath' value='outputPayload' />
                                         </execute>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                            <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                        </set>
                                         <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                </set>
-                                            </outcome>
                                             <outcome value='Other'>
                                                 <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$rollback-input.common-header.request-id + '-' + $rollback-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='rollback'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$rollback-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$rollback-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$rollback-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$rollback-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$rollback-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$rollback-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$rollback-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$rollback-input.common-header.flags.ttl`'/>
-                                                    <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                    <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                                     <parameter name='lcm-dmaap.payload' value='`$outputPayload`'/>
                                                 </set>
                                             </outcome>