diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-03-07 22:12:06 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-03-11 15:30:01 +0100 |
commit | 60579a229605714622bc17c73646098c6f1d716d (patch) | |
tree | f9ab7a2f99f36c8eb342efb68d3f05ec73d9b745 /node-repository/src/main | |
parent | 07e5c4bcfdf2f3b074266e83e2dcff603fedd341 (diff) |
Add ProvisionedHost getters
Diffstat (limited to 'node-repository/src/main')
2 files changed, 12 insertions, 24 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java index dc39aa722c7..ce6ac9d5f5f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java @@ -23,12 +23,10 @@ public interface HostProvisioner { /** The host must be provisioned exclusively for the applicationId */ exclusive, - /** The host must be provisioned to be shared with other applications. \ - */ + /** The host must be provisioned to be shared with other applications. */ shared, - /** The client has no requirements on whether the host must be provisio\ - ned exclusively or shared. */ + /** The client has no requirements on whether the host must be provisioned exclusively or shared. */ any } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java index 7643368aad9..b5fd8c8111f 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java @@ -73,27 +73,17 @@ public class ProvisionedHost { return Node.reserve(Set.of(), nodeHostname(), hostHostname, nodeResources, hostType.childNodeType()).build(); } - public String getId() { - return id; - } - - public String hostHostname() { - return hostHostname; - } - - public Flavor hostFlavor() { - return hostFlavor; - } - - public String nodeHostname() { - return nodeAddresses.get(0).hostname(); - } - - public List<Address> nodeAddresses() { - return nodeAddresses; - } - + public String getId() { return id; } + public String hostHostname() { return hostHostname; } + public Flavor hostFlavor() { return hostFlavor; } + public NodeType hostType() { return hostType; } + public Optional<ApplicationId> exclusiveToApplicationId() { return exclusiveToApplicationId; } + public Optional<ClusterSpec.Type> exclusiveToClusterType() { return exclusiveToClusterType; } + public List<Address> nodeAddresses() { return nodeAddresses; } public NodeResources nodeResources() { return nodeResources; } + public Version osVersion() { return osVersion; } + + public String nodeHostname() { return nodeAddresses.get(0).hostname(); } @Override public boolean equals(Object o) { |