1 files changed, 37 insertions, 2 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index 87b0f709125..3870768ceb4 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -7,6 +7,7 @@ import com.yahoo.config.provision.CloudAccount;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
+import com.yahoo.config.provision.Tags;
 import com.yahoo.test.ManualClock;
 import org.junit.Test;
 
@@ -133,6 +134,29 @@ public class DeploymentSpecTest {
     }
 
     @Test
+    public void specWithTags() {
+        StringReader r = new StringReader(
+                "<deployment version='1.0'>" +
+                "   <instance id='a' tags='tag1 tag2'>" +
+                "      <prod>" +
+                "         <region active='false'>us-east1</region>" +
+                "         <region active='true'>us-west1</region>" +
+                "      </prod>" +
+                "   </instance>" +
+                "   <instance id='b' tags='tag3'>" +
+                "      <prod>" +
+                "         <region active='false'>us-east1</region>" +
+                "         <region active='true'>us-west1</region>" +
+                "      </prod>" +
+                "   </instance>" +
+                "</deployment>"
+        );
+        DeploymentSpec spec = DeploymentSpec.fromXml(r);
+        assertEquals(Tags.fromString("tag1 tag2"), spec.requireInstance("a").tags());
+        assertEquals(Tags.fromString("tag3"), spec.requireInstance("b").tags());
+    }
+
+    @Test
     public void maximalProductionSpec() {
         StringReader r = new StringReader(
                 "<deployment version='1.0'>" +
@@ -1402,7 +1426,7 @@ public class DeploymentSpecTest {
                                             </deployment>""").deployableHashCode(),
                      DeploymentSpec.fromXml("""
                                             <deployment>
-                                              <instance id='default'>
+                                              <instance id='default' tags='  '>
                                                 <test />
                                                 <staging tester-flavor='2-8-50' />
                                                 <block-change days='mon' />
@@ -1423,7 +1447,8 @@ public class DeploymentSpecTest {
                                                     <region>name</region>
                                                   </prod>
                                                 </instance>
-                                                <instance id='two' />  </parallel>
+                                                <instance id='two' />
+                                              </parallel>
                                             </deployment>""").deployableHashCode(),
                      DeploymentSpec.fromXml("""
                                             <deployment>
@@ -1459,6 +1484,16 @@ public class DeploymentSpecTest {
         assertNotEquals(DeploymentSpec.fromXml(referenceSpec).deployableHashCode(),
                         DeploymentSpec.fromXml("""
                                                <deployment>
+                                                 <instance id='default' tags='tag1'>
+                                                   <prod>
+                                                     <region>name</region>
+                                                   </prod>
+                                                 </instance>
+                                               </deployment>""").deployableHashCode());
+
+        assertNotEquals(DeploymentSpec.fromXml(referenceSpec).deployableHashCode(),
+                        DeploymentSpec.fromXml("""
+                                               <deployment>
                                                  <instance id='custom'>
                                                    <prod>
                                                      <region>name</region>