Add canonicalFlavor to ContainerNodeSpec

3 files changed, 19 insertions, 1 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
index 670efe9d309..c5e1da5cd85 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/ContainerNodeSpec.java
@@ -18,6 +18,7 @@ public class ContainerNodeSpec {
     public final Node.State nodeState;
     public final String nodeType;
     public final String nodeFlavor;
+    public final String nodeCanonicalFlavor;
     public final Optional<String> wantedVespaVersion;
     public final Optional<String> vespaVersion;
     public final Optional<Owner> owner;
@@ -37,6 +38,7 @@ public class ContainerNodeSpec {
             final Node.State nodeState,
             final String nodeType,
             final String nodeFlavor,
+            final String nodeCanonicalFlavor,
             final Optional<String> wantedVespaVersion,
             final Optional<String> vespaVersion,
             final Optional<Owner> owner,
@@ -59,6 +61,7 @@ public class ContainerNodeSpec {
         this.nodeState = nodeState;
         this.nodeType = nodeType;
         this.nodeFlavor = nodeFlavor;
+        this.nodeCanonicalFlavor = nodeCanonicalFlavor;
         this.wantedVespaVersion = wantedVespaVersion;
         this.vespaVersion = vespaVersion;
         this.owner = owner;
@@ -85,6 +88,7 @@ public class ContainerNodeSpec {
                 Objects.equals(nodeState, that.nodeState) &&
                 Objects.equals(nodeType, that.nodeType) &&
                 Objects.equals(nodeFlavor, that.nodeFlavor) &&
+                Objects.equals(nodeCanonicalFlavor, that.nodeCanonicalFlavor) &&
                 Objects.equals(wantedVespaVersion, that.wantedVespaVersion) &&
                 Objects.equals(vespaVersion, that.vespaVersion) &&
                 Objects.equals(owner, that.owner) &&
@@ -107,6 +111,7 @@ public class ContainerNodeSpec {
                 nodeState,
                 nodeType,
                 nodeFlavor,
+                nodeCanonicalFlavor,
                 wantedVespaVersion,
                 vespaVersion,
                 owner,
@@ -129,6 +134,7 @@ public class ContainerNodeSpec {
                 + " nodeState=" + nodeState
                 + " nodeType = " + nodeType
                 + " nodeFlavor = " + nodeFlavor
+                + " nodeCanonicalFlavor = " + nodeCanonicalFlavor
                 + " wantedVespaVersion = " + wantedVespaVersion
                 + " vespaVersion = " + vespaVersion
                 + " owner = " + owner
@@ -243,6 +249,7 @@ public class ContainerNodeSpec {
         private Node.State nodeState;
         private String nodeType;
         private String nodeFlavor;
+        private String nodeCanonicalFlavor;
         private Optional<String> wantedVespaVersion = Optional.empty();
         private Optional<String> vespaVersion = Optional.empty();
         private Optional<Owner> owner = Optional.empty();
@@ -262,6 +269,7 @@ public class ContainerNodeSpec {
             nodeState(nodeSpec.nodeState);
             nodeType(nodeSpec.nodeType);
             nodeFlavor(nodeSpec.nodeFlavor);
+            nodeCanonicalFlavor(nodeSpec.nodeCanonicalFlavor);
 
             nodeSpec.wantedDockerImage.ifPresent(this::wantedDockerImage);
             nodeSpec.currentDockerImage.ifPresent(this::currentDockerImage);
@@ -307,6 +315,11 @@ public class ContainerNodeSpec {
             return this;
         }
 
+        public Builder nodeCanonicalFlavor(String nodeCanonicalFlavor) {
+            this.nodeCanonicalFlavor = nodeCanonicalFlavor;
+            return this;
+        }
+
         public Builder wantedVespaVersion(String wantedVespaVersion) {
             this.wantedVespaVersion = Optional.of(wantedVespaVersion);
             return this;
@@ -363,7 +376,8 @@ public class ContainerNodeSpec {
         }
 
         public ContainerNodeSpec build() {
-            return new ContainerNodeSpec(hostname, wantedDockerImage, currentDockerImage, nodeState, nodeType, nodeFlavor,
+            return new ContainerNodeSpec(hostname, wantedDockerImage, currentDockerImage, nodeState, nodeType,
+                                         nodeFlavor, nodeCanonicalFlavor,
                                          wantedVespaVersion, vespaVersion, owner, membership,
                                          wantedRestartGeneration, currentRestartGeneration,
                                          wantedRebootGeneration, currentRebootGeneration,
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
index 03a8ed3d8c5..a83b7dd61b6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/NodeRepositoryImpl.java
@@ -127,6 +127,7 @@ public class NodeRepositoryImpl implements NodeRepository {
                 nodeState,
                 node.nodeType,
                 node.nodeFlavor,
+                node.nodeCanonicalFlavor,
                 Optional.ofNullable(node.wantedVespaVersion),
                 Optional.ofNullable(node.vespaVersion),
                 Optional.ofNullable(owner),
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetNodesResponse.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetNodesResponse.java
index 0a0c61119b4..0dd0f410c07 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetNodesResponse.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/noderepository/bindings/GetNodesResponse.java
@@ -31,6 +31,7 @@ public class GetNodesResponse {
         public final String nodeState;
         public final String nodeType;
         public final String nodeFlavor;
+        public final String nodeCanonicalFlavor;
         public final String wantedVespaVersion;
         public final String vespaVersion;
         public final Owner owner;
@@ -50,6 +51,7 @@ public class GetNodesResponse {
                     @JsonProperty("state") String nodeState,
                     @JsonProperty("type") String nodeType,
                     @JsonProperty("flavor") String nodeFlavor,
+                    @JsonProperty("canonicalFlavor") String nodeCanonicalFlavor,
                     @JsonProperty("wantedVespaVersion") String wantedVespaVersion,
                     @JsonProperty("vespaVersion") String vespaVersion,
                     @JsonProperty("owner") Owner owner,
@@ -67,6 +69,7 @@ public class GetNodesResponse {
             this.nodeState = nodeState;
             this.nodeType = nodeType;
             this.nodeFlavor = nodeFlavor;
+            this.nodeCanonicalFlavor = nodeCanonicalFlavor;
             this.wantedVespaVersion = wantedVespaVersion;
             this.vespaVersion = vespaVersion;
             this.owner = owner;