<parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />\r
<parameter name='contextPrefix' value='prop' />\r
</execute>\r
+ <set>\r
+ <parameter name='status.code' value='200' />\r
+ <parameter name='status.message' value='unexpected return from DG' />\r
+ </set>\r
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\r
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
<parameter name='User' value='`$prop.ansible.user`'/>\r
<outcome value='not-found'>\r
<block>\r
<set>\r
- <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code' value='200'/>\r
- <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message' value='Ansible Adapter was not found'/>\r
+ <parameter name='$org.onap.appc.adapter.ansible.result.code' value='401'/>\r
+ <parameter name='org.onap.appc.adapter.ansible.message' value='Ansible Adapter was not found'/>\r
</set>\r
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='failure'>\r
- <parameter name='error-code' value='200' />\r
- <parameter name='error-message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
+ <parameter name='status.code' value='401' />\r
+ <parameter name='status.message' value='`$org.onap.appc.adapter.ansible.message`' />\r
</return>\r
</block>\r
</block>\r
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='failure'>\r
- <parameter name='error-code' value='200' />\r
- <parameter name='error-message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\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='Other'>\r
- <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
+ <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
<outcome value='101'>\r
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='failure'>\r
- <parameter name='error-code' value='200' />\r
- <parameter name='error-message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\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
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='failure'>\r
- <parameter name='error-code' value='200' />\r
- <parameter name='error-message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\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
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\r
<parameter name='User' value='`$prop.ansible.user`'/>\r
<parameter name='Password' value='`$prop.ansible.password`'/>\r
- <parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
+ <parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\r
<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\r
<outcome value='failure'>\r
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='failure'>\r
- <parameter name='error-code' value='200' />\r
- <parameter name='error-message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\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
<block>\r
<set>\r
<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\r
- <parameter name='lcm-dmaap.correlation-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
+ <parameter name='lcm-dmaap.correlation-id' value="`$upgrade-post-check-input.common-header.request-id + '-' + $upgrade-post-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-post-check'/>\r
<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\r
<parameter name='lcm-dmaap.timestamp' value='`$upgrade-post-check-input.common-header.timestamp`'/>\r
<parameter name='lcm-dmaap.api-ver' value='`$upgrade-post-check-input.common-header.api-ver`'/>\r
<parameter name='lcm-dmaap.originator-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
- <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.originator-id`'/>\r
+ <parameter name='lcm-dmaap.request-id' value='`$upgrade-post-check-input.common-header.request-id`'/>\r
<parameter name='lcm-dmaap.sub-request-id' value='`$upgrade-post-check-input.common-header.sub-request-id`'/>\r
<parameter name='lcm-dmaap.flags.mode' value='`$upgrade-post-check-input.common-header.flags.mode`'/>\r
<parameter name='lcm-dmaap.flags.force' value='`$upgrade-post-check-input.common-header.flags.force`'/>\r
<parameter name='lcm-dmaap.flags.ttl' value='`$upgrade-post-check-input.common-header.flags.ttl`'/>\r
- <parameter name='lcm-dmaap.payload' value='`$org.onap.appc.adapter.ansible.results`'/>\r
- <parameter name='lcm-dmaap.status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='lcm-dmaap.status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</outcome>\r
</execute>\r
<return status='success'>\r
- <parameter name='status.code' value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
- <parameter name='status.message' value='`$org.onap.ccsdk.sli.adaptors.ansible.message`'/>\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
</block>\r
</method>\r
-</service-logic>
\ No newline at end of file
+</service-logic>\r