From: Robert Varga Date: Tue, 3 May 2022 22:08:28 +0000 (+0200) Subject: Remove ImportResolutionMode.OPENCONFIG_SEMVER X-Git-Tag: v9.0.0~88 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=17fba9ed87d9811538c802da6a47d533b7d81081 Remove ImportResolutionMode.OPENCONFIG_SEMVER OpenConfig semantic version imports are unused, remove them. JIRA: YANGTOOLS-1432 Change-Id: I9b0370ce663f2bc27668b19766efa84960f77746 Signed-off-by: Robert Varga --- diff --git a/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java index 692311555c..827aa16d40 100644 --- a/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java +++ b/parser/yang-parser-api/src/main/java/org/opendaylight/yangtools/yang/parser/api/ImportResolutionMode.java @@ -7,8 +7,6 @@ */ package org.opendaylight.yangtools.yang.parser.api; -import com.google.common.annotations.Beta; - /** * Enumeration of various ways of resolving {@code import} statements. */ @@ -19,16 +17,5 @@ public enum ImportResolutionMode { * based on exact match of {@code revision-date} statement. In case it is not specified, latest available revision * is used. */ - DEFAULT, - /** - * Semantic version-based method. This method disregards {@code revision-date} statements and relies on - * - * openconfig-version extension. - * - *

- * This mode is considered experimental and may be subject to change. - */ - @Beta - @Deprecated(since = "7.0.11", forRemoval = true) - OPENCONFIG_SEMVER; + DEFAULT; } diff --git a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java index 9898b8d857..7ad3b32c60 100644 --- a/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java +++ b/parser/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultYangParserFactory.java @@ -37,8 +37,7 @@ import org.osgi.service.component.annotations.Reference; @Singleton @Component(immediate = true) public final class DefaultYangParserFactory implements YangParserFactory { - private static final List SUPPORTED_MODES = List.of( - ImportResolutionMode.DEFAULT, ImportResolutionMode.OPENCONFIG_SEMVER); + private static final List SUPPORTED_MODES = List.of(ImportResolutionMode.DEFAULT); private final ConcurrentMap reactors = new ConcurrentHashMap<>(2); diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java index b4f5cb3fba..e58b043333 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/reactor/RFC7950Reactors.java @@ -111,7 +111,6 @@ import org.opendaylight.yangtools.yang.parser.spi.SchemaTreeNamespace; import org.opendaylight.yangtools.yang.parser.spi.SubmoduleNamespace; import org.opendaylight.yangtools.yang.parser.spi.TypeNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementDefinitionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupportBundle; @@ -120,7 +119,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModule import org.opendaylight.yangtools.yang.parser.spi.source.BelongsToPrefixToModuleName; import org.opendaylight.yangtools.yang.parser.spi.source.ImpPrefixToNamespace; import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx; -import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToSemVerSourceIdentifier; import org.opendaylight.yangtools.yang.parser.spi.source.ImportedModuleContext; import org.opendaylight.yangtools.yang.parser.spi.source.IncludedModuleContext; import org.opendaylight.yangtools.yang.parser.spi.source.IncludedSubmoduleNameToModuleCtx; @@ -303,10 +301,7 @@ public final class RFC7950Reactors { return builder // Semantic version support .addStatementSupport(ModelProcessingPhase.SOURCE_LINKAGE, new OpenConfigVersionSupport(config)) - .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, SemanticVersionNamespace.BEHAVIOUR) - .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, SemanticVersionModuleNamespace.BEHAVIOUR) - .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, - ImportPrefixToSemVerSourceIdentifier.BEHAVIOUR); + .addNamespaceSupport(ModelProcessingPhase.SOURCE_LINKAGE, SemanticVersionNamespace.BEHAVIOUR); } /** diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java index cc1e0f52ee..c33333204b 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/ImportStatementSupport.java @@ -31,7 +31,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatementDecorators; import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.ri.stmt.EffectiveStatements; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.PreLinkageModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStringStatementSupport; @@ -68,11 +67,8 @@ public final class ImportStatementSupport .addOptional(YangStmtMapping.REFERENCE) .build(); - private final boolean semanticVersioning; - private ImportStatementSupport(final YangParserConfiguration config, final SubstatementValidator validator) { super(YangStmtMapping.IMPORT, StatementPolicy.reject(), config, validator); - semanticVersioning = config.importResolutionMode() == ImportResolutionMode.OPENCONFIG_SEMVER; } public static @NonNull ImportStatementSupport rfc6020Instance(final YangParserConfiguration config) { @@ -133,11 +129,7 @@ public final class ImportStatementSupport @Override public void onLinkageDeclared(final Mutable stmt) { - if (semanticVersioning) { - SemanticVersionImport.onLinkageDeclared(stmt); - } else { - RevisionImport.onLinkageDeclared(stmt); - } + RevisionImport.onLinkageDeclared(stmt); } @Override diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java deleted file mode 100644 index 51d8fed36b..0000000000 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/import_/SemanticVersionImport.java +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright (c) 2017 Pantheon Technologies, s.r.o. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.import_; - -import static java.util.Objects.requireNonNull; -import static org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase.SOURCE_LINKAGE; -import static org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils.firstAttributeOf; - -import com.google.common.base.MoreObjects.ToStringHelper; -import java.util.Collection; -import java.util.Optional; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.Empty; -import org.opendaylight.yangtools.yang.common.QNameModule; -import org.opendaylight.yangtools.yang.model.api.stmt.ImportEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ImportStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; -import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier; -import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; -import org.opendaylight.yangtools.yang.parser.rfc7950.namespace.ModuleQNameToPrefix; -import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder; -import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceAction; -import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.InferenceContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ModelActionBuilder.Prerequisite; -import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceKeyCriterion; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionModuleNamespace; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; -import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToModuleCtx; -import org.opendaylight.yangtools.yang.parser.spi.source.ImportPrefixToSemVerSourceIdentifier; -import org.opendaylight.yangtools.yang.parser.spi.source.ImportedModuleContext; -import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToModuleQName; -import org.opendaylight.yangtools.yang.parser.spi.source.ModuleCtxToSourceIdentifier; - -final class SemanticVersionImport { - - private abstract static class CompatibleCriterion extends NamespaceKeyCriterion { - private final String moduleName; - - CompatibleCriterion(final String moduleName) { - this.moduleName = requireNonNull(moduleName); - } - - @Override - public boolean match(final SemVerSourceIdentifier key) { - return moduleName.equals(key.getName()); - } - - @Override - protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { - return toStringHelper.add("moduleName", moduleName); - } - } - - private static final class NoVerCompatibleCriterion extends SemanticVersionImport.CompatibleCriterion { - NoVerCompatibleCriterion(final String moduleName) { - super(moduleName); - } - - @Override - public SemVerSourceIdentifier select(final SemVerSourceIdentifier first, - final SemVerSourceIdentifier second) { - // TODO Auto-generated method stub - return null; - } - } - - private static final class SemVerCompatibleCriterion extends SemanticVersionImport.CompatibleCriterion { - private final SemVer semVer; - - SemVerCompatibleCriterion(final String moduleName, final SemVer semVer) { - super(moduleName); - this.semVer = requireNonNull(semVer); - } - - @Override - public boolean match(final SemVerSourceIdentifier key) { - if (!super.match(key)) { - return false; - } - final Optional optKeyVer = key.getSemanticVersion(); - if (!optKeyVer.isPresent()) { - return false; - } - - final SemVer keyVer = optKeyVer.get(); - if (semVer.getMajor() != keyVer.getMajor()) { - return false; - } - if (semVer.getMinor() > keyVer.getMinor()) { - return false; - } - return semVer.getMinor() < keyVer.getMinor() || semVer.getPatch() <= keyVer.getPatch(); - } - - @Override - public SemVerSourceIdentifier select(final SemVerSourceIdentifier first, - final SemVerSourceIdentifier second) { - return first.getSemanticVersion().get().compareTo(second.getSemanticVersion().get()) >= 0 ? first - : second; - } - - @Override - protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { - return super.addToStringAttributes(toStringHelper).add("version", semVer); - } - } - - private SemanticVersionImport() { - // Hidden on purpose - } - - static void onLinkageDeclared(final Mutable stmt) { - final ModelActionBuilder importAction = stmt.newInferenceAction(SOURCE_LINKAGE); - final String moduleName = stmt.getArgument(); - final SemVer semanticVersion = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt); - final SemanticVersionImport.CompatibleCriterion criterion = semanticVersion == null - ? new NoVerCompatibleCriterion(moduleName) - : new SemVerCompatibleCriterion(moduleName, semanticVersion); - - final Prerequisite> imported = importAction.requiresCtx(stmt, - SemanticVersionModuleNamespace.class, criterion, SOURCE_LINKAGE); - final Prerequisite> linkageTarget = importAction.mutatesCtx(stmt.getRoot(), SOURCE_LINKAGE); - - importAction.apply(new InferenceAction() { - @Override - public void apply(final InferenceContext ctx) { - final StmtContext importedModule = imported.resolve(ctx); - final SemVer importedVersion = stmt.getFromNamespace(SemanticVersionNamespace.class, stmt); - final SourceIdentifier importedModuleIdentifier = importedModule.getFromNamespace( - ModuleCtxToSourceIdentifier.class, importedModule); - final SemVerSourceIdentifier semVerModuleIdentifier = createSemVerModuleIdentifier( - importedModuleIdentifier, importedVersion); - stmt.addToNs(ImportedVersionNamespace.class, Empty.value(), semVerModuleIdentifier); - - linkageTarget.resolve(ctx).addToNs(ImportedModuleContext.class, importedModuleIdentifier, - importedModule); - final String impPrefix = firstAttributeOf(stmt.declaredSubstatements(), PrefixStatement.class); - stmt.addToNs(ImportPrefixToModuleCtx.class, impPrefix, importedModule); - stmt.addToNs(ImportPrefixToSemVerSourceIdentifier.class, impPrefix, semVerModuleIdentifier); - - final QNameModule mod = InferenceException.throwIfNull(stmt.getFromNamespace( - ModuleCtxToModuleQName.class, importedModule), stmt, "Failed to find module of %s", importedModule); - stmt.addToNs(ModuleQNameToPrefix.class, mod, impPrefix); - } - - @Override - public void prerequisiteFailed(final Collection> failed) { - if (failed.contains(imported)) { - throw new InferenceException(stmt, - "Unable to find module compatible with requested import [%s(%s)].", moduleName, - getRequestedImportVersionString(stmt)); - } - } - }); - } - - private static Optional getRequestedImportVersion(final StmtContext stmt) { - return Optional.ofNullable(stmt.getFromNamespace(SemanticVersionNamespace.class, stmt)); - } - - private static String getRequestedImportVersionString(final StmtContext stmt) { - return getRequestedImportVersion(stmt).map(SemVer::toString).orElse(""); - } - - private static SemVerSourceIdentifier createSemVerModuleIdentifier( - final SourceIdentifier importedModuleIdentifier, final SemVer semVer) { - return SemVerSourceIdentifier.create(importedModuleIdentifier.getName(), - importedModuleIdentifier.getRevision(), semVer); - } -} diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java index f07ac61197..fee56063cf 100644 --- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java +++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/module/ModuleStatementSupport.java @@ -38,12 +38,10 @@ import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.NamespaceStatement; import org.opendaylight.yangtools.yang.model.api.stmt.PrefixStatement; import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier; -import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatementDecorators; import org.opendaylight.yangtools.yang.model.ri.stmt.DeclaredStatements; import org.opendaylight.yangtools.yang.model.spi.meta.SubstatementIndexingException; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; import org.opendaylight.yangtools.yang.parser.spi.ModuleNamespace; import org.opendaylight.yangtools.yang.parser.spi.NamespaceToModule; @@ -52,8 +50,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.BoundStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.CommonStmtCtx; import org.opendaylight.yangtools.yang.parser.spi.meta.EffectiveStmtCtx.Current; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionModuleNamespace; -import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils; @@ -133,11 +129,8 @@ public final class ModuleStatementSupport .addOptional(OpenConfigStatements.OPENCONFIG_VERSION) .build(); - private final boolean semanticVersioning; - private ModuleStatementSupport(final YangParserConfiguration config, final SubstatementValidator validator) { super(YangStmtMapping.MODULE, StatementPolicy.reject(), config, validator); - semanticVersioning = config.importResolutionMode() == ImportResolutionMode.OPENCONFIG_SEMVER; } public static @NonNull ModuleStatementSupport rfc6020Instance(final YangParserConfiguration config) { @@ -213,10 +206,6 @@ public final class ModuleStatementSupport stmt.addToNs(ModuleCtxToSourceIdentifier.class, stmt, moduleIdentifier); stmt.addToNs(ModuleQNameToModuleName.class, qNameModule, moduleName); stmt.addToNs(ImportPrefixToModuleCtx.class, modulePrefix, stmt); - - if (semanticVersioning) { - addToSemVerModuleNamespace(stmt, moduleIdentifier); - } } @Override @@ -292,12 +281,4 @@ public final class ModuleStatementSupport private static SourceException noNamespace(final @NonNull CommonStmtCtx stmt) { return new SourceException("No namespace declared in module", stmt); } - - private static void addToSemVerModuleNamespace( - final Mutable stmt, - final SourceIdentifier moduleIdentifier) { - final SemVerSourceIdentifier id = SemVerSourceIdentifier.create(stmt.getRawArgument(), - stmt.getFromNamespace(SemanticVersionNamespace.class, stmt)); - stmt.addToNs(SemanticVersionModuleNamespace.class, id, stmt); - } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java deleted file mode 100644 index 399e5d4cdd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionBorderCaseTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void borderCaseValidMajorTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources( - "/openconfig-version/border-case/border-case-valid-major", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("5.5.5"), bar.getSemanticVersion().get()); - } - - @Test - public void borderCaseValidMinorTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources( - "/openconfig-version/border-case/border-case-valid-minor", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("5.6.5"), bar.getSemanticVersion().get()); - } - - @Test - public void borderCaseValidPatchTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources( - "/openconfig-version/border-case/border-case-valid-patch", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("5.5.6"), bar.getSemanticVersion().get()); - } - - @Test - public void borderCaseInvalidMajorTest() throws Exception { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-major", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(5.5.5)].")); - } - - @Test - public void borderCaseInvalidMinorTest() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-minor", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(5.5.5)].")); - } - - @Test - public void borderCaseInvalidPatchTest() throws Exception { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-patch", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(5.5.5)].")); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java deleted file mode 100644 index 11272046de..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionComplexTest.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.Optional; -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionComplexTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void complexTest1() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/complex/complex-1", - SEMVER); - verifySchemaContextTest1(context); - } - - @Test - public void complexTest1Yang1_1() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/complex/complex-1-rfc7950", - SEMVER); - verifySchemaContextTest1(context); - } - - private static void verifySchemaContextTest1(final SchemaContext context) { - assertNotNull(context); - - final Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - final Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - // check module versions - assertEquals(SemVer.valueOf("1.3.95"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("1.50.2"), foo.getSemanticVersion().get()); - - final Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("1.2.6"), bar.getSemanticVersion().get()); - - final Module foobar = StmtTestUtils.findImportedModule(context, bar, "foobar"); - assertEquals(SemVer.valueOf("2.26.465"), foobar.getSemanticVersion().get()); - - // check imported components - assertNotNull("This component should be present", context.findDataTreeChild( - QName.create(bar.getQNameModule(), "root"), - QName.create(bar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "number")).orElse(null)); - - assertNotNull("This component should be present", context.findDataTreeChild( - QName.create(bar.getQNameModule(), "should-present")).orElse(null)); - - // check not imported components - assertEquals("This component should not be present", Optional.empty(), context.findDataTreeChild( - QName.create(bar.getQNameModule(), "root"), - QName.create(bar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "oldnumber"))); - - assertEquals("This component should not be present", Optional.empty(), context.findDataTreeChild( - QName.create(bar.getQNameModule(), "should-not-be-present"))); - } - - @Test - public void complexTest2() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/complex/complex-2", SEMVER); - verifySchemaContextTest2(context); - } - - @Test - public void complexTest2Yang1_1() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/complex/complex-2-rfc7950", - SEMVER); - verifySchemaContextTest2(context); - } - - private static void verifySchemaContextTest2(final SchemaContext context) { - assertNotNull(context); - - final Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - final Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - // check module versions - assertEquals(SemVer.valueOf("2.5.50"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("2.32.2"), foo.getSemanticVersion().get()); - - final Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("4.9.8"), bar.getSemanticVersion().get()); - - final Module foobar = StmtTestUtils.findImportedModule(context, bar, "foobar"); - assertEquals(SemVer.valueOf("7.13.99"), foobar.getSemanticVersion().get()); - - // check used augmentations - assertNotNull("This component should be present", context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "should-present-leaf-1")).orElse(null)); - - assertNotNull("This component should be present", context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "should-present-leaf-2")).orElse(null)); - - // check not used augmentations - assertEquals("This component should not be present", Optional.empty(), context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "should-not-be-present-leaf-1"))); - assertEquals("This component should not be present", Optional.empty(), context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "test-container"), - QName.create(bar.getQNameModule(), "should-not-be-present-leaf-2"))); - - // check if correct foobar module was included - assertNotNull("This component should be present", context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "included-correct-mark")).orElse(null)); - - assertEquals("This component should not be present", Optional.empty(), context.findDataTreeChild( - QName.create(foobar.getQNameModule(), "root"), - QName.create(foobar.getQNameModule(), "included-not-correct-mark"))); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java deleted file mode 100644 index 65e60945dd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionDefaultsTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import java.util.Optional; -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionDefaultsTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void defaultsTest() throws Exception { - final var context = StmtTestUtils.parseYangSources("/openconfig-version/defaults/defaults", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - - assertEquals(Optional.empty(), foo.getSemanticVersion()); - assertEquals(Optional.empty(), bar.getSemanticVersion()); - } - - @Test - public void defaultMajorValidTest() throws Exception { - final var context = StmtTestUtils.parseYangSources("/openconfig-version/defaults/default-major-valid", - SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - - assertEquals(Optional.empty(), foo.getSemanticVersion()); - assertEquals(SemVer.valueOf("0.99.99"), bar.getSemanticVersion().get()); - } - - @Test - public void defaultMajorInvalidTest() throws Exception { - final var ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/defaults/default-major-invalid", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(0.0.1)].")); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java deleted file mode 100644 index 9cffcd4237..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionIgnoringRevisionTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionIgnoringRevisionTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void ignoringRevisionTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/ignoring-revision", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void ignoringRevision2Test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/ignoring-revision-2", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java deleted file mode 100644 index 520f0242be..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionImportTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionImportTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void importValidTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/import/import-valid", SEMVER); - assertNotNull(context); - - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("1.0.0"), semVer.getSemanticVersion().get()); - } - - @Test - public void importInvalidDeprecatedTest1() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/import/import-invalid-deprecated-1", SEMVER)); - assertThat(ex.getCause().getMessage(), startsWith( - "Unable to find module compatible with requested import [openconfig-extensions(1.0.0)].")); - } - - @Test - public void importInvalidDeprecatedTest2() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/import/import-invalid-deprecated-2", SEMVER)); - assertThat(ex.getCause().getMessage(), startsWith( - "Unable to find module compatible with requested import [openconfig-extensions(0.9.9)].")); - } - - @Test - public void importInvalidNotsufficientTest1() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/import/import-invalid-notsufficient-1", SEMVER)); - assertThat(ex.getCause().getMessage(), startsWith( - "Unable to find module compatible with requested import [openconfig-extensions(2.0.0)].")); - } - - @Test - public void importInvalidNotsufficientTest2() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/import/import-invalid-notsufficient-2", SEMVER)); - assertThat(ex.getCause().getMessage(), startsWith( - "Unable to find module compatible with requested import [openconfig-extensions(2.0.5)].")); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java deleted file mode 100644 index 97ba3cd935..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionMultipleImportTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.ModuleImport; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionMultipleImportTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void multipleInvalidDeprecatedTest() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/multiple/multiple-invalid-deprecated", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(1.0.0)].")); - } - - @Test - public void multipleInvalidNosufficientTest() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/multiple/multiple-invalid-nosufficient", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(2.5.5)].")); - } - - @Test - public void multipleValidDefaultsTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/multiple/multiple-valid-defaults", - SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("0.9.5"), bar.getSemanticVersion().get()); - } - - @Test - public void multipleValidSpecifiedTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/multiple/multiple-valid-specified", - SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("5.5.6"), bar.getSemanticVersion().get()); - } - - private static Module findImportedModule(final SchemaContext context, final Module rootModule, - final String importedModuleName) { - ModuleImport requestedModuleImport = null; - for (ModuleImport moduleImport : rootModule.getImports()) { - if (moduleImport.getModuleName().equals(importedModuleName)) { - requestedModuleImport = moduleImport; - break; - } - } - - return context.findModule(requestedModuleImport.getModuleName(), requestedModuleImport.getRevision()).get(); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java deleted file mode 100644 index 6a39042df6..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionPositionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionPositionTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void positionHeadTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/position/position-head", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void positionMiddleTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/position/position-middle", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void positiontailTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/position/position-tail", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java deleted file mode 100644 index 11f83b9fcf..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionTest.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver; - -import static org.hamcrest.CoreMatchers.instanceOf; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import java.util.Optional; -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class OpenconfigVersionTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void basicTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/basic", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void basicTest2() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/basic-2", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void basicTest3() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/basic-3", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - } - - @Test - public void basicImportTest1() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/basic-import-1", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void multipleModulesTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/multiple-modules", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("0.10.4"), bar.getSemanticVersion().get()); - } - - @Test - public void basicImportErrTest1() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/basic-import-invalid-1", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(0.1.2)].")); - } - - @Test - public void basicImportErrTest2() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/openconfig-version/basic-import-invalid-2", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(0.1.2)].")); - } - - @Test - public void nodeTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/node-test", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("2016.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("2016.4.6"), bar.getSemanticVersion().get()); - - QName root = QName.create("foo", "2016-01-01", "foo-root"); - QName container20160404 = QName.create("foo", "2016-01-01", "con20160404"); - SchemaNode findDataSchemaNode = context.findDataTreeChild(root, container20160404).orElseThrow(); - assertThat(findDataSchemaNode, instanceOf(ContainerSchemaNode.class)); - - QName container20160405 = QName.create("foo", "2016-01-01", "con20160405"); - findDataSchemaNode = context.findDataTreeChild(root, container20160405).orElseThrow(); - assertThat(findDataSchemaNode, instanceOf(ContainerSchemaNode.class)); - - QName container20160406 = QName.create("foo", "2016-01-01", "con20160406"); - findDataSchemaNode = context.findDataTreeChild(root, container20160406).orElseThrow(); - assertThat(findDataSchemaNode, instanceOf(ContainerSchemaNode.class)); - - QName container20170406 = QName.create("foo", "2016-01-01", "con20170406"); - final Optional dataTreeChild = context.findDataTreeChild(root, container20170406); - assertEquals(Optional.empty(), dataTreeChild); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java deleted file mode 100644 index 375fb185ad..0000000000 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/yin/YinOpenconfigVersionTest.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.stmt.openconfigver.yin; - -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; - -import java.io.IOException; -import java.net.URISyntaxException; -import org.junit.Test; -import org.opendaylight.yangtools.concepts.SemVer; -import org.opendaylight.yangtools.yang.common.XMLNamespace; -import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.api.ImportResolutionMode; -import org.opendaylight.yangtools.yang.parser.api.YangParserConfiguration; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; -import org.xml.sax.SAXException; - -@Deprecated(since = "8.0.4", forRemoval = true) -public class YinOpenconfigVersionTest { - private static final YangParserConfiguration SEMVER = YangParserConfiguration.builder() - .importResolutionMode(ImportResolutionMode.OPENCONFIG_SEMVER) - .build(); - - @Test - public void basicTest() throws URISyntaxException, SAXException, IOException, ReactorException { - SchemaContext context = StmtTestUtils.parseYinSources("/openconfig-version/yin-input/basic", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module bar = context.findModules(XMLNamespace.of("bar")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void basicImportTest1() throws URISyntaxException, SAXException, IOException, ReactorException { - SchemaContext context = StmtTestUtils.parseYinSources("/openconfig-version/yin-input/basic-import", SEMVER); - assertNotNull(context); - - Module foo = context.findModules(XMLNamespace.of("foo")).iterator().next(); - Module semVer = context.findModules(XMLNamespace.of("http://openconfig.net/yang/openconfig-ext")) - .iterator().next(); - - assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get()); - assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get()); - Module bar = StmtTestUtils.findImportedModule(context, foo, "bar"); - assertEquals(SemVer.valueOf("0.1.2"), bar.getSemanticVersion().get()); - } - - @Test - public void basicImportErrTest1() { - ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYinSources("/openconfig-version/yin-input/basic-import-invalid", SEMVER)); - assertThat(ex.getCause().getMessage(), - startsWith("Unable to find module compatible with requested import [bar(0.1.2)].")); - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang deleted file mode 100644 index 64c9a19254..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29;} - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang deleted file mode 100644 index 22a7e1571f..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29;} - import bar { prefix bar; revision-date 2016-01-31;} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang deleted file mode 100644 index 3945e5439d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/foo.yang +++ /dev/null @@ -1,15 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-3/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang deleted file mode 100644 index 2a435be8fa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang deleted file mode 100644 index 2e84793fd7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/bar@2016-01-31.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang deleted file mode 100644 index 1a1c25a5c7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-1/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang deleted file mode 100644 index e1c85adb8b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang deleted file mode 100644 index 4f4f69514c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/bar@2016-01-31.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.3"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang deleted file mode 100644 index 1a1c25a5c7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-1/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang deleted file mode 100644 index 2e84793fd7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang deleted file mode 100644 index 2b37c2422b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic-import-invalid-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang deleted file mode 100644 index b973ab3f4c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang deleted file mode 100644 index 2b37c2422b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/basic/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang deleted file mode 100644 index 5ccae0cdcf..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang deleted file mode 100644 index 4cc416c5b3..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "3.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang deleted file mode 100644 index 7ba0f33e95..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "4.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-major/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang deleted file mode 100644 index eca43da12e..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "5.2.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang deleted file mode 100644 index dc86015a47..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.3.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang deleted file mode 100644 index 5a3afb60a5..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "5.4.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-minor/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang deleted file mode 100644 index 68b2f665e0..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang deleted file mode 100644 index b780b3db4b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.3"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang deleted file mode 100644 index 391975aa77..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.4"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-invalid-patch/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang deleted file mode 100644 index 38172e4baa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "4.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang deleted file mode 100644 index 2221251649..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang deleted file mode 100644 index 2aa155d43b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "6.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-major/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang deleted file mode 100644 index 5f6dfc8f8f..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "5.4.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang deleted file mode 100644 index 2221251649..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang deleted file mode 100644 index 00929184e2..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "5.6.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-minor/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang deleted file mode 100644 index 6f0b2ae242..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.4"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang deleted file mode 100644 index 2221251649..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang deleted file mode 100644 index 2b35449bb8..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.6"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/border-case/border-case-valid-patch/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang deleted file mode 100644 index 3f495b84be..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-03.yang +++ /dev/null @@ -1,24 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.012"; } - import foobar { prefix foobar; oc-ext:openconfig-version "2.25.3"; } - - revision "2016-01-03" { - description "Imported version"; - } - oc-ext:openconfig-version "1.2.6"; - - container root { - container test-container { - uses foobar:test-grouping; - } - } - - leaf-list should-present { - type string; - description "List of strings"; - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang deleted file mode 100644 index 7490e8df60..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/bar@2016-01-04.yang +++ /dev/null @@ -1,24 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.210"; } - import foobar { prefix foobar; oc-ext:openconfig-version "2.25.3"; } - - revision "2016-01-04" { - description "Not-imported version"; - } - oc-ext:openconfig-version "2.200.200"; - - container root { - container test-container { - uses foobar:test-grouping; - } - } - - leaf-list should-not-be-present { - type uint32; - description "List of integers"; - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang deleted file mode 100644 index 087c05f8b3..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foo.yang +++ /dev/null @@ -1,13 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.0.0"; } - import bar { prefix bar; oc-ext:openconfig-version "1.2.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "1.50.02"; -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang deleted file mode 100644 index 89863b20a1..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-01-31.yang +++ /dev/null @@ -1,23 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.95"; } - - revision "2016-01-31" { - description "Not-imported version"; - } - oc-ext:openconfig-version "2.25.2"; - - grouping test-grouping { - leaf name { - type string; - description "Name"; - } - leaf oldnumber { - type uint8; - description "Old number"; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang deleted file mode 100644 index 132e305b21..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/foobar@2016-02-28.yang +++ /dev/null @@ -1,23 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.3.95"; } - - revision "2016-02-28" { - description "Imported version"; - } - oc-ext:openconfig-version "2.26.465"; - - grouping test-grouping { - leaf name { - type string; - description "Name"; - } - leaf number { - type uint32; - description "Number"; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang deleted file mode 100644 index ff84c41722..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1-rfc7950/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1.1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "1.3.95"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang deleted file mode 100644 index 138dbad9fd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-03.yang +++ /dev/null @@ -1,24 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.012"; } - import foobar { prefix foobar; oc-ext:openconfig-version "2.25.3"; } - - revision "2016-01-03" { - description "Imported version"; - } - oc-ext:openconfig-version "1.2.6"; - - container root { - container test-container { - uses foobar:test-grouping; - } - } - - leaf-list should-present { - type string; - description "List of strings"; - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang deleted file mode 100644 index 10d176b9f5..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/bar@2016-01-04.yang +++ /dev/null @@ -1,24 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.210"; } - import foobar { prefix foobar; oc-ext:openconfig-version "2.25.3"; } - - revision "2016-01-04" { - description "Not-imported version"; - } - oc-ext:openconfig-version "2.200.200"; - - container root { - container test-container { - uses foobar:test-grouping; - } - } - - leaf-list should-not-be-present { - type uint32; - description "List of integers"; - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang deleted file mode 100644 index 9caffd9106..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foo.yang +++ /dev/null @@ -1,13 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.0.0"; } - import bar { prefix bar; oc-ext:openconfig-version "1.2.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "1.50.02"; -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang deleted file mode 100644 index 173082532d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-01-31.yang +++ /dev/null @@ -1,23 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.2.95"; } - - revision "2016-01-31" { - description "Not-imported version"; - } - oc-ext:openconfig-version "2.25.2"; - - grouping test-grouping { - leaf name { - type string; - description "Name"; - } - leaf oldnumber { - type uint8; - description "Old number"; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang deleted file mode 100644 index 5e647e9c30..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/foobar@2016-02-28.yang +++ /dev/null @@ -1,23 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "1.3.95"; } - - revision "2016-02-28" { - description "Imported version"; - } - oc-ext:openconfig-version "2.26.465"; - - grouping test-grouping { - leaf name { - type string; - description "Name"; - } - leaf number { - type uint32; - description "Number"; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang deleted file mode 100644 index 6cff937b92..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-1/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "1.3.95"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang deleted file mode 100644 index fe922ff142..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-03.yang +++ /dev/null @@ -1,23 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.0.40"; } - import foobar { prefix foobar; oc-ext:openconfig-version "7.12.54"; } - - revision "2016-01-03" { - description "Imported version"; - } - oc-ext:openconfig-version "4.9.8"; - - augment "/foobar:root/foobar:test-container" { - leaf should-present-leaf-1 { - type string; - } - leaf should-present-leaf-2 { - type uint8; - default 0; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang deleted file mode 100644 index 858bb0466d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/bar@2016-01-04.yang +++ /dev/null @@ -1,23 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.0.50"; } - import foobar { prefix foobar; oc-ext:openconfig-version "7.12.54"; } - - revision "2016-01-04" { - description "Not-imported version"; - } - oc-ext:openconfig-version "3.0.5"; - - augment "/foobar:root/foobar:test-container" { - leaf should-not-be-present-leaf-1 { - type string; - } - leaf should-not-be-present-leaf-2 { - type uint8; - default 0; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang deleted file mode 100644 index 734f5543c1..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foo.yang +++ /dev/null @@ -1,13 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1.1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.40"; } - import bar { prefix bar; oc-ext:openconfig-version "4.1.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.32.2"; -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang deleted file mode 100644 index 7c7ac1aaa3..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-01-31.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.1.950"; } - - revision "2016-01-31" { - description "Not-imported version"; - } - oc-ext:openconfig-version "8.0.0"; - - container root { - leaf included-not-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang deleted file mode 100644 index 930c1162f4..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-27.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.50"; } - - revision "2016-02-27" { - description "Not-imported version"; - } - oc-ext:openconfig-version "7.13.0"; - - container root { - leaf included-not-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang deleted file mode 100644 index 676834c3dd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/foobar@2016-02-28.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.50"; } - - revision "2016-02-28" { - description "Imported version"; - } - oc-ext:openconfig-version "7.13.99"; - - container root { - leaf included-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang deleted file mode 100644 index 9b021b6590..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2-rfc7950/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "2.5.50"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang deleted file mode 100644 index fe922ff142..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-03.yang +++ /dev/null @@ -1,23 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.0.40"; } - import foobar { prefix foobar; oc-ext:openconfig-version "7.12.54"; } - - revision "2016-01-03" { - description "Imported version"; - } - oc-ext:openconfig-version "4.9.8"; - - augment "/foobar:root/foobar:test-container" { - leaf should-present-leaf-1 { - type string; - } - leaf should-present-leaf-2 { - type uint8; - default 0; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang deleted file mode 100644 index c232860931..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/bar@2016-01-04.yang +++ /dev/null @@ -1,23 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.0.50"; } - import foobar { prefix foobar; oc-ext:openconfig-version "7.12.54"; } - - revision "2016-01-04" { - description "Not-imported version"; - } - oc-ext:openconfig-version "3.0.5"; - - augment "/foobar:root/foobar:test-container" { - leaf should-not-be-present-leaf-1 { - type string; - } - leaf should-not-be-present-leaf-2 { - type uint8; - default 0; - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang deleted file mode 100644 index 5f534911c7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foo.yang +++ /dev/null @@ -1,13 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.40"; } - import bar { prefix bar; oc-ext:openconfig-version "4.1.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.32.2"; -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang deleted file mode 100644 index 7c7ac1aaa3..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-01-31.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.1.950"; } - - revision "2016-01-31" { - description "Not-imported version"; - } - oc-ext:openconfig-version "8.0.0"; - - container root { - leaf included-not-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang deleted file mode 100644 index 930c1162f4..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-27.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.50"; } - - revision "2016-02-27" { - description "Not-imported version"; - } - oc-ext:openconfig-version "7.13.0"; - - container root { - leaf included-not-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang deleted file mode 100644 index 676834c3dd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/foobar@2016-02-28.yang +++ /dev/null @@ -1,20 +0,0 @@ -module foobar { - namespace "foobar"; - prefix foobar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; oc-ext:openconfig-version "2.5.50"; } - - revision "2016-02-28" { - description "Imported version"; - } - oc-ext:openconfig-version "7.13.99"; - - container root { - leaf included-correct-mark { - type empty; - } - container test-container { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang deleted file mode 100644 index 9b021b6590..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/complex/complex-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "2.5.50"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang deleted file mode 100644 index 049c662137..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.0.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang deleted file mode 100644 index 2985d68f89..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/foo.yang +++ /dev/null @@ -1,15 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-invalid/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang deleted file mode 100644 index 62e0506d75..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "0.99.99"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang deleted file mode 100644 index 3db561357f..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/foo.yang +++ /dev/null @@ -1,15 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/default-major-valid/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang deleted file mode 100644 index 7dedebe1c3..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/bar.yang +++ /dev/null @@ -1,12 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - revision "2016-01-31" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang deleted file mode 100644 index 005e06a8a9..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/defaults/defaults/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import bar { prefix bar; revision-date 2016-01-31; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang deleted file mode 100644 index 2a435be8fa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang deleted file mode 100644 index 2e84793fd7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/bar@2016-01-31.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang deleted file mode 100644 index 2b37c2422b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang deleted file mode 100644 index 2a435be8fa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang deleted file mode 100644 index 2b37c2422b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/ignoring-revision/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang deleted file mode 100644 index 7d043d9f43..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "1.0.0"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang deleted file mode 100644 index 4601af98ba..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-1/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "2.0.0"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang deleted file mode 100644 index 6a217a9e22..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.9.9"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang deleted file mode 100644 index a310b5cadc..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-deprecated-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "1.0.0"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang deleted file mode 100644 index 12837d617b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "2.0.0"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang deleted file mode 100644 index a310b5cadc..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-1/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "1.0.0"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang deleted file mode 100644 index 987eea37ca..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "2.0.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang deleted file mode 100644 index 4601af98ba..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-invalid-notsufficient-2/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "2.0.0"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang deleted file mode 100644 index 7d043d9f43..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/foo.yang +++ /dev/null @@ -1,14 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "1.0.0"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang deleted file mode 100644 index a310b5cadc..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/import/import-valid/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "1.0.0"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang deleted file mode 100644 index ff09241e6e..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang deleted file mode 100644 index 4280db0c12..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang deleted file mode 100644 index c2ff5a957d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-03.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-03" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.3"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang deleted file mode 100644 index afa6b30163..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-04.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-04" { - description "Initial version"; - } - oc-ext:openconfig-version "0.10.4"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang deleted file mode 100644 index 2e84793fd7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-01-31.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "1.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang deleted file mode 100644 index c6968db878..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/bar@2016-02-28.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-28" { - description "Initial version"; - } - oc-ext:openconfig-version "1.2.28"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang deleted file mode 100644 index 1a1c25a5c7..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple-modules/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang deleted file mode 100644 index f701a5be23..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang deleted file mode 100644 index c65cd27e2a..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "2.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang deleted file mode 100644 index 2371e1a22a..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "4.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang deleted file mode 100644 index 03cdd7eb3f..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/bar@2016-02-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.0.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang deleted file mode 100644 index 243aa3504a..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "1.0.0"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-deprecated/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang deleted file mode 100644 index ae8c8d5184..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.0.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang deleted file mode 100644 index 7aff7c5956..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "2.1.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang deleted file mode 100644 index 5f124dbf0d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "2.5.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang deleted file mode 100644 index 7fd4d004f0..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/bar@2016-02-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-02" { - description "Initial version"; - } - oc-ext:openconfig-version "2.5.4"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang deleted file mode 100644 index f5c591b85e..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "2.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-invalid-nosufficient/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang deleted file mode 100644 index 5679d89d6d..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.0.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang deleted file mode 100644 index 0f94048b8b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang deleted file mode 100644 index 6a2560ad18..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.9.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang deleted file mode 100644 index d343e2a047..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/bar@2016-02-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-02" { - description "Initial version"; - } - oc-ext:openconfig-version "1.0.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang deleted file mode 100644 index 14783cc494..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-defaults/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang deleted file mode 100644 index 720eee21e2..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-01" { - description "Initial version"; - } - oc-ext:openconfig-version "4.4.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang deleted file mode 100644 index a6116f3e96..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-01-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.0"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang deleted file mode 100644 index 26049d4e98..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-01.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.5"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang deleted file mode 100644 index 0bf5091c20..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/bar@2016-02-02.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-02" { - description "Initial version"; - } - oc-ext:openconfig-version "5.5.6"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang deleted file mode 100644 index 4edb32ed1c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; oc-ext:openconfig-version "5.5.5"; } - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/multiple/multiple-valid-specified/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang deleted file mode 100644 index 5e70700d79..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-04.yang +++ /dev/null @@ -1,18 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision 2016-04-04 { - description "test"; - } - - oc-ext:openconfig-version "2016.4.4"; - - grouping grp { - container con20160404 { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang deleted file mode 100644 index 97faa03d8c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-05.yang +++ /dev/null @@ -1,20 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision 2016-04-05 { - description "test"; - } - - oc-ext:openconfig-version "2016.4.5"; - - grouping grp { - container con20160404 { - } - container con20160405 { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang deleted file mode 100644 index d2bd0f3711..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2016-04-06.yang +++ /dev/null @@ -1,22 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision 2016-04-06 { - description "test"; - } - - oc-ext:openconfig-version "2016.4.6"; - - grouping grp { - container con20160404 { - } - container con20160405 { - } - container con20160406 { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang deleted file mode 100644 index bff38fc2cf..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/bar@2017-04-06.yang +++ /dev/null @@ -1,24 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision 2017-04-06 { - description "test"; - } - - oc-ext:openconfig-version "2017.4.6"; - - grouping grp { - container con20160404 { - } - container con20160405 { - } - container con20160406 { - } - container con20170406 { - } - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang deleted file mode 100644 index c723cc5732..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/foo.yang +++ /dev/null @@ -1,18 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2017-04-06; oc-ext:openconfig-version "2016.4.5"; } - - revision 2016-01-01 { - description "test"; - } - - oc-ext:openconfig-version "2016.1.1"; - - container foo-root { - uses bar:grp; - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/node-test/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang deleted file mode 100644 index 9e6429c7b2..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/bar.yang +++ /dev/null @@ -1,16 +0,0 @@ -module bar { - oc-ext:openconfig-version "0.1.2"; - - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang deleted file mode 100644 index 41b5fdf39a..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/foo.yang +++ /dev/null @@ -1,17 +0,0 @@ -module foo { - oc-ext:openconfig-version "0.1.1"; - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang deleted file mode 100644 index 43c5f3a2bf..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-head/openconfig-extensions.yang +++ /dev/null @@ -1,83 +0,0 @@ -module openconfig-extensions { - oc-ext:openconfig-version "0.0.1"; - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang deleted file mode 100644 index b973ab3f4c..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/bar.yang +++ /dev/null @@ -1,15 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.2"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang deleted file mode 100644 index 2b37c2422b..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/foo.yang +++ /dev/null @@ -1,16 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} - - revision "2016-02-01" { - description "Initial version"; - } - oc-ext:openconfig-version "0.1.1"; - - container root { - } -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang deleted file mode 100644 index 23e90e3f34..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-middle/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - oc-ext:openconfig-version "0.0.1"; - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang deleted file mode 100644 index 65b82d4a65..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/bar.yang +++ /dev/null @@ -1,16 +0,0 @@ -module bar { - namespace "bar"; - prefix bar; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-01-31" { - description "Initial version"; - } - - container root { - } - - oc-ext:openconfig-version "0.1.2"; -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang deleted file mode 100644 index 005ef0b304..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/foo.yang +++ /dev/null @@ -1,17 +0,0 @@ -module foo { - namespace "foo"; - prefix foo; - yang-version 1; - - import openconfig-extensions { prefix oc-ext; revision-date 2017-01-29; oc-ext:openconfig-version "0.0.1"; } - - revision "2016-02-01" { - description "Initial version"; - } - - container root { - } - - oc-ext:openconfig-version "0.1.1"; - import bar { prefix bar; revision-date 2016-01-31; oc-ext:openconfig-version "0.1.2";} -} diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang deleted file mode 100644 index 40d9fb97cc..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/position/position-tail/openconfig-extensions.yang +++ /dev/null @@ -1,84 +0,0 @@ -module openconfig-extensions { - yang-version "1"; - namespace "http://openconfig.net/yang/openconfig-ext"; - prefix "oc-ext"; - - organization "OpenConfig working group"; - - contact - "OpenConfig working group - www.openconfig.net"; - - description - "This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined."; - - revision "2017-01-29" { - description - "Added extension for annotating encrypted values."; - reference "TBD"; - } - - revision "2015-10-09" { - description - "Initial OpenConfig public release"; - reference "TBD"; - } - - revision "2015-10-05" { - description - "Initial revision"; - reference "TBD"; - } - - extension openconfig-version { - argument "semver" { - yin-element false; - } - description - "The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data."; - } - - extension openconfig-encrypted-value { - description - "This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext."; - } - - oc-ext:openconfig-version "0.0.1"; -} \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin deleted file mode 100644 index 60c968dfea..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-01.yin +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin deleted file mode 100644 index 31f989b3bd..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/bar@2016-01-31.yin +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin deleted file mode 100644 index 3183859ffa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/foo@2016-02-01.yin +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin deleted file mode 100644 index e93a5a76fb..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import-invalid/openconfig-extensions@2017-01-29.yin +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - OpenConfig working group - - - OpenConfig working group www.openconfig.net - - - - This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined. - - - - - Added extension for annotating encrypted values. - - - TBD - - - - - Initial OpenConfig public release - - - TBD - - - - - Initial revision - - - TBD - - - - - - - - - - The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data. - - - - - - - This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext. - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin deleted file mode 100644 index a3e08f19b4..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-01.yin +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin deleted file mode 100644 index 959624bed2..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/bar@2016-01-31.yin +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin deleted file mode 100644 index 3183859ffa..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/foo@2016-02-01.yin +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin deleted file mode 100644 index e93a5a76fb..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic-import/openconfig-extensions@2016-01-29.yin +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - OpenConfig working group - - - OpenConfig working group www.openconfig.net - - - - This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined. - - - - - Added extension for annotating encrypted values. - - - TBD - - - - - Initial OpenConfig public release - - - TBD - - - - - Initial revision - - - TBD - - - - - - - - - - The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data. - - - - - - - This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext. - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin deleted file mode 100644 index a3a644f944..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/bar@2016-01-31.yin +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin deleted file mode 100644 index 663286d2bf..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/foo@2016-02-01.yin +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin b/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin deleted file mode 100644 index e93a5a76fb..0000000000 --- a/parser/yang-parser-rfc7950/src/test/resources/openconfig-version/yin-input/basic/openconfig-extensions@2017-01-29.yin +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - OpenConfig working group - - - OpenConfig working group www.openconfig.net - - - - This module provides extensions to the YANG language to allow - OpenConfig specific functionality and meta-data to be defined. - - - - - Added extension for annotating encrypted values. - - - TBD - - - - - Initial OpenConfig public release - - - TBD - - - - - Initial revision - - - TBD - - - - - - - - - - The OpenConfig version number for the module. This is - expressed as a semantic version number of the form: - x.y.z - where: - * x corresponds to the major version, - * y corresponds to a minor version, - * z corresponds to a patch version. - This version corresponds to the model file within which it is - defined, and does not cover the whole set of OpenConfig models. - Where several modules are used to build up a single block of - functionality, the same module version is specified across each - file that makes up the module. - - A major version number of 0 indicates that this model is still - in development (whether within OpenConfig or with industry - partners), and is potentially subject to change. - - Following a release of major version 1, all modules will - increment major revision number where backwards incompatible - changes to the model are made. - - The minor version is changed when features are added to the - model that do not impact current clients use of the model. - - The patch-level version is incremented when non-feature changes - (such as bugfixes or clarifications to human-readable - descriptions that do not impact model functionality) are made - that maintain backwards compatibility. - - The version number is stored in the module meta-data. - - - - - - - This extension provides an annotation on schema nodes to - indicate that the corresponding value should be stored and - reported in encrypted form. - Clients reading the configuration or applied configuration - for the node should expect to receive only the encrypted value. - This annotation may be used on nodes such as secure passwords - in which the device never reports a cleartext value, even - if the input is provided as cleartext. - - - - \ No newline at end of file diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java deleted file mode 100644 index 644649a936..0000000000 --- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SemanticVersionModuleNamespace.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.parser.spi.meta; - -import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; -import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; -import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier; - -/** - * Namespace class for storing Maps of all modules with the same name. This namespace is - * used only in case the semantic versioning is enabled, otherwise it is empty. - */ -@Beta -@Deprecated(since = "7.0.11", forRemoval = true) -public interface SemanticVersionModuleNamespace - extends StatementNamespace { - NamespaceBehaviour, - @NonNull SemanticVersionModuleNamespace> BEHAVIOUR = - NamespaceBehaviour.global(SemanticVersionModuleNamespace.class); - -} diff --git a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java b/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java deleted file mode 100644 index 4fb5f2487e..0000000000 --- a/parser/yang-parser-spi/src/main/java/org/opendaylight/yangtools/yang/parser/spi/source/ImportPrefixToSemVerSourceIdentifier.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.yang.parser.spi.source; - -import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.yang.model.repo.api.SemVerSourceIdentifier; -import org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour; -import org.opendaylight.yangtools.yang.parser.spi.meta.ParserNamespace; - -/** - * Source-specific mapping of prefixes to source identifier with specified semantic version. - */ -@Beta -@Deprecated(since = "7.0.11", forRemoval = true) -public interface ImportPrefixToSemVerSourceIdentifier extends ParserNamespace { - NamespaceBehaviour BEHAVIOUR = - NamespaceBehaviour.rootStatementLocal(ImportPrefixToSemVerSourceIdentifier.class); - -} diff --git a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java index 0be3710dca..58f17e7ca3 100644 --- a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java +++ b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/meta/NamespaceTest.java @@ -17,7 +17,6 @@ public class NamespaceTest { // Touch behaviors // FIXME: add more checks/split this up when behaviours are testable assertNotNull(SemanticVersionNamespace.BEHAVIOUR); - assertNotNull(SemanticVersionModuleNamespace.BEHAVIOUR); assertNotNull(StatementDefinitionNamespace.BEHAVIOUR); } } diff --git a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java index 7b9a540709..8cc2fed5c6 100644 --- a/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java +++ b/parser/yang-parser-spi/src/test/java/org/opendaylight/yangtools/yang/parser/spi/source/NamespaceTest.java @@ -22,7 +22,6 @@ public class NamespaceTest { assertNotNull(ImpPrefixToNamespace.BEHAVIOUR); assertNotNull(ImportedModuleContext.BEHAVIOUR); assertNotNull(ImportPrefixToModuleCtx.BEHAVIOUR); - assertNotNull(ImportPrefixToSemVerSourceIdentifier.BEHAVIOUR); assertNotNull(IncludedSubmoduleNameToModuleCtx.BEHAVIOUR); assertNotNull(IncludedModuleContext.BEHAVIOUR); assertNotNull(ModuleCtxToModuleQName.BEHAVIOUR);