X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fcbam%2Fbo%2FCBAMInstantiateVnfRequest.java;h=a314627cae96757e5291ade9705ceed4dad80244;hb=6ba81c29f8ee403b4ad9f976d1d6d14fbbd7664c;hp=db79d190f8c989af7a8ba0a89d4fa162c40ca2a0;hpb=f3a7349ce2b342fc497035950d0afd000e71ce9c;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/CBAMInstantiateVnfRequest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/CBAMInstantiateVnfRequest.java
index db79d190..a314627c 100644
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/CBAMInstantiateVnfRequest.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/cbam/bo/CBAMInstantiateVnfRequest.java
@@ -21,11 +21,16 @@ import java.util.List;
 
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtManagedVirtualLinkData;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtVirtualLinkData;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimComputeResourceFlavour;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimSoftwareImage;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ZoneInfo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class CBAMInstantiateVnfRequest {
+	@JsonProperty("instantiationLevelId")
+	private String instantiationLevelId;
 	
 	@JsonProperty("flavourId")
 	private String flavourId;
@@ -38,6 +43,21 @@ public class CBAMInstantiateVnfRequest {
 	
 	@JsonProperty("extManagedVirtualLinks")
 	private List<ExtManagedVirtualLinkData> extManagedVirtualLinks;
+	
+	@JsonProperty("grantlessMode")
+	private boolean grantlessMode;
+	
+	@JsonProperty("softwareImages")
+	private List<VimSoftwareImage> softwareImages;
+	
+	@JsonProperty("additionalParams")
+	private Object additionalParams;
+	
+	@JsonProperty("computeResourceFlavours")
+	private List<VimComputeResourceFlavour> computeResourceFlavours;
+	
+	@JsonProperty("zones")
+	private List<ZoneInfo> zones;
 
 	public String getFlavourId() {
 		return flavourId;
@@ -72,6 +92,58 @@ public class CBAMInstantiateVnfRequest {
 	public void setExtManagedVirtualLinks(List<ExtManagedVirtualLinkData> extManagedVirtualLinks) {
 		this.extManagedVirtualLinks = extManagedVirtualLinks;
 	}
+
+	public boolean isGrantlessMode() {
+		return grantlessMode;
+	}
+
+	public void setGrantlessMode(boolean grantlessMode) {
+		this.grantlessMode = grantlessMode;
+	}
+
+	public List<VimSoftwareImage> getSoftwareImages() {
+		return softwareImages;
+	}
+
+	public void setSoftwareImages(List<VimSoftwareImage> softwareImages) {
+		this.softwareImages = softwareImages;
+	}
+
+	public Object getAdditionalParams() {
+		return additionalParams;
+	}
+
+	public void setAdditionalParams(Object additionalParams) {
+		this.additionalParams = additionalParams;
+	}
+
+	public List<VimComputeResourceFlavour> getComputeResourceFlavours() {
+		return computeResourceFlavours;
+	}
+
+	public void setComputeResourceFlavours(List<VimComputeResourceFlavour> computeResourceFlavours) {
+		this.computeResourceFlavours = computeResourceFlavours;
+	}
+
+	public List<ZoneInfo> getZones() {
+		return zones;
+	}
+
+	public void setZones(List<ZoneInfo> zones) {
+		this.zones = zones;
+	}
+
+	public String getInstantiationLevelId() {
+		return instantiationLevelId;
+	}
+
+	public void setInstantiationLevelId(String instantiationLevelId) {
+		this.instantiationLevelId = instantiationLevelId;
+	}
+	
+	
+	
+