From: Enbo Wang <wangenbo@huawei.com>
Date: Tue, 7 Jan 2020 09:16:32 +0000 (+0800)
Subject: Fix DG names of downloadNESw and activateNESw
X-Git-Tag: 1.8.0~28
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=refs%2Fchanges%2F41%2F100041%2F4

Fix DG names of downloadNESw and activateNESw

Change-Id: I441922915dca6f6e756f1b002e90e42bbb971357
Issue-ID: SDNC-857
Signed-off-by: Enbo Wang <wangenbo@huawei.com>

Former-commit-id: 78a1f2ec89fcbf01e6bf0d28128820b3a88818bf
---

diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
index bee98aa7..e25d2e61 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_activatenesw@0.00.yml
@@ -2,16 +2,16 @@
 - hosts: all
   tasks:
 
-  - name: parameter neIdentifier
-    set_fact:
-      ne_identifier: "{{neIdentifier}}"
-    when: neIdentifier is defined
-
   - name: parameter swVersionToBeActivated
     set_fact:
       sw_version_to_be_activated: "{{swVersionToBeActivated}}"
     when: swVersionToBeActivated is defined
 
+  - name: parameter neIdentifier
+    set_fact:
+      ne_identifier: "{{neIdentifier}}"
+    when: neIdentifier is defined
+
   - name: compatible with parameter pnfId
     set_fact:
       ne_identifier: "{{pnfId}}"
diff --git a/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml b/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
index 77bc21b3..10e25b34 100644
--- a/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
+++ b/installation/ansible-server/src/main/Playbooks/ansible_huawei_downloadnesw@0.00.yml
@@ -2,23 +2,23 @@
 - hosts: all
   tasks:
 
-  - name: parameter neIdentifier
-    set_fact:
-      ne_identifier: "{{neIdentifier}}"
-    when: neIdentifier is defined
-
   - name: parameter swToBeDownloaded
     set_fact:
       sw_to_be_downloaded: "{{swToBeDownloaded}}"
     when: swToBeDownloaded is defined
 
+  - name: parameter neIdentifier
+    set_fact:
+      ne_identifier: "{{neIdentifier}}"
+    when: neIdentifier is defined
+
   - name: compatible with parameter pnfId
     set_fact:
       ne_identifier: "{{pnfId}}"
     when: neIdentifier is not defined and pnfId is defined
 
   - name: execute downloadNESw operation
-    shell: ./swm/downloadNESw --neIdentifier {{ne_identifier}} --swToBeDownloaded {{sw_to_be_downloaded}}
+    shell: ./swm/downloadNESw --swToBeDownloaded {{sw_to_be_downloaded}} --neIdentifier {{ne_identifier}}
     ignore_errors: yes
     register: download_result
 
diff --git a/installation/src/main/properties/lcm-dg.properties b/installation/src/main/properties/lcm-dg.properties
index d36fcf81..a4cfc4aa 100644
--- a/installation/src/main/properties/lcm-dg.properties
+++ b/installation/src/main/properties/lcm-dg.properties
@@ -9,14 +9,14 @@ ansible.version=0.00
 lcm.upgrade-pre-check.playbookname=ansible_precheck
 lcm.upgrade-post-check.playbookname=ansible_postcheck
 lcm.upgrade-software.playbookname=ansible_upgradesw
-lcm.download-ne-sw.playbookname=ansible_downloadnesw
-lcm.activate-ne-sw.playbookname=ansible_activatenesw
+lcm.download-n-e-sw.playbookname=ansible_downloadnesw
+lcm.activate-n-e-sw.playbookname=ansible_activatenesw
 lcm.rollback.playbookname=ansible_rollback
 lcm.pnf.upgrade-pre-check.playbookname=ansible_precheck_pnf
 lcm.pnf.upgrade-post-check.playbookname=ansible_postcheck_pnf
 lcm.pnf.upgrade-software.playbookname=ansible_upgradesw_pnf
