AllocatedHost serialization completeness

- Serialize node resources instead of flavor when appropriate
- Serialize aliases
- Proper (de)serialization testing

1 files changed, 7 insertions, 2 deletions

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 760b6792006..74147a55a76 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
@@ -80,7 +80,7 @@ public class Flavor {
         this.resources = resources;
     }
 
-    /** Returns the unique identity of this flavor */
+    /** Returns the unique identity of this flavor if it is configured, or the resource spec string otherwise */
     public String name() { return name; }
 
     /**
@@ -207,7 +207,12 @@ public class Flavor {
     }
 
     @Override
-    public String toString() { return "flavor '" + name + "'"; }
+    public String toString() {
+        if (isConfigured())
+            return "flavor '" + name + "'";
+        else
+            return name;
+    }
 
     public enum Type {
         undefined, // Default value in config (flavors.def)