summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dt5972@att.com>2018-05-13 09:50:34 -0400
committerTimoney, Dan (dt5972) <dt5972@att.com>2018-05-13 19:04:35 -0400
commit34a6429d9c0af51d2e29eb7a0d1d37c0babe1129 (patch)
treedec5bbd44d8176ea2cd60bafbe0785171deead20
parent355b437c3a4416f3b5c03dd2adeff3c2cefdb036 (diff)
Wrong id used to retrieve status
LCM DGs were using incoming request id to retrieve status from ansible server instead of id returned by ansible server in initial request. Also, ansible should be configured to ignore host key checking to avoid certificate issues. Change-Id: I0cf3d053de652985c4611f8c7d2b5dbee22e0791 Issue-ID: SDNC-313 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Former-commit-id: 4559d6203ab3f5706b6a2c1a898aa1df37407522
-rw-r--r--installation/ansible-server/src/main/scripts/startAnsibleServer.sh11
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json2
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json2
-rw-r--r--platform-logic/lcm/src/main/json/LCM_upgrade-software.json2
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-post-check.xml70
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml70
-rw-r--r--platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml70
-rw-r--r--platform-logic/setup/pom.xml4
8 files changed, 109 insertions, 122 deletions
diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
index f1e93168..c35f7864 100644
--- a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
+++ b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
@@ -3,14 +3,17 @@ exec &> >(tee -a "/var/log/ansible-server.log")
if [ ! -f /tmp/.ansible-server-installed ]
then
- pip install PyMySQL
- pip install cherrypy
- pip install requests
+ pip install PyMySQL
+ pip install cherrypy
+ pip install requests
apt-get -y install software-properties-common
apt-add-repository -y ppa:ansible/ansible
apt-get -y install ansible
- date > /tmp/.ansible-server-installed 2>&1
+
+ cp /etc/ansible/ansible.cfg /etc/ansible/ansible.cfg.orig
+ cat /etc/ansible/ansible.cfg.orig | sed -e 's/#host_key_checking/host_key_checking/' > /etc/ansible/ansible.cfg
+ date > /tmp/.ansible-server-installed 2>&1
fi
cd /opt/onap/sdnc
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
index b1447b20..96210495 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-post-check.json
@@ -114,7 +114,7 @@
]
],
"x": 936.0000305175781,
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$upgrade-post-check-input.common-header.request-id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-post-check.playbookname`'/>\n\t\n\n\n\n\n",
"y": 489.00003814697266,
"z": "9bf3d460.112078"
},
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
index b54fbe49..56f7b2ba 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-pre-check.json
@@ -114,7 +114,7 @@
]
],
"x": 946.0000305175781,
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$upgrade-pre-check-input.common-header.request-id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-pre-check.playbookname`'/>\n\t\n\n\n\n\n",
"y": 466.00003814697266,
"z": "c751ea25.6a3e48"
},
diff --git a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
index 7c351bd7..348f108f 100644
--- a/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
+++ b/platform-logic/lcm/src/main/json/LCM_upgrade-software.json
@@ -114,7 +114,7 @@
]
],
"x": 921.0000305175781,
- "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$upgrade-software-input.common-header.request-id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExecResult' >\n <parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n\t<parameter name='User' value='`$prop.ansible.user`'/>\n\t<parameter name='Password' value='`$prop.ansible.password`'/>\n\t<parameter name='Id' value='`$org.onap.appc.adapter.ansible.Id`'/>\n\t<parameter name='PlaybookName' value='`$prop.lcm.upgrade-software.playbookname`'/>\n\t\n\n\n\n\n",
"y": 503.00003814697266,
"z": "455a25b6.fcbc5c"
},
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 0cea28f3..92016c83 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
@@ -9,10 +9,6 @@
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@
<outcome value='not-found'>
<block>
<set>
- <parameter name='$org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@
</execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
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 9eed5056..13ff4a68 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-pre-check.xml
@@ -9,10 +9,6 @@
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@
<outcome value='not-found'>
<block>
<set>
- <parameter name='org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@
</execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
diff --git a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
index 96267890..07fcc82b 100644
--- a/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_upgrade-software.xml
@@ -9,10 +9,6 @@
<parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
<parameter name='contextPrefix' value='prop' />
</execute>
- <set>
- <parameter name='status.code' value='200' />
- <parameter name='status.message' value='unexpected return from DG' />
- </set>
<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter'
method='reqExec'>
<parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />
@@ -30,9 +26,9 @@
<outcome value='not-found'>
<block>
<set>
- <parameter name='$org.onap.appc.adapter.ansible.result.code'
- value='401' />
- <parameter name='org.onap.appc.adapter.ansible.message'
+ <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'
+ value='200' />
+ <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'
value='Ansible Adapter was not found' />
</set>
<block>
@@ -62,9 +58,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -85,9 +81,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</block>
@@ -120,9 +116,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
method='sendRequest'>
@@ -143,14 +139,14 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
<outcome value='Other'>
- <switch test="`$org.onap.appc.adapter.ansible.result.code`">
+ <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">
<outcome value='101'>
<block>
<set>
@@ -179,9 +175,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -203,9 +199,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -237,9 +233,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -261,9 +257,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -310,9 +306,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -335,9 +331,9 @@
</outcome>
</execute>
<return status='failure'>
- <parameter name='status.code' value='401' />
- <parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ <parameter name='error-code' value='200' />
+ <parameter name='error-message'
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
@@ -369,9 +365,9 @@
<parameter name='lcm-dmaap.payload'
value='`$org.onap.appc.adapter.ansible.results`' />
<parameter name='lcm-dmaap.status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='lcm-dmaap.status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</set>
<execute
plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
@@ -395,9 +391,9 @@
</execute>
<return status='success'>
<parameter name='status.code'
- value='`$org.onap.appc.adapter.ansible.result.code`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />
<parameter name='status.message'
- value='`$org.onap.appc.adapter.ansible.message`' />
+ value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />
</return>
</block>
</outcome>
diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index 3b3f13e1..fe58222e 100644
--- a/platform-logic/setup/pom.xml
+++ b/platform-logic/setup/pom.xml
@@ -17,10 +17,6 @@
<name>sdnc-oam :: platform-logic :: ${project.artifactId}</name>
<description>Copies base ONAP platform-logic</description>
- <properties>
- <ccsdk.distribution.version>0.2.1-SNAPSHOT</ccsdk.distribution.version>
- </properties>
-
<build>
<plugins>