X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=blobdiff_plain;f=platform-logic%2Flcm%2Fsrc%2Fmain%2Fxml%2FLCM_upgrade-post-check.xml;h=4a88aac4a4f5134bda9f025628980e0a1c15523b;hp=a772373d4db8b87112d92fc87e9c6e1b53207294;hb=8678b8107f69149491feee1ed756cb37fdaebc02;hpb=3bd83a42221c4f5c0cbaf586657e5310c8516018

diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
index a772373d..4a88aac4 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml
@@ -57,7 +57,6 @@
             <switch test='`$playbookname`'>
                 <outcome value=''>
                     <set>
-                        <parameter name='nodelist' value="`$prop.ansible.nodelist`"/>
                         <parameter name='playbookname' value='`$prop.lcm.upgrade-post-check.playbookname`'/>
                     </set>
                 </outcome>
@@ -271,56 +270,23 @@
                                 <parameter name='PlaybookName' value='`$playbookname`'/>
                                 <outcome value='failure'>
                                     <block>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
-                                            <parameter name='outputPath' value='resultsJson' />
-                                            <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='outputPath' value='outputPayload' />
-                                        </execute>
-                                        <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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>
-                                        </switch>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -337,96 +303,31 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
-                                                    <outcome value='400'>
-                                                        <return status='success'>
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='status.code' value='401' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                            <outcome value='Other'>
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
-                                                    <outcome value='400'>
-                                                        <return status='success'>
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                            <parameter name='payload' value='`$outputPayload`'/>
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='status.code' value='401' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                                            <parameter name='payload' value='`$outputPayload`'/>
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                        </switch>
+                                        <return status='failure'>
+                                            <parameter name='status.code' value='401' />
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
+                                        </return>
                                     </block>
                                 </outcome>
                                 <outcome value='success'>
                                     <block>
-                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                                            <parameter name='source' value='org.onap.appc.adapter.ansible.results' />
-                                            <parameter name='outputPath' value='resultsJson' />
-                                            <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='outputPath' value='outputPayload' />
-                                        </execute>
-                                        <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <set>
-                                                    <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                                    <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
-                                                    <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                                    <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
-                                                    <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                                    <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
-                                                    <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
-                                                    <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
-                                                    <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
-                                                    <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
-                                                    <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
-                                                    <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
-                                                    <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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>
-                                        </switch>
+                                        <set>
+                                            <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-check-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='upgrade-post-check'/>
+                                            <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-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>
                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                             <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.lcm.dmaap.publish.templatefile`" />
                                             <parameter name='restapiUrl' value='`$prop.lcm.dmaap.url`' />
@@ -443,42 +344,10 @@
                                                 </record>
                                             </outcome>
                                         </execute>
-                                        <switch test='`$outputPayload`'>
-                                            <outcome value=''>
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
-                                                    <outcome value='400'>
-                                                        <return status='success'>
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='status.code' value='401' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                            <outcome value='Other'>
-                                                <switch test="`$org.onap.appc.adapter.ansible.result.code`">
-                                                    <outcome value='400'>
-                                                        <return status='success'>
-                                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
-                                                            <parameter name='payload' value='`$outputPayload`'/>
-                                                        </return>
-                                                    </outcome>
-                                                    <outcome value='Other'>
-                                                        <return status='failure'>
-                                                            <parameter name='status.code' value='401' />
-                                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />
-                                                            <parameter name='payload' value='`$outputPayload`'/>
-                                                        </return>
-                                                    </outcome>
-                                                </switch>
-                                            </outcome>
-                                        </switch>
+                                        <return status='success'>
+                                            <parameter name='status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
+                                            <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
+                                        </return>
                                     </block>
                                 </outcome>
                             </execute>