Remove description from flavor

18 files changed, 1 insertions, 20 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
index 77872fc1435..fbf97ba25d9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/FlavorConfigBuilder.java
@@ -1,9 +1,9 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.provision.provisioning;
 
-import com.yahoo.config.provisioning.FlavorsConfig;
 import com.yahoo.config.provision.Flavor;
 import com.yahoo.config.provision.NodeFlavors;
+import com.yahoo.config.provisioning.FlavorsConfig;
 
 /**
  * Simplifies creation of a node-repository config containing flavors.
@@ -22,7 +22,6 @@ public class FlavorConfigBuilder {
     public FlavorsConfig.Flavor.Builder addFlavor(String flavorName, double cpu, double mem, double disk, Flavor.Type type) {
         FlavorsConfig.Flavor.Builder flavor = new FlavorsConfig.Flavor.Builder();
         flavor.name(flavorName);
-        flavor.description("Flavor-name-is-" + flavorName);
         flavor.minDiskAvailableGb(disk);
         flavor.minCpuCores(cpu);
         flavor.minMainMemoryAvailableGb(mem);
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
index 2ab916e6375..a591217f5d5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/v2/NodesResponse.java
@@ -148,8 +148,6 @@ class NodesResponse extends HttpResponse {
         object.setString("canonicalFlavor", node.flavor().canonicalName());
         object.setDouble("minDiskAvailableGb", node.flavor().getMinDiskAvailableGb());
         object.setDouble("minMainMemoryAvailableGb", node.flavor().getMinMainMemoryAvailableGb());
-        if (node.flavor().getDescription() != null && ! node.flavor().getDescription().isEmpty())
-            object.setString("description", node.flavor().getDescription());
         object.setDouble("minCpuCores", node.flavor().getMinCpuCores());
         if (node.flavor().cost() > 0)
             object.setLong("cost", node.flavor().cost());
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json
index e23f7129ae2..fd553a97ea4 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg1.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "default",
   "minDiskAvailableGb": 400.0,
   "minMainMemoryAvailableGb": 16.0,
-  "description": "Flavor-name-is-default",
   "minCpuCores": 2.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json
index 8e1accd65a2..aa818a9cf42 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/cfg2.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "default",
   "minDiskAvailableGb": 400.0,
   "minMainMemoryAvailableGb": 16.0,
-  "description": "Flavor-name-is-default",
   "minCpuCores": 2.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json
index a5d2a7a37dd..bfa34bc0517 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/controller1.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "default",
   "minDiskAvailableGb": 400.0,
   "minMainMemoryAvailableGb": 16.0,
-  "description": "Flavor-name-is-default",
   "minCpuCores": 2.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
index 5cbd372385a..fc91c883441 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade-complete.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth": 0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
index 5cbd372385a..fc91c883441 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1-os-upgrade.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth": 0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
index cf190ff36bc..f59af799f37 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node1.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
index 4ffedbf01d5..a01f4372fd8 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node2.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
index 396a645ea3b..44a11c98da2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node3.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
index 146af5998bd..b3ec9aa0093 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node4.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
index 5dadfe68845..963d485ac70 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/docker-node5.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
index 637a7cc858d..efecd510266 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/dockerhost1-with-firmware-data.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 1600.0,
   "minMainMemoryAvailableGb": 32.0,
-  "description": "Flavor-name-is-large",
   "minCpuCores": 4.0,
   "fastDisk": true,
   "bandwidth": 0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
index c9983b3c996..f0c937d20f3 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node4-after-changes.json
@@ -10,7 +10,6 @@
   "canonicalFlavor": "d-2-8-100",
   "minDiskAvailableGb": 100.0,
   "minMainMemoryAvailableGb": 8.0,
-  "description": "Flavor-name-is-d-2-8-100",
   "minCpuCores": 2.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
index ab69b6b1d5a..e5a5c7a9520 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node8.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "default",
   "minDiskAvailableGb": 400.0,
   "minMainMemoryAvailableGb": 16.0,
-  "description": "Flavor-name-is-default",
   "minCpuCores": 2.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
index 271ff3feef1..561cab22f85 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/node9.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 2000.0,
   "minMainMemoryAvailableGb": 128.0,
-  "description": "Flavor-name-is-large-variant",
   "minCpuCores": 64.0,
   "fastDisk": true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
index 9823ffcc14f..42cef1c3c83 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent1.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "[vcpu: 2.0, memory: 8.0 Gb, disk 50.0 Gb]",
   "minDiskAvailableGb": 400.0,
   "minMainMemoryAvailableGb": 16.0,
-  "description": "Flavor-name-is-default",
   "minCpuCores": 2.0,
   "fastDisk":true,
   "bandwidth":0.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
index ec319edb170..28bb960eb14 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/parent2.json
@@ -9,7 +9,6 @@
   "canonicalFlavor": "large",
   "minDiskAvailableGb": 2000.0,
   "minMainMemoryAvailableGb": 128.0,
-  "description": "Flavor-name-is-large-variant",
   "minCpuCores": 64.0,
   "fastDisk":true,
   "bandwidth":0.0,