Check vm-capabilites on vnf-level OS requests

[appc.git] / appc-sequence-generator / appc-sequence-generator-bundle / src / main / java / org / onap / appc / seqgen / objects / SequenceGeneratorInput.java

diff --git a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/objects/SequenceGeneratorInput.java b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/objects/SequenceGeneratorInput.java
index d847b69..c6778a8 100644 (file)
--- a/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/objects/SequenceGeneratorInput.java
+++ b/appc-sequence-generator/appc-sequence-generator-bundle/src/main/java/org/onap/appc/seqgen/objects/SequenceGeneratorInput.java
@@ -31,7 +31,6 @@ import org.onap.appc.dg.objects.InventoryModel;
 import org.onap.appc.dg.objects.VnfcDependencyModel;
 
 import javax.validation.constraints.NotNull;
-import java.util.List;
 import java.util.Map;
 
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@@ -42,17 +41,14 @@ public class SequenceGeneratorInput {
     @JsonProperty("request-info")
     private RequestInfo requestInfo;
 
-    @JsonIgnore
     private InventoryModel inventoryModel;
 
-    @JsonIgnore
     private VnfcDependencyModel dependencyModel;
 
     @JsonProperty("tunable-parameters")
     private Map<String,String> tunableParams;
 
-    @JsonProperty("capabilities")
-    private Map<String,List<String>> capability;
+    private CapabilityModel capabilityModel;
 
     public RequestInfo getRequestInfo() {
         return requestInfo;
@@ -86,11 +82,11 @@ public class SequenceGeneratorInput {
         this.tunableParams = tunableParams;
     }
 
-    public Map<String, List<String>> getCapability() {
-        return capability;
+    public CapabilityModel getCapability() {
+        return capabilityModel;
     }
 
-    public void setCapability(Map<String, List<String>> capability) {
-        this.capability = capability;
+    public void setCapabilityModel(CapabilityModel capabilityModel) {
+        this.capabilityModel = capabilityModel;
     }
 }