Expect None_Upgrade action for VNF upgrade

FE will send the None_Upgrade action therefore we need to map it to Upgrade

Issue-ID: VID-651
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Change-Id: Ia4806386dcd8faf557f0c17a2f533afa386b2ec1

diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
index 642843a..1079fbe 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java
@@ -69,6 +69,7 @@ public abstract class BaseResource implements JobAdapter.AsyncJobRequest {
                        .put("None_Delete", Action.Delete)
                        .put("Resume", Action.Resume)
                        .put("Upgrade", Action.Upgrade)
+                       .put("None_Upgrade", Action.Upgrade)
                        .build();
 
 

diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json
index 8d30fd8..3853913 100644 (file)
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/replace_vfmodule_fe_input.json
@@ -1,5 +1,5 @@
 {
-  "action": "None",
+  "action": "None_Upgrade",
   "isDirty": true,
   "vnfs": {
     "Vf zolson5bpxmc02092017-VF 0": {
@@ -8,7 +8,7 @@
           "VfZrdm5bpxmc02092017Vf..CORNELIUS_base..module-0-?": {
             "instanceName": "replace_module",
             "instanceId": "5d49c3b1-fc90-4762-8c98-e800170baa55",
-            "action": "Upgrade",
+            "action": "None_Upgrade",
             "orchStatus": "Create",
             "provStatus": "Prov Status",
             "inMaint": false,
@@ -48,7 +48,7 @@
       "rollbackOnFailure": true,
       "instanceId": "5c9c2896-1fe6-4055-b7ec-d0a01e5f9bf5",
       "instanceName": "vnf_of_replace_module",
-      "action": "None",
+      "action": "None_Upgrade",
       "legacyRegion": "some legacy region"
     }
   },