Merge pull request #21658 from vespa-engine/freva/fix-test

Add ProvisionedHost getters
vespa-engine · Mar 11, 2022 · e45640d · e45640d
2 parents 8c4de43 + 60579a2
commit e45640d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 24 deletions.
diff --git a/...pository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java b/...pository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostProvisioner.java
@@ -23,12 +23,10 @@ enum HostSharing {
         /** 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/...pository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java b/...pository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisionedHost.java
@@ -73,27 +73,17 @@ public Node generateNode() {
         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) {