Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,9 @@ public interface FlavorService extends RestService {
* @param the space in GB that will disappear when the VM is terminated (default is 0) [OPTIONAL]
* @param swap the Swap space in MB
* @param rxtxFactor the RX/TX factor (default is 1) [OPTIONAL]
* @param isPublic makes the flavor accessible to the public (the default is true).
* @return the created flavor
*/
Flavor create(String name, int ram, int vcpus, int disk, int ephemeral, int swap, float rxtxFactor, boolean isPublic);
Flavor create(String name, int ram, int vcpus, int disk, int ephemeral, int swap, float rxtxFactor);

/**
* list extra specs
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/openstack4j/model/compute/Flavor.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ public interface Flavor extends ModelEntity, Buildable<FlavorBuilder> {
*
* @return true, if is public
*/
boolean isPublic();
Boolean isPublic();

/**
* Checks if is disabled.
*
* @return true, if is disabled
*/
boolean isDisabled();
Boolean isDisabled();

/**
* Gets the links.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,5 @@ public interface FlavorBuilder extends Builder<FlavorBuilder, Flavor> {
*/
FlavorBuilder rxtxFactor(float rxtxFactor);

/**
* @see Flavor#isPublic()
*/
FlavorBuilder isPublic(boolean isPublic);

}
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ public InputStream getInputStream() {
@Override
public void writeToFile(File file) throws IOException {
checkNotNull(file);

ByteStreams.copy(response.getInputStream(), new FileOutputStream(file));
try(InputStream inputStream = response.getInputStream();
FileOutputStream fileOutputStream = new FileOutputStream(file) ){
ByteStreams.copy(inputStream, fileOutputStream);
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonRootName;
import com.google.common.base.Objects;
Expand All @@ -35,13 +36,15 @@ public class NovaFlavor implements Flavor {
@JsonProperty("rxtx_factor")
private float rxtxFactor = 1.0f;
@JsonProperty("OS-FLV-DISABLED:disabled")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Boolean disabled;
@JsonProperty("rxtx_quota")
private Integer rxtxQuota;
@JsonProperty("rxtx_cap")
private Integer rxtxCap;
@JsonProperty("os-flavor-access:is_public")
private boolean isPublic = Boolean.TRUE;
@JsonInclude(JsonInclude.Include.NON_NULL)
private Boolean isPublic;
private List<GenericLink> links;

public static FlavorBuilder builder() {
Expand Down Expand Up @@ -139,16 +142,16 @@ public int getRxtxCap() {
* {@inheritDoc}
*/
@Override
public boolean isPublic() {
public Boolean isPublic() {
return isPublic;
}

/**
* {@inheritDoc}
*/
@Override
public boolean isDisabled() {
return (disabled == null) ? false : disabled;
public Boolean isDisabled() {
return disabled;
}

/**
Expand Down Expand Up @@ -180,7 +183,8 @@ public static class Flavors extends ListResult<NovaFlavor> {
@JsonProperty("flavors")
List<NovaFlavor> flavors;

public List<NovaFlavor> value() {
@Override
public List<NovaFlavor> value() {
return flavors;
}
}
Expand All @@ -200,47 +204,53 @@ public static class FlavorConcreteBuilder implements FlavorBuilder {
/**
* @see Flavor#getName()
*/
public FlavorBuilder name(String name) {
@Override
public FlavorBuilder name(String name) {
m.name = name;
return this;
}

/**
* @see Flavor#getRam()
*/
public FlavorBuilder ram(int ram) {
@Override
public FlavorBuilder ram(int ram) {
m.ram = ram;
return this;
}

/**
* @see Flavor#getVcpus()
*/
public FlavorBuilder vcpus(int vcpus) {
@Override
public FlavorBuilder vcpus(int vcpus) {
m.vcpus = vcpus;
return this;
}

/**
* @see Flavor#getDisk()
*/
public FlavorBuilder disk(int disk) {
@Override
public FlavorBuilder disk(int disk) {
m.disk = disk;
return this;
}

/**
* @see Flavor#getSwap()
*/
public FlavorBuilder swap(int swap) {
@Override
public FlavorBuilder swap(int swap) {
m.swap = swap;
return this;
}

/**
* @see Flavor#getRxtxFactor();
*/
public FlavorBuilder rxtxFactor(float rxtxFactor) {
@Override
public FlavorBuilder rxtxFactor(float rxtxFactor) {
m.rxtxFactor = rxtxFactor;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ public Flavor create(Flavor flavor) {
* {@inheritDoc}
*/
@Override
public Flavor create(String name, int ram, int vcpus, int disk, int ephemeral, int swap, float rxtxFactor, boolean isPublic) {
public Flavor create(String name, int ram, int vcpus, int disk, int ephemeral, int swap, float rxtxFactor) {
checkNotNull(name);
return create(NovaFlavor.builder().name(name).ram(ram).vcpus(vcpus).disk(disk).swap(swap).rxtxFactor(rxtxFactor).isPublic(isPublic).build());
return create(NovaFlavor.builder().name(name).ram(ram).vcpus(vcpus).disk(disk).swap(swap).rxtxFactor(rxtxFactor).build());
}

/**
Expand Down