diff options
3 files changed, 9 insertions, 8 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java index f3e3abeff91..a0ad80c3070 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.model; import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.provision.ClusterMembership; +import com.yahoo.config.provision.Flavor; import javax.annotation.Nullable; import java.util.ArrayList; @@ -40,7 +41,7 @@ public class HostResource implements Comparable<HostResource> { private Set<ClusterMembership> clusterMemberships = new LinkedHashSet<>(); // Empty for self-hosted Vespa. - private Optional<String> flavor = Optional.empty(); + private Optional<Flavor> flavor = Optional.empty(); /** * Create a new {@link HostResource} bound to a specific {@link com.yahoo.vespa.model.Host}. @@ -225,10 +226,10 @@ public class HostResource implements Comparable<HostResource> { .collect(Collectors.toSet())); } - public void setFlavor(Optional<String> flavor) { this.flavor = flavor; } + public void setFlavor(Optional<Flavor> flavor) { this.flavor = flavor; } /** Returns the flavor of this resource. Empty for self-hosted Vespa. */ - public Optional<String> getFlavor() { return flavor; } + public Optional<Flavor> getFlavor() { return flavor; } public void addClusterMembership(@Nullable ClusterMembership clusterMembership) { if (clusterMembership != null) diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index 174a8ce4d97..42c3fbc27d0 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -24,13 +24,13 @@ public class HostSpec implements Comparable<HostSpec> { /** The current membership role of this host in the cluster it belongs to */ private final Optional<ClusterMembership> membership; - private final Optional<String> flavor; + private final Optional<Flavor> flavor; public HostSpec(String hostname, Optional<ClusterMembership> membership) { this(hostname, new ArrayList<>(), Optional.empty(), membership); } - public HostSpec(String hostname, ClusterMembership membership, String flavor) { + public HostSpec(String hostname, ClusterMembership membership, Flavor flavor) { this(hostname, new ArrayList<>(), Optional.of(flavor), Optional.of(membership)); } @@ -42,7 +42,7 @@ public class HostSpec implements Comparable<HostSpec> { this(hostname, aliases, Optional.empty(), Optional.of(membership)); } - public HostSpec(String hostname, List<String> aliases, Optional<String> flavor, Optional<ClusterMembership> membership) { + public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership) { if (hostname == null || hostname.isEmpty()) throw new IllegalArgumentException("Hostname must be specified"); this.hostname = hostname; this.aliases = ImmutableList.copyOf(aliases); @@ -56,7 +56,7 @@ public class HostSpec implements Comparable<HostSpec> { /** Returns the aliases of this host as an immutable list. This may be empty but never null. */ public List<String> aliases() { return aliases; } - public Optional<String> flavor() { return flavor; } + public Optional<Flavor> flavor() { return flavor; } /** Returns the membership of this host, or an empty value if not present */ public Optional<ClusterMembership> membership() { return membership; } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index f6905f310a1..ac313cb7526 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -112,7 +112,7 @@ public class NodeRepositoryProvisioner implements Provisioner { for (Node node : nodes) { hosts.add(new HostSpec(node.hostname(), node.allocation().orElseThrow(IllegalStateException::new).membership(), - node.flavor().canonicalName())); + node.flavor())); } return hosts; } |