Code Review
/
so.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Openstack adapter can't resolve HEAT parameter
[so.git]
/
adapters
/
mso-adapters-rest-interface
/
src
/
main
/
java
/
org
/
onap
/
so
/
adapters
/
vnfrest
/
CreateVfModuleRequest.java
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
a383aac
..
a136ff7
100644
(file)
--- 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
@@
-23,9
+23,14
@@
package org.onap.so.adapters.vnfrest;
import java.util.HashMap;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.onap.so.entity.MsoRequest;
import org.onap.so.entity.MsoRequest;
+import org.onap.so.openstack.mappers.MapAdapter;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.fasterxml.jackson.annotation.JsonRootName;
@@
-35,6
+40,7
@@
import com.fasterxml.jackson.annotation.JsonRootName;
*/
@JsonRootName("createVfModuleRequest")
@XmlRootElement(name = "createVfModuleRequest")
*/
@JsonRootName("createVfModuleRequest")
@XmlRootElement(name = "createVfModuleRequest")
+@XmlAccessorType(XmlAccessType.FIELD)
public class CreateVfModuleRequest extends VfRequestCommon {
private String cloudSiteId;
private String tenantId;
public class CreateVfModuleRequest extends VfRequestCommon {
private String cloudSiteId;
private String tenantId;
@@
-57,8
+63,8
@@
public class CreateVfModuleRequest extends VfRequestCommon {
private Boolean failIfExists = false;
private Boolean backout = true;
private Boolean enableBridge;
private Boolean failIfExists = false;
private Boolean backout = true;
private Boolean enableBridge;
-
- private Map<String,
String
> vfModuleParams = new HashMap<>();
+ @XmlJavaTypeAdapter(MapAdapter.class)
+ private Map<String,
Object
> vfModuleParams = new HashMap<>();
private MsoRequest msoRequest = new MsoRequest();
public String getCloudSiteId() {
private MsoRequest msoRequest = new MsoRequest();
public String getCloudSiteId() {
@@
-189,11
+195,11
@@
public class CreateVfModuleRequest extends VfRequestCommon {
this.backout = backout;
}
this.backout = backout;
}
- public Map<String,
String
> getVfModuleParams() {
+ public Map<String,
Object
> getVfModuleParams() {
return vfModuleParams;
}
return vfModuleParams;
}
- public void setVfModuleParams(Map<String,
String
> vfModuleParams) {
+ public void setVfModuleParams(Map<String,
Object
> vfModuleParams) {
this.vfModuleParams = vfModuleParams;
}
this.vfModuleParams = vfModuleParams;
}