Fix set nodelist in SW upgrade DGs

[sdnc/oam.git] / platform-logic / lcm / src / main / xml / LCM_upgrade-pre-check.xml

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