Merge branch 'recursive-orch'

[so.git] / common / src / main / java / org / onap / so / serviceinstancebeans / Service.java

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 c368f67..90df220 100644 (file)
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Service.java
@@ -42,9 +42,12 @@ 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")
+    protected Integer processingPriority = 0;
+
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -70,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;
     }
 
@@ -86,9 +89,19 @@ public class Service implements Serializable {
         this.resources = resources;
     }
 
+    public Integer getProcessingPriority() {
+        return processingPriority;
+    }
+
+    public void setProcessingPriority(Integer processingPriority) {
+        this.processingPriority = processingPriority;
+    }
+
+
     @Override
     public String toString() {
         return "Service [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
-                + instanceName + ", instanceParams=" + instanceParams + ", resources=" + resources + "]";
+                + instanceName + ", instanceParams=" + instanceParams + ", resources=" + resources
+                + ", processingPriority=" + processingPriority + "]";
     }
 }