-lcm.pnf.download-ne-sw.playbookname=ansible_huawei_downloadnesw
-lcm.pnf.activate-ne-sw.playbookname=ansible_huawei_activatenesw
+lcm.pnf.download-n-e-sw.playbookname=ansible_downloadnesw_pnf
+lcm.pnf.activate-n-e-sw.playbookname=ansible_activatenesw_pnf
 lcm.pnf.rollback.playbookname=ansible_rollback_pnf
 lcm.quiesce-traffic.playbookname=ansible_quiescetraffic
 lcm.resume-traffic.playbookname=ansible_resumetraffic
diff --git a/platform-logic/lcm/src/main/json/LCM_activate-ne-sw.json b/platform-logic/lcm/src/main/json/LCM_activate-n-e-sw.json
similarity index 87%
rename from platform-logic/lcm/src/main/json/LCM_activate-ne-sw.json
rename to platform-logic/lcm/src/main/json/LCM_activate-n-e-sw.json
index 1db43dfa..1483cebd 100644
--- a/platform-logic/lcm/src/main/json/LCM_activate-ne-sw.json
+++ b/platform-logic/lcm/src/main/json/LCM_activate-n-e-sw.json
@@ -2,8 +2,8 @@
     {
         "id": "7a48a318.a0c2cc",
         "type": "method",
-        "name": "activate-ne-sw",
-        "xml": "<method rpc='activate-ne-sw' mode='sync'>\n",
+        "name": "activate-n-e-sw",
+        "xml": "<method rpc='activate-n-e-sw' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 526.75,
@@ -37,7 +37,7 @@
         "id": "af9cc402.0df8d8",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$activate-ne-sw-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$activate-ne-sw-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$activate-n-e-sw-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$activate-n-e-sw-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
         "x": 428.75001525878906,
@@ -376,7 +376,7 @@
         "id": "7ffa87f6.e152c8",
         "type": "set",
         "name": "set DmaapReq",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
         "x": 1626.7498779296875,
         "y": 623.8333740234375,
@@ -409,7 +409,7 @@
         "id": "c2b9b6ea.5a9d68",
         "type": "set",
         "name": "set DmaapReq",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
         "x": 1661.9166564941406,
         "y": 856.5833864212036,
@@ -476,7 +476,7 @@
         "id": "da55f644.1843a8",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $activate-ne-sw-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $activate-n-e-sw-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
         "x": 1005.75,
@@ -539,7 +539,7 @@
         "id": "8345e48f.70abe8",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='activate-ne-sw-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='activate-n-e-sw-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
         "x": 479.75,
@@ -614,7 +614,7 @@
         "id": "45bfd380.dd46ec",
         "type": "execute",
         "name": "set playbookname",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.activate-ne-sw.playbookname'`\" />\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.activate-n-e-sw.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1014.75,
@@ -660,7 +660,7 @@
         "id": "731bf1bc.6221a",
         "type": "set",
         "name": "set playbookname",
-        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.activate-ne-sw.playbookname`'/>",
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.activate-n-e-sw.playbookname`'/>",
         "comments": "",
         "x": 805.75,
         "y": 502.75,
@@ -792,7 +792,7 @@
         "id": "b348096f.426488",
         "type": "execute",
         "name": "set playbookname",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.activate-ne-sw.playbookname'`\" />\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.activate-n-e-sw.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1839.75,
@@ -1135,7 +1135,7 @@
         "id": "c5a71ca3.66b2f",
         "type": "set",
         "name": "set playbookname from prop",
-        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.activate-ne-sw.playbookname`'/>\n",
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.activate-n-e-sw.playbookname`'/>\n",
         "comments": "",
         "x": 1411.2500228881836,
         "y": 276.25000381469727,
@@ -1153,4 +1153,4 @@
         "z": "80e400ee.d5d12",
         "wires": []
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/lcm/src/main/json/LCM_download-ne-sw.json b/platform-logic/lcm/src/main/json/LCM_download-n-e-sw.json
similarity index 87%
rename from platform-logic/lcm/src/main/json/LCM_download-ne-sw.json
rename to platform-logic/lcm/src/main/json/LCM_download-n-e-sw.json
index 62532b53..c8c37ded 100644
--- a/platform-logic/lcm/src/main/json/LCM_download-ne-sw.json
+++ b/platform-logic/lcm/src/main/json/LCM_download-n-e-sw.json
@@ -2,8 +2,8 @@
     {
         "id": "55ea77c7.c7aaf8",
         "type": "method",
-        "name": "download-ne-sw",
-        "xml": "<method rpc='download-ne-sw' mode='sync'>\n",
+        "name": "download-n-e-sw",
+        "xml": "<method rpc='download-n-e-sw' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 517.5,
@@ -37,7 +37,7 @@
         "id": "3c12dd23.f55fc2",
         "type": "execute",
         "name": "execute AnsibleA.reqExec",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$download-ne-sw-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$download-ne-sw-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter' method='reqExec' >\n<parameter name='AgentUrl' value='`$prop.ansible.agenturl`'/>\n<parameter name='User' value='`$prop.ansible.user`'/>\n<parameter name='Password' value='`$prop.ansible.password`'/>\n<parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>\n<parameter name='EnvParameters' value='`$download-n-e-sw-input.payload`'/>\n<parameter name='NodeList' value=\"`$nodelist`\"/>\n<parameter name='Timeout' value='`$prop.ansible.timeout`'/>\n<parameter name='Version' value='`$prop.ansible.version`'/>\n<parameter name='Id' value='`$download-n-e-sw-input.common-header.request-id`'/>\n<parameter name='PlaybookName' value='`$playbookname`'/>",
         "comments": "",
         "outputs": 1,
         "x": 419.50001525878906,
@@ -376,7 +376,7 @@
         "id": "ef1fd87.e819d28",
         "type": "set",
         "name": "set DmaapReq",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
         "x": 1617.4998779296875,
         "y": 646.5833740234375,
@@ -409,7 +409,7 @@
         "id": "f3261d43.39148",
         "type": "set",
         "name": "set DmaapReq",
-        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
+        "xml": "<set>\n<parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>\n<parameter name='lcm-dmaap.correlation-id' value=\"`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`\"/>\n<parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>\n<parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>\n<parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>\n<parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>\n<parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>\n<parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>\n<parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>\n<parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>\n<parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>\n<parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>\n<parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>\n<parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />\n<parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>\n",
         "comments": "",
         "x": 1652.6666564941406,
         "y": 879.3333864212036,
@@ -476,7 +476,7 @@
         "id": "2ec58c40.3b0264",
         "type": "get-resource",
         "name": "get aai.generic-vnf ",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $download-ne-sw-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $download-n-e-sw-input.action-identifiers.vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx='aai.generic-vnf'>",
         "comments": "",
         "outputs": 1,
         "x": 996.5,
@@ -539,7 +539,7 @@
         "id": "b01a324f.c5221",
         "type": "execute",
         "name": "execute jsonStringToCtx",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='download-ne-sw-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>\n\t<parameter name='source' value='download-n-e-sw-input.payload' />\n\t<parameter name='outputPath' value='payloadJson' />\n\t<parameter name='isEscaped' value='true' />",
         "comments": "",
         "outputs": 1,
         "x": 470.5,
@@ -614,7 +614,7 @@
         "id": "413ce905.d63568",
         "type": "execute",
         "name": "set playbookname",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.download-ne-sw.playbookname'`\" />\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $payloadJson.nf-naming-code + '.download-n-e-sw.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1005.5,
@@ -660,7 +660,7 @@
         "id": "8b7cb986.cf8ca8",
         "type": "set",
         "name": "set playbookname",
-        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.download-ne-sw.playbookname`'/>",
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.download-n-e-sw.playbookname`'/>",
         "comments": "",
         "x": 796.5,
         "y": 525.5,
@@ -792,7 +792,7 @@
         "id": "bb5ab3e9.32bfe",
         "type": "execute",
         "name": "set playbookname",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.download-ne-sw.playbookname'`\" />\n\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>\n\t<parameter name='outputPath' value='playbookname' />\n\t<parameter name='source' value=\"`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.download-n-e-sw.playbookname'`\" />\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1830.5,
@@ -1135,7 +1135,7 @@
         "id": "85b8a591.020658",
         "type": "set",
         "name": "set playbookname from prop",
-        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.download-ne-sw.playbookname`'/>\n",
+        "xml": "<set>\n<parameter name='playbookname' value='`$prop.lcm.pnf.download-n-e-sw.playbookname`'/>\n",
         "comments": "",
         "x": 1402.0000228881836,
         "y": 299.00000381469727,
@@ -1153,4 +1153,4 @@
         "z": "aaefae8.7cdde5",
         "wires": []
     }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/lcm/src/main/resources/graph.versions b/platform-logic/lcm/src/main/resources/graph.versions
index 0da4e087..f1f1c704 100644
--- a/platform-logic/lcm/src/main/resources/graph.versions
+++ b/platform-logic/lcm/src/main/resources/graph.versions
@@ -1,6 +1,6 @@
 LCM upgrade-software ${project.version} sync
-LCM download-ne-sw ${project.version} sync
-LCM activate-ne-sw ${project.version} sync
+LCM download-n-e-sw ${project.version} sync
+LCM activate-n-e-sw ${project.version} sync
 LCM upgrade-post-check ${project.version} sync
 LCM upgrade-pre-check ${project.version} sync
 LCM upgrade-backup ${project.version} sync
diff --git a/platform-logic/lcm/src/main/xml/LCM_activate-ne-sw.xml b/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml
similarity index 86%
rename from platform-logic/lcm/src/main/xml/LCM_activate-ne-sw.xml
rename to platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml
index fe46a306..319581c2 100644
--- a/platform-logic/lcm/src/main/xml/LCM_activate-ne-sw.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_activate-n-e-sw.xml
@@ -1,7 +1,7 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>
-    <method rpc='activate-ne-sw' mode='sync'>
+    <method rpc='activate-n-e-sw' mode='sync'>
         <block>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
@@ -14,7 +14,7 @@
                 <parameter name='outputPayloadField' value='.Output' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                <parameter name='source' value='activate-ne-sw-input.payload' />
+                <parameter name='source' value='activate-n-e-sw-input.payload' />
                 <parameter name='outputPath' value='payloadJson' />
                 <parameter name='isEscaped' value='true' />
             </execute>
@@ -28,7 +28,7 @@
                         <switch test='`$payloadJson.playbook-name`'>
                             <outcome value=''>
                                 <set>
-                                    <parameter name='playbookname' value='`$prop.lcm.pnf.activate-ne-sw.playbookname`'/>
+                                    <parameter name='playbookname' value='`$prop.lcm.pnf.activate-n-e-sw.playbookname`'/>
                                 </set>
                             </outcome>
                             <outcome value='Other'>
@@ -43,11 +43,11 @@
                     <block>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                             <parameter name='outputPath' value='playbookname' />
-                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.activate-ne-sw.playbookname'`" />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.activate-n-e-sw.playbookname'`" />
                         </execute>
                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
-		key="generic-vnf.vnf-id = $activate-ne-sw-input.action-identifiers.vnf-id" 
+		key="generic-vnf.vnf-id = $activate-n-e-sw-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
                             <outcome value='success'>
@@ -56,7 +56,7 @@
                                         <outcome value=''>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                                                 <parameter name='outputPath' value='playbookname' />
-                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.activate-ne-sw.playbookname'`" />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.activate-n-e-sw.playbookname'`" />
                                             </execute>
                                         </outcome>
                                     </switch>
@@ -72,7 +72,7 @@
             <switch test='`$playbookname`'>
                 <outcome value=''>
                     <set>
-                        <parameter name='playbookname' value='`$prop.lcm.activate-ne-sw.playbookname`'/>
+                        <parameter name='playbookname' value='`$prop.lcm.activate-n-e-sw.playbookname`'/>
                     </set>
                 </outcome>
             </switch>
@@ -98,11 +98,11 @@
                 <parameter name='User' value='`$prop.ansible.user`'/>
                 <parameter name='Password' value='`$prop.ansible.password`'/>
                 <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>
-                <parameter name='EnvParameters' value='`$activate-ne-sw-input.payload`'/>
+                <parameter name='EnvParameters' value='`$activate-n-e-sw-input.payload`'/>
                 <parameter name='NodeList' value="`$nodelist`"/>
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
-                <parameter name='Id' value='`$activate-ne-sw-input.common-header.request-id`'/>
+                <parameter name='Id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
                 <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
@@ -113,18 +113,18 @@
                         <block>
                             <set>
                                 <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                                <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                                 <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                                <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                                 <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                                <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                                <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                                <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                                <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                                <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                                <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                                <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                                <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                                <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                                <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                                <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                                <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                                <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                                <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                                <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                                 <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                 <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                             </set>
@@ -155,18 +155,18 @@
                     <block>
                         <set>
                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                            <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                            <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                            <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                            <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                            <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                            <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                            <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                            <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                            <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                            <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                            <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                            <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                         </set>
@@ -198,18 +198,18 @@
                             <block>
                                 <set>
                                     <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                    <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                                     <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                    <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                                     <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                    <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                                    <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                                    <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                                    <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                                    <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                                    <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                                    <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                                    <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                                     <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                     <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                 </set>
@@ -239,18 +239,18 @@
                             <block>
                                 <set>
                                     <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                    <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                                     <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                    <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                                     <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                    <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                                    <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                                    <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                                    <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                                    <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                                    <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                                    <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                                    <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                                     <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                     <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                 </set>
@@ -296,18 +296,18 @@
                                         </execute>
                                         <set>
                                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                         </set>
@@ -385,18 +385,18 @@
                                         </execute>
                                         <set>
                                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-ne-sw-input.common-header.request-id + '-' + $activate-ne-sw-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$activate-n-e-sw-input.common-header.request-id + '-' + $activate-n-e-sw-input.common-header.sub-request-id`"/>
                                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='activate-ne-sw'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='activate-n-e-sw'/>
                                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$activate-ne-sw-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$activate-ne-sw-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$activate-ne-sw-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$activate-ne-sw-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-ne-sw-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-ne-sw-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$activate-ne-sw-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-ne-sw-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$activate-n-e-sw-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$activate-n-e-sw-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$activate-n-e-sw-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$activate-n-e-sw-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$activate-n-e-sw-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$activate-n-e-sw-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$activate-n-e-sw-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$activate-n-e-sw-input.common-header.flags.ttl`'/>
                                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                         </set>
@@ -468,4 +468,4 @@
             </execute>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
diff --git a/platform-logic/lcm/src/main/xml/LCM_download-ne-sw.xml b/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml
similarity index 86%
rename from platform-logic/lcm/src/main/xml/LCM_download-ne-sw.xml
rename to platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml
index 7f8321bb..20844c31 100644
--- a/platform-logic/lcm/src/main/xml/LCM_download-ne-sw.xml
+++ b/platform-logic/lcm/src/main/xml/LCM_download-n-e-sw.xml
@@ -1,7 +1,7 @@
 <service-logic
     xmlns='http://www.onap.org/sdnc/svclogic'
     xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='LCM' version='${project.version}'>
-    <method rpc='download-ne-sw' mode='sync'>
+    <method rpc='download-n-e-sw' mode='sync'>
         <block>
             <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
                 <parameter name='fileName' value='%SDNC_CONFIG_DIR%/lcm-dg.properties' />
@@ -14,7 +14,7 @@
                 <parameter name='outputPayloadField' value='.Output' />
             </set>
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='jsonStringToCtx'>
-                <parameter name='source' value='download-ne-sw-input.payload' />
+                <parameter name='source' value='download-n-e-sw-input.payload' />
                 <parameter name='outputPath' value='payloadJson' />
                 <parameter name='isEscaped' value='true' />
             </execute>
@@ -28,7 +28,7 @@
                         <switch test='`$payloadJson.playbook-name`'>
                             <outcome value=''>
                                 <set>
-                                    <parameter name='playbookname' value='`$prop.lcm.pnf.download-ne-sw.playbookname`'/>
+                                    <parameter name='playbookname' value='`$prop.lcm.pnf.download-n-e-sw.playbookname`'/>
                                 </set>
                             </outcome>
                             <outcome value='Other'>
@@ -43,11 +43,11 @@
                     <block>
                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                             <parameter name='outputPath' value='playbookname' />
-                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.download-ne-sw.playbookname'`" />
+                            <parameter name='source' value="`'prop.lcm.' + $payloadJson.nf-naming-code + '.download-n-e-sw.playbookname'`" />
                         </execute>
                         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="generic-vnf" 
-		key="generic-vnf.vnf-id = $download-ne-sw-input.action-identifiers.vnf-id" 
+		key="generic-vnf.vnf-id = $download-n-e-sw-input.action-identifiers.vnf-id" 
 		local-only="false" 
 		pfx='aai.generic-vnf'>
                             <outcome value='success'>
@@ -56,7 +56,7 @@
                                         <outcome value=''>
                                             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='getAttributeValue'>
                                                 <parameter name='outputPath' value='playbookname' />
-                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.download-ne-sw.playbookname'`" />
+                                                <parameter name='source' value="`'prop.lcm.' + $aai.generic-vnf.nf-naming-code + '.download-n-e-sw.playbookname'`" />
                                             </execute>
                                         </outcome>
                                     </switch>
@@ -72,7 +72,7 @@
             <switch test='`$playbookname`'>
                 <outcome value=''>
                     <set>
-                        <parameter name='playbookname' value='`$prop.lcm.download-ne-sw.playbookname`'/>
+                        <parameter name='playbookname' value='`$prop.lcm.download-n-e-sw.playbookname`'/>
                     </set>
                 </outcome>
             </switch>
@@ -98,11 +98,11 @@
                 <parameter name='User' value='`$prop.ansible.user`'/>
                 <parameter name='Password' value='`$prop.ansible.password`'/>
                 <parameter name='LocalParameters' value='`$prop.ansible.lcm.localparameters`'/>
-                <parameter name='EnvParameters' value='`$download-ne-sw-input.payload`'/>
+                <parameter name='EnvParameters' value='`$download-n-e-sw-input.payload`'/>
                 <parameter name='NodeList' value="`$nodelist`"/>
                 <parameter name='Timeout' value='`$prop.ansible.timeout`'/>
                 <parameter name='Version' value='`$prop.ansible.version`'/>
-                <parameter name='Id' value='`$download-ne-sw-input.common-header.request-id`'/>
+                <parameter name='Id' value='`$download-n-e-sw-input.common-header.request-id`'/>
                 <parameter name='PlaybookName' value='`$playbookname`'/>
                 <outcome value='not-found'>
                     <block>
@@ -113,18 +113,18 @@
                         <block>
                             <set>
                                 <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                                <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                                 <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                                <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                                 <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                                <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                                <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                                <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                                <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                                <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                                <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                                <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                                <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                                <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                                <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                                <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                                <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                                <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                                <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                                <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                                 <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                 <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                             </set>
@@ -155,18 +155,18 @@
                     <block>
                         <set>
                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                            <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                            <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                            <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                            <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                            <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                            <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                            <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                            <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                            <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                            <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                            <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                            <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                            <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                            <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                            <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                            <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                         </set>
@@ -198,18 +198,18 @@
                             <block>
                                 <set>
                                     <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                    <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                                     <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                    <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                                     <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                    <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                                    <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                                    <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                                    <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                                    <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                                    <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                                    <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                                    <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                                     <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                     <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                 </set>
@@ -239,18 +239,18 @@
                             <block>
                                 <set>
                                     <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                    <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                                    <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                                     <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                    <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                                    <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                                     <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                    <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                                    <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                                    <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                                    <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                                    <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                                    <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                                    <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                                    <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                                    <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                                    <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                                    <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                                    <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                                    <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                                    <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                                    <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                                    <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                                     <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                     <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                 </set>
@@ -296,18 +296,18 @@
                                         </execute>
                                         <set>
                                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                         </set>
@@ -385,18 +385,18 @@
                                         </execute>
                                         <set>
                                             <parameter name='lcm-dmaap.version' value='`$prop.lcm.dmaap.version`'/>
-                                            <parameter name='lcm-dmaap.correlation-id' value="`$download-ne-sw-input.common-header.request-id + '-' + $download-ne-sw-input.common-header.sub-request-id`"/>
+                                            <parameter name='lcm-dmaap.correlation-id' value="`$download-n-e-sw-input.common-header.request-id + '-' + $download-n-e-sw-input.common-header.sub-request-id`"/>
                                             <parameter name='lcm-dmaap.partition' value='`$prop.lcm.dmaap.partition`'/>
-                                            <parameter name='lcm-dmaap.rpc-name' value='download-ne-sw'/>
+                                            <parameter name='lcm-dmaap.rpc-name' value='download-n-e-sw'/>
                                             <parameter name='lcm-dmaap.type' value='`$prop.lcm.dmaap.type`'/>
-                                            <parameter name='lcm-dmaap.timestamp' value='`$download-ne-sw-input.common-header.timestamp`'/>
-                                            <parameter name='lcm-dmaap.api-ver' value='`$download-ne-sw-input.common-header.api-ver`'/>
-                                            <parameter name='lcm-dmaap.originator-id' value='`$download-ne-sw-input.common-header.originator-id`'/>
-                                            <parameter name='lcm-dmaap.request-id' value='`$download-ne-sw-input.common-header.request-id`'/>
-                                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-ne-sw-input.common-header.sub-request-id`'/>
-                                            <parameter name='lcm-dmaap.flags.mode' value='`$download-ne-sw-input.common-header.flags.mode`'/>
-                                            <parameter name='lcm-dmaap.flags.force' value='`$download-ne-sw-input.common-header.flags.force`'/>
-                                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-ne-sw-input.common-header.flags.ttl`'/>
+                                            <parameter name='lcm-dmaap.timestamp' value='`$download-n-e-sw-input.common-header.timestamp`'/>
+                                            <parameter name='lcm-dmaap.api-ver' value='`$download-n-e-sw-input.common-header.api-ver`'/>
+                                            <parameter name='lcm-dmaap.originator-id' value='`$download-n-e-sw-input.common-header.originator-id`'/>
+                                            <parameter name='lcm-dmaap.request-id' value='`$download-n-e-sw-input.common-header.request-id`'/>
+                                            <parameter name='lcm-dmaap.sub-request-id' value='`$download-n-e-sw-input.common-header.sub-request-id`'/>
+                                            <parameter name='lcm-dmaap.flags.mode' value='`$download-n-e-sw-input.common-header.flags.mode`'/>
+                                            <parameter name='lcm-dmaap.flags.force' value='`$download-n-e-sw-input.common-header.flags.force`'/>
+                                            <parameter name='lcm-dmaap.flags.ttl' value='`$download-n-e-sw-input.common-header.flags.ttl`'/>
                                             <parameter name='lcm-dmaap.status.code' value='`$org.onap.appc.adapter.ansible.result.code`' />
                                             <parameter name='lcm-dmaap.status.message' value='`$org.onap.appc.adapter.ansible.message`'/>
                                         </set>
@@ -468,4 +468,4 @@
             </execute>
         </block>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>