diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-30 07:53:46 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-10-30 07:53:46 +0100 |
commit | 565b3db00a82819fd2bc131d2ee5f578f7f23baa (patch) | |
tree | 021d0f5dd351d92a271eba4a2c88d46feb1d5d3f /config-model | |
parent | c6d402cad221d1fe34ffddd4c021de5ec4e277c3 (diff) |
Add Vespa version to Model
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java index 31746c39f80..bedf8057b41 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/VespaModel.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.model; import ai.vespa.rankingexpression.importer.configmodelview.ImportedMlModel; import com.yahoo.collections.Pair; +import com.yahoo.component.Version; import com.yahoo.config.ConfigBuilder; import com.yahoo.config.ConfigInstance; import com.yahoo.config.ConfigInstance.Builder; @@ -96,6 +97,8 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri private static final long serialVersionUID = 1L; public static final Logger log = Logger.getLogger(VespaModel.class.getPackage().toString()); + + private final Version version; private final ConfigModelRepo configModelRepo = new ConfigModelRepo(); private final AllocatedHosts allocatedHosts; @@ -155,6 +158,7 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri private VespaModel(ConfigModelRegistry configModelRegistry, DeployState deployState, boolean complete, FileDistributor fileDistributor) throws IOException, SAXException { super("vespamodel"); + this.version = deployState.getVespaVersion(); this.validationOverrides = deployState.validationOverrides(); configModelRegistry = new VespaConfigModelRegistry(configModelRegistry); VespaModelBuilder builder = new VespaDomBuilder(); @@ -292,6 +296,11 @@ public final class VespaModel extends AbstractConfigProducerRoot implements Seri return validationOverrides.allows(ValidationId.skipOldConfigModels, now); } + @Override + public Version version() { + return version; + } + /** * Resolves config of the given type and config id, by first instantiating the correct {@link com.yahoo.config.ConfigInstance.Builder}, * calling {@link #getConfig(com.yahoo.config.ConfigInstance.Builder, String)}. The default values used will be those of the config |