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

diff --git a/installation/ansible-server/src/main/scripts/startAnsibleServer.sh b/installation/ansible-server/src/main/scripts/startAnsibleServer.sh
index f1e9316..c35f786 100644 (file)
--- 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 b1447b2..9621049 100644 (file)
--- 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 b54fbe4..56f7b2b 100644 (file)
--- 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 7c351bd..348f108 100644 (file)
--- 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 0cea28f..92016c8 100644 (file)
--- 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' />\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'\r
                                method='reqExec'>\r
                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
@@ -30,9 +26,9 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.appc.adapter.ansible.result.code'\r
-                                                               value='401' />\r
-                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
+                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
+                                                               value='200' />\r
+                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
@@ -62,9 +58,9 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </set>\r
                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
@@ -85,9 +81,9 @@
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='status.code' value='401' />\r
-                                                               <parameter name='status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               <parameter name='error-code' value='200' />\r
+                                                               <parameter name='error-message'\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -120,9 +116,9 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </set>\r
                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
@@ -143,14 +139,14 @@
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='status.code' value='401' />\r
-                                                       <parameter name='status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                       <parameter name='error-code' value='200' />\r
+                                                       <parameter name='error-message'\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
@@ -179,9 +175,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -203,9 +199,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -237,9 +233,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -261,9 +257,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -310,9 +306,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -335,9 +331,9 @@
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='status.code' value='401' />\r
-                                                                                       <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                       <parameter name='error-code' value='200' />\r
+                                                                                       <parameter name='error-message'\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
@@ -369,9 +365,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -395,9 +391,9 @@
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r

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 9eed505..13ff4a6 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
@@ -9,10 +9,6 @@
                                <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'\r
                                method='reqExec'>\r
                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
@@ -30,9 +26,9 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='org.onap.appc.adapter.ansible.result.code'\r
-                                                               value='401' />\r
-                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
+                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
+                                                               value='200' />\r
+                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
@@ -62,9 +58,9 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </set>\r
                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
@@ -85,9 +81,9 @@
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='status.code' value='401' />\r
-                                                               <parameter name='status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               <parameter name='error-code' value='200' />\r
+                                                               <parameter name='error-message'\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -120,9 +116,9 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </set>\r
                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
@@ -143,14 +139,14 @@
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='status.code' value='401' />\r
-                                                       <parameter name='status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                       <parameter name='error-code' value='200' />\r
+                                                       <parameter name='error-message'\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
@@ -179,9 +175,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -203,9 +199,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -237,9 +233,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -261,9 +257,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -310,9 +306,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -335,9 +331,9 @@
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='status.code' value='401' />\r
-                                                                                       <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                       <parameter name='error-code' value='200' />\r
+                                                                                       <parameter name='error-message'\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
@@ -369,9 +365,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -395,9 +391,9 @@
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r

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 9626789..07fcc82 100644 (file)
--- 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' />\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'\r
                                method='reqExec'>\r
                                <parameter name='AgentUrl' value='`$prop.ansible.agenturl`' />\r
@@ -30,9 +26,9 @@
                                <outcome value='not-found'>\r
                                        <block>\r
                                                <set>\r
-                                                       <parameter name='$org.onap.appc.adapter.ansible.result.code'\r
-                                                               value='401' />\r
-                                                       <parameter name='org.onap.appc.adapter.ansible.message'\r
+                                                       <parameter name='$org.onap.ccsdk.sli.adaptors.ansible.result.code'\r
+                                                               value='200' />\r
+                                                       <parameter name='org.onap.ccsdk.sli.adaptors.ansible.message'\r
                                                                value='Ansible Adapter was not found' />\r
                                                </set>\r
                                                <block>\r
@@ -62,9 +58,9 @@
                                                                <parameter name='lcm-dmaap.payload'\r
                                                                        value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                <parameter name='lcm-dmaap.status.code'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                <parameter name='lcm-dmaap.status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </set>\r
                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                                method='sendRequest'>\r
@@ -85,9 +81,9 @@
                                                                </outcome>\r
                                                        </execute>\r
                                                        <return status='failure'>\r
-                                                               <parameter name='status.code' value='401' />\r
-                                                               <parameter name='status.message'\r
-                                                                       value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               <parameter name='error-code' value='200' />\r
+                                                               <parameter name='error-message'\r
+                                                                       value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                        </return>\r
                                                </block>\r
                                        </block>\r
@@ -120,9 +116,9 @@
                                                        <parameter name='lcm-dmaap.payload'\r
                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </set>\r
                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
                                                        method='sendRequest'>\r
@@ -143,14 +139,14 @@
                                                        </outcome>\r
                                                </execute>\r
                                                <return status='failure'>\r
-                                                       <parameter name='status.code' value='401' />\r
-                                                       <parameter name='status.message'\r
-                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                       <parameter name='error-code' value='200' />\r
+                                                       <parameter name='error-message'\r
+                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                </return>\r
                                        </block>\r
                                </outcome>\r
                                <outcome value='Other'>\r
-                                       <switch test="`$org.onap.appc.adapter.ansible.result.code`">\r
+                                       <switch test="`$org.onap.ccsdk.sli.adaptors.ansible.result.code`">\r
                                                <outcome value='101'>\r
                                                        <block>\r
                                                                <set>\r
@@ -179,9 +175,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -203,9 +199,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -237,9 +233,9 @@
                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </set>\r
                                                                <execute\r
                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -261,9 +257,9 @@
                                                                        </outcome>\r
                                                                </execute>\r
                                                                <return status='failure'>\r
-                                                                       <parameter name='status.code' value='401' />\r
-                                                                       <parameter name='status.message'\r
-                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                       <parameter name='error-code' value='200' />\r
+                                                                       <parameter name='error-message'\r
+                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                </return>\r
                                                        </block>\r
                                                </outcome>\r
@@ -310,9 +306,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -335,9 +331,9 @@
                                                                                        </outcome>\r
                                                                                </execute>\r
                                                                                <return status='failure'>\r
-                                                                                       <parameter name='status.code' value='401' />\r
-                                                                                       <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                       <parameter name='error-code' value='200' />\r
+                                                                                       <parameter name='error-message'\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r
@@ -369,9 +365,9 @@
                                                                                        <parameter name='lcm-dmaap.payload'\r
                                                                                                value='`$org.onap.appc.adapter.ansible.results`' />\r
                                                                                        <parameter name='lcm-dmaap.status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='lcm-dmaap.status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </set>\r
                                                                                <execute\r
                                                                                        plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'\r
@@ -395,9 +391,9 @@
                                                                                </execute>\r
                                                                                <return status='success'>\r
                                                                                        <parameter name='status.code'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.result.code`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.result.code`' />\r
                                                                                        <parameter name='status.message'\r
-                                                                                               value='`$org.onap.appc.adapter.ansible.message`' />\r
+                                                                                               value='`$org.onap.ccsdk.sli.adaptors.ansible.message`' />\r
                                                                                </return>\r
                                                                        </block>\r
                                                                </outcome>\r

diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml
index 3b3f13e..fe58222 100644 (file)
--- 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>