summaryrefslogtreecommitdiffstats
path: root/adapters/mso-adapters-rest-interface
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-03-01 12:48:00 -0500
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-03-01 12:48:14 -0500
commit09940a4aacf2fb32eddc85dd49f5a17dedff9de0 (patch)
treeca2a09e6cf184da0131b2fa3cc53decf94c69f13 /adapters/mso-adapters-rest-interface
parent244d353aeda3662d57c6629eb95ee4791b7c07f1 (diff)
vnf spin up gr api vnf s base module fails
map object representations of json back to json strings marshal all objects to json strings before sending all input params converted to Map<String, Object> Updated userParams map from HashMap<String, String> to Map<String, Object> as HashMap<String, String> userParams was causing VNF spin up to fail. Input json in Userparams was not accepted as a valid json format. Updated other files that were affected by this change. Change-Id: I0c00fc00c4c11b54ace4df7be8d5bfc80d41d130 Issue-ID: SO-1582 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'adapters/mso-adapters-rest-interface')
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java6
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java6
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java6
-rw-r--r--adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java6
4 files changed, 12 insertions, 12 deletions
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
index a383aac77f..c62dc0dfbf 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
@@ -58,7 +58,7 @@ public class CreateVfModuleRequest extends VfRequestCommon {
private Boolean backout = true;
private Boolean enableBridge;
- private Map<String, String> vfModuleParams = new HashMap<>();
+ private Map<String, Object> vfModuleParams = new HashMap<>();
private MsoRequest msoRequest = new MsoRequest();
public String getCloudSiteId() {
@@ -189,11 +189,11 @@ public class CreateVfModuleRequest extends VfRequestCommon {
this.backout = backout;
}
- public Map<String, String> getVfModuleParams() {
+ public Map<String, Object> getVfModuleParams() {
return vfModuleParams;
}
- public void setVfModuleParams(Map<String, String> vfModuleParams) {
+ public void setVfModuleParams(Map<String, Object> vfModuleParams) {
this.vfModuleParams = vfModuleParams;
}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
index 698b2ccebe..214abd4e9d 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
@@ -41,7 +41,7 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
private String vnfVersion;
private String vfModuleType;
private String modelCustomizationUuid;
- private Map<String,String> volumeGroupParams = new HashMap<>();
+ private Map<String,Object> volumeGroupParams = new HashMap<>();
private Boolean failIfExists;
private Boolean enableBridge;
private Boolean suppressBackout;
@@ -91,11 +91,11 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
this.vfModuleType = vfModuleType;
}
- public Map<String, String> getVolumeGroupParams() {
+ public Map<String, Object> getVolumeGroupParams() {
return volumeGroupParams;
}
- public void setVolumeGroupParams(Map<String, String> volumeGroupParams) {
+ public void setVolumeGroupParams(Map<String, Object> volumeGroupParams) {
this.volumeGroupParams = volumeGroupParams;
}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
index 0fb5c05e2a..1c7696a79b 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
@@ -58,7 +58,7 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
private Boolean failIfExists;
private Boolean backout;
- private Map<String,String> vfModuleParams = new HashMap<>();
+ private Map<String,Object> vfModuleParams = new HashMap<>();
private MsoRequest msoRequest = new MsoRequest();
public String getCloudSiteId() {
@@ -197,11 +197,11 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
this.backout = backout;
}
- public Map<String, String> getVfModuleParams() {
+ public Map<String, Object> getVfModuleParams() {
return vfModuleParams;
}
- public void setVfModuleParams(Map<String, String> vfModuleParams) {
+ public void setVfModuleParams(Map<String, Object> vfModuleParams) {
this.vfModuleParams = vfModuleParams;
}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
index d9f83aad2f..8ddef1eeaf 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
@@ -41,7 +41,7 @@ public class UpdateVolumeGroupRequest extends VfRequestCommon {
private String vnfVersion;
private String vfModuleType;
private String modelCustomizationUuid;
- private Map<String,String> volumeGroupParams = new HashMap<>();
+ private Map<String,Object> volumeGroupParams = new HashMap<>();
private MsoRequest msoRequest = new MsoRequest();
public UpdateVolumeGroupRequest() {
@@ -112,11 +112,11 @@ public class UpdateVolumeGroupRequest extends VfRequestCommon {
this.modelCustomizationUuid = modelCustomizationUuid;
}
- public Map<String, String> getVolumeGroupParams() {
+ public Map<String, Object> getVolumeGroupParams() {
return volumeGroupParams;
}
- public void setVolumeGroupParams(Map<String, String> volumeGroupParams) {
+ public void setVolumeGroupParams(Map<String, Object> volumeGroupParams) {
this.volumeGroupParams = volumeGroupParams;
}