diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo')
3 files changed, 24 insertions, 19 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/InstantiateVnfRequest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/InstantiateVnfRequest.java index 6f1325d3..e26e809b 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/InstantiateVnfRequest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/InstantiateVnfRequest.java @@ -32,9 +32,12 @@ public class InstantiateVnfRequest { @JsonProperty("vnfPackageId") private String vnfPackageId; + //this id is irrelevant to the CBAM vnfdid @JsonProperty("vnfDescriptorId") private String vnfDescriptorId; + private String vnfdId; + @JsonProperty("flavourId") private String flavourId; @@ -107,6 +110,14 @@ public class InstantiateVnfRequest { this.extVirtualLink = extVirtualLink; } + public String getVnfdId() { + return vnfdId; + } + + public void setVnfdId(String vnfdId) { + this.vnfdId = vnfdId; + } + } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/ScaleVnfRequest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/ScaleVnfRequest.java index 536af321..13bf9bc3 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/ScaleVnfRequest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/ScaleVnfRequest.java @@ -16,7 +16,8 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum; + +import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.ScaleType; import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.AdditionalParam; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,7 +27,7 @@ public class ScaleVnfRequest { private String vnfInstanceId; @JsonProperty("type") - private CommonEnum.ScaleType type; + private ScaleType type; @JsonProperty("aspectId") private String aspectId; @@ -70,15 +71,19 @@ public class ScaleVnfRequest { this.vnfInstanceId = vnfInstanceId; } - public CommonEnum.ScaleType getType() { + public ScaleType getType() { return type; } - public void setType(CommonEnum.ScaleType type) { + public void setType(ScaleType type) { this.type = type; } + + + + diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java index 45acab42..c4795d32 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/vnfmdriver/bo/TerminateVnfRequest.java @@ -16,7 +16,7 @@ package org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum; +import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.TerminationType; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,31 +26,20 @@ public class TerminateVnfRequest { private String vnfInstanceId; @JsonProperty("terminationType") - private CommonEnum.TerminationType terminationType; + private TerminationType terminationType; @JsonProperty("gracefulTerminationTimeout") private Integer gracefulTerminationTimeout; - - public enum TerminationType{ - - GRACEFUL, FORCEFUL; - } - - - - - - public CommonEnum.TerminationType getTerminationType() { + public TerminationType getTerminationType() { return terminationType; } - public void setTerminationType(CommonEnum.TerminationType terminationType) { + public void setTerminationType(TerminationType terminationType) { this.terminationType = terminationType; } - public Integer getGracefulTerminationTimeout() { return gracefulTerminationTimeout; } |