Revert "Merge pull request #12351 from vespa-engine/revert-11875-bratseth/node-metrics"

This reverts commit 37f6c5b31cb2809a54c34dc3a4e51307f3320fbd, reversing
changes made to 76221d0b9b7bda577ac61ce8a79c7b6ee3a8dbb4.

5 files changed, 9 insertions, 9 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index f2ae997a164..9a091f1161c 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -391,6 +391,7 @@
     "methods": [
       "public void <init>(com.yahoo.config.provisioning.FlavorsConfig$Flavor)",
       "public void <init>(com.yahoo.config.provision.NodeResources)",
+      "public void <init>(java.lang.String, com.yahoo.config.provision.NodeResources)",
       "public com.yahoo.config.provision.Flavor with(com.yahoo.config.provision.host.FlavorOverrides)",
       "public com.yahoo.config.provision.Flavor with(com.yahoo.config.provision.NodeResources)",
       "public java.lang.String name()",
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 16369d82f9f..5aed5d8e2e7 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -158,7 +158,6 @@ public final class ClusterSpec {
     }
 
     /** Identifier of a group within a cluster */
-    @SuppressWarnings("deprecation")
     public static final class Group {
 
         private final int index;
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
index 2711406c216..d11d7137226 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
@@ -49,6 +49,11 @@ public class Flavor {
         this(resources.toString(), resources, Optional.empty(), Type.DOCKER_CONTAINER, false, 0, resources.vcpu());
     }
 
+    /** Creates a *host* flavor for testing */
+    public Flavor(String name, NodeResources resources) {
+        this(name, resources, Optional.empty(), Flavor.Type.VIRTUAL_MACHINE, true, 0, resources.vcpu());
+    }
+
     private Flavor(String name,
                    NodeResources resources,
                    Optional<FlavorOverrides> flavorOverrides,
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
index 510122c2342..25c42884295 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostName.java
@@ -4,7 +4,7 @@ package com.yahoo.config.provision;
 import java.util.Objects;
 
 /**
- * Represents a host name
+ * A host name
  *
  * @author mortent
  */
@@ -18,12 +18,7 @@ public class HostName implements Comparable<HostName> {
 
     public String value() { return name; }
 
-    /**
-     * Create a {@link HostName} with a given name.
-     *
-     * @param name Name
-     * @return instance of {@link HostName}.
-     */
+    /** Create a {@link HostName} with a given name */
     public static HostName from(String name) {
         return new HostName(name);
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
index a9f031cae70..eb462c86f4f 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java
@@ -14,7 +14,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
- * All the flavors *configured* in this zone (i.e this should be called HostFlavors).
+ * All the flavors configured in this zone (i.e this should be called HostFlavors).
  *
  * @author bratseth
  */