From de2c8fd76d75ee9d054e30869e3aeda6c6493103 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@verizonmedia.com>
Date: Mon, 26 Aug 2019 15:47:55 +0200
Subject: Remove canonicalFlavor from node-admin

---
 .../configserver/noderepository/NodeSpec.java      | 24 +---------------------
 .../noderepository/RealNodeRepository.java         |  1 -
 .../bindings/NodeRepositoryNode.java               |  3 ---
 3 files changed, 1 insertion(+), 27 deletions(-)

(limited to 'node-admin')

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
index ef6438360ad..c2e68bdb329 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeSpec.java
@@ -24,7 +24,6 @@ public class NodeSpec {
     private final NodeState state;
     private final NodeType type;
     private final String flavor;
-    private final String canonicalFlavor;
 
     private final Optional<DockerImage> wantedDockerImage;
     private final Optional<DockerImage> currentDockerImage;
@@ -66,7 +65,6 @@ public class NodeSpec {
             NodeState state,
             NodeType type,
             String flavor,
-            String canonicalFlavor,
             Optional<Version> wantedVespaVersion,
             Optional<Version> currentVespaVersion,
             Optional<Version> wantedOsVersion,
@@ -100,7 +98,6 @@ public class NodeSpec {
         this.state = Objects.requireNonNull(state);
         this.type = Objects.requireNonNull(type);
         this.flavor = Objects.requireNonNull(flavor);
-        this.canonicalFlavor = canonicalFlavor;
         this.modelName = modelName;
         this.wantedVespaVersion = Objects.requireNonNull(wantedVespaVersion);
         this.currentVespaVersion = Objects.requireNonNull(currentVespaVersion);
@@ -139,10 +136,6 @@ public class NodeSpec {
         return flavor;
     }
 
-    public String canonicalFlavor() {
-        return canonicalFlavor;
-    }
-
     public Optional<DockerImage> wantedDockerImage() {
         return wantedDockerImage;
     }
@@ -262,7 +255,6 @@ public class NodeSpec {
                 Objects.equals(state, that.state) &&
                 Objects.equals(type, that.type) &&
                 Objects.equals(flavor, that.flavor) &&
-                Objects.equals(canonicalFlavor, that.canonicalFlavor) &&
                 Objects.equals(wantedVespaVersion, that.wantedVespaVersion) &&
                 Objects.equals(currentVespaVersion, that.currentVespaVersion) &&
                 Objects.equals(wantedOsVersion, that.wantedOsVersion) &&
@@ -293,7 +285,6 @@ public class NodeSpec {
                 state,
                 type,
                 flavor,
-                canonicalFlavor,
                 wantedVespaVersion,
                 currentVespaVersion,
                 wantedOsVersion,
@@ -324,7 +315,6 @@ public class NodeSpec {
                 + " state=" + state
                 + " type=" + type
                 + " flavor=" + flavor
-                + " canonicalFlavor=" + canonicalFlavor
                 + " wantedVespaVersion=" + wantedVespaVersion
                 + " currentVespaVersion=" + currentVespaVersion
                 + " wantedOsVersion=" + wantedOsVersion
@@ -352,7 +342,6 @@ public class NodeSpec {
         private NodeState state;
         private NodeType type;
         private String flavor;
-        private String canonicalFlavor;
         private Optional<DockerImage> wantedDockerImage = Optional.empty();
         private Optional<DockerImage> currentDockerImage = Optional.empty();
         private Optional<Version> wantedVespaVersion = Optional.empty();
@@ -383,7 +372,6 @@ public class NodeSpec {
             state(node.state);
             type(node.type);
             flavor(node.flavor);
-            canonicalFlavor(node.canonicalFlavor);
             resources(node.resources);
             ipAddresses(node.ipAddresses);
             additionalIpAddresses(node.additionalIpAddresses);
@@ -438,11 +426,6 @@ public class NodeSpec {
             return this;
         }
 
-        public Builder canonicalFlavor(String canonicalFlavor) {
-            this.canonicalFlavor = canonicalFlavor;
-            return this;
-        }
-
         public Builder wantedVespaVersion(Version wantedVespaVersion) {
             this.wantedVespaVersion = Optional.of(wantedVespaVersion);
             return this;
@@ -603,10 +586,6 @@ public class NodeSpec {
             return flavor;
         }
 
-        public String canonicalFlavor() {
-            return canonicalFlavor;
-        }
-
         public Optional<Version> wantedVespaVersion() {
             return wantedVespaVersion;
         }
@@ -676,8 +655,7 @@ public class NodeSpec {
         }
 
         public NodeSpec build() {
-            return new NodeSpec(hostname, wantedDockerImage, currentDockerImage, state, type,
-                    flavor, canonicalFlavor,
+            return new NodeSpec(hostname, wantedDockerImage, currentDockerImage, state, type, flavor,
                     wantedVespaVersion, currentVespaVersion, wantedOsVersion, currentOsVersion, allowedToBeDown, wantToDeprovision,
                     owner, membership,
                     wantedRestartGeneration, currentRestartGeneration,
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
index 9e43b3fa2de..582ba3dd09c 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java
@@ -160,7 +160,6 @@ public class RealNodeRepository implements NodeRepository {
                 nodeState,
                 nodeType,
                 node.flavor,
-                node.canonicalFlavor,
                 Optional.ofNullable(node.wantedVespaVersion).map(Version::fromString),
                 Optional.ofNullable(node.vespaVersion).map(Version::fromString),
                 Optional.ofNullable(node.wantedOsVersion).map(Version::fromString),
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
index 2b4f9277fc7..90d70a94144 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/bindings/NodeRepositoryNode.java
@@ -28,8 +28,6 @@ public class NodeRepositoryNode {
     public String openStackId;
     @JsonProperty("flavor")
     public String flavor;
-    @JsonProperty("canonicalFlavor")
-    public String canonicalFlavor;
     @JsonProperty("membership")
     public Membership membership;
     @JsonProperty("owner")
@@ -98,7 +96,6 @@ public class NodeRepositoryNode {
                 ", openStackId='" + openStackId + '\'' +
                 ", modelName='" + modelName + '\'' +
                 ", flavor='" + flavor + '\'' +
-                ", canonicalFlavor='" + canonicalFlavor + '\'' +
                 ", membership=" + membership +
                 ", owner=" + owner +
                 ", restartGeneration=" + restartGeneration +
-- 
cgit v1.2.3