Add node type dimension

2 files changed, 5 insertions, 2 deletions

diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
index 1aa1581f105..570058ae1d2 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/FlagsTest.java
@@ -48,8 +48,9 @@ public class FlagsTest {
         assertThat(vector.getValue().getValue(FetchVector.Dimension.HOSTNAME).get(), is(not(emptyOrNullString())));
         // zone is set because it was set on the unbound flag above
         assertThat(vector.getValue().getValue(FetchVector.Dimension.ZONE_ID), is(Optional.of("a-zone")));
-        // application is not set
+        // application and node type are not set
         assertThat(vector.getValue().getValue(FetchVector.Dimension.APPLICATION_ID), is(Optional.empty()));
+        assertThat(vector.getValue().getValue(FetchVector.Dimension.NODE_TYPE), is(Optional.empty()));
 
         RawFlag rawFlag = mock(RawFlag.class);
         when(source.fetch(eq(new FlagId("id")), any())).thenReturn(Optional.of(rawFlag));
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
index 7836eb702b1..b3ff2a92b07 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
@@ -57,7 +57,8 @@ public class SerializationTest {
                 "    \"attributes\": {\n" +
                 "        \"zone\": \"z1\",\n" +
                 "        \"application\": \"a1\",\n" +
-                "        \"hostname\": \"h1\"\n" +
+                "        \"hostname\": \"h1\",\n" +
+                "        \"node-type\": \"nt1\"\n" +
                 "    }\n" +
                 "}";
 
@@ -85,6 +86,7 @@ public class SerializationTest {
         assertThat(wireData.defaultFetchVector.get("zone"), equalTo("z1"));
         assertThat(wireData.defaultFetchVector.get("application"), equalTo("a1"));
         assertThat(wireData.defaultFetchVector.get("hostname"), equalTo("h1"));
+        assertThat(wireData.defaultFetchVector.get("node-type"), equalTo("nt1"));
 
         // Verify serialization of RawFlag == serialization by ObjectMapper
         ObjectMapper mapper = new ObjectMapper();