Add instance tags

4 files changed, 12 insertions, 6 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
index 9ee279c68d3..2d98c8b35c0 100644
--- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
+++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java
@@ -10,6 +10,7 @@ import com.yahoo.config.application.api.UnparsedConfigDefinition;
 import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.InstanceName;
+import com.yahoo.config.provision.Tags;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.io.IOUtils;
 import com.yahoo.io.reader.NamedReader;
@@ -85,6 +86,7 @@ public class MockApplicationPackage implements ApplicationPackage {
                                                       ApplicationId.from(TenantName.defaultName(),
                                                                          ApplicationName.from(APPLICATION_NAME),
                                                                          InstanceName.defaultName()),
+                                                      Tags.empty(),
                                                       "checksum",
                                                       APPLICATION_GENERATION,
                                                       0L);
diff --git a/config-model/src/main/resources/schema/deployment.rnc b/config-model/src/main/resources/schema/deployment.rnc
index 9723e531bd2..bf94ee3b750 100644
--- a/config-model/src/main/resources/schema/deployment.rnc
+++ b/config-model/src/main/resources/schema/deployment.rnc
@@ -35,6 +35,7 @@ PrimitiveStep =
 
 Instance = element instance {
    attribute id { xsd:string } &
+   attribute tags { xsd:string }? &
    attribute athenz-service { xsd:string }? &
    attribute cloud-account { xsd:string }? &
    StepExceptInstance
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
index c1dd62316db..6507341670f 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java
@@ -10,6 +10,7 @@ import com.yahoo.config.model.application.provider.DeployData;
 import com.yahoo.config.model.application.provider.FilesApplicationPackage;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.config.provision.ApplicationId;
+import com.yahoo.config.provision.Tags;
 import com.yahoo.document.DataType;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
@@ -225,17 +226,19 @@ public class ApplicationDeployTest {
         IOUtils.copyDirectory(new File(appPkg), tmp);
         ApplicationId applicationId = ApplicationId.from("tenant1", "application1", "instance1");
         DeployData deployData = new DeployData("bar",
-                applicationId,
-                13L,
-                false,
-                1337L,
-                3L);
+                                               applicationId,
+                                               Tags.fromString("tag1 tag2"),
+                                               13L,
+                                               false,
+                                               1337L,
+                                               3L);
         FilesApplicationPackage app = FilesApplicationPackage.fromFileWithDeployData(tmp, deployData);
         app.writeMetaData();
         FilesApplicationPackage newApp = FilesApplicationPackage.fromFileWithDeployData(tmp, deployData);
         ApplicationMetaData meta = newApp.getMetaData();
         assertEquals("bar", meta.getDeployPath());
         assertEquals(applicationId, meta.getApplicationId());
+        assertEquals(Tags.fromString("tag1 tag2"), meta.getTags());
         assertEquals(13L, (long) meta.getDeployTimestamp());
         assertEquals(1337L, (long) meta.getGeneration());
         assertEquals(3L, meta.getPreviousActiveGeneration());
diff --git a/config-model/src/test/schema-test-files/deployment-with-instances.xml b/config-model/src/test/schema-test-files/deployment-with-instances.xml
index 39771ca9d41..f37ff9f6cc6 100644
--- a/config-model/src/test/schema-test-files/deployment-with-instances.xml
+++ b/config-model/src/test/schema-test-files/deployment-with-instances.xml
@@ -35,7 +35,7 @@
     <delay hours='2'/>
 
     <parallel>
-        <instance id="three">
+        <instance id="three" tags="a b">
             <test/>
             <staging/>
         </instance>