diff options
Diffstat (limited to 'common/src/main')
3 files changed, 7 insertions, 3 deletions
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java b/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java index 5146685058..df137d0c01 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/ServiceInfo.java @@ -56,4 +56,7 @@ public class ServiceInfo implements Serializable { private String pLMNIdList; private String actionType; + + private String resourceSharingLevel; + } diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java index 7cc940ddde..2b315611ad 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceProfileAdapter.java @@ -176,6 +176,7 @@ public class SliceProfileAdapter implements Serializable { BeanUtils.copyProperties(this, tnSliceProfile); tnSliceProfile.setSNSSAIList(Arrays.asList(this.sNSSAIList.split("\\|"))); tnSliceProfile.setPLMNIdList(Arrays.asList(this.pLMNIdList.split("\\|"))); + tnSliceProfile.setResourceSharingLevel(ResourceSharingLevel.fromString(this.resourceSharingLevel)); return tnSliceProfile; } } diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java index 14b1ab5974..90df220b52 100644 --- a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java +++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java @@ -42,7 +42,7 @@ public class Service implements Serializable { @JsonProperty("instanceName") protected String instanceName; @JsonProperty("instanceParams") - private List<Map<String, String>> instanceParams = new ArrayList<>(); + private List<Map<String, Object>> instanceParams = new ArrayList<>(); @JsonProperty("resources") protected Resources resources; @JsonProperty("processingPriority") @@ -73,11 +73,11 @@ public class Service implements Serializable { this.instanceName = instanceName; } - public List<Map<String, String>> getInstanceParams() { + public List<Map<String, Object>> getInstanceParams() { return instanceParams; } - public void setInstanceParams(List<Map<String, String>> instanceParams) { + public void setInstanceParams(List<Map<String, Object>> instanceParams) { this.instanceParams = instanceParams; } |