X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fcluster%2Fdatastore%2Fmodel%2FTestModel.java;h=cfbaee6f61b834db8042eb11fcc374094191c008;hp=37cef64d30f0901fd61b8906b188a4e499c0bb96;hb=c8121ea6b5bf54c43777afe6a747be40637e1f42;hpb=5464f50be733df1bbbe31cf05665d542d3b7c5e7 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java index 37cef64d30..cfbaee6f61 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/md/cluster/datastore/model/TestModel.java @@ -7,11 +7,6 @@ */ package org.opendaylight.controller.md.cluster.datastore.model; -import com.google.common.io.ByteSource; -import com.google.common.io.Resources; -import java.io.IOException; -import java.util.Collections; -import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; @@ -23,11 +18,9 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.CollectionNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; +import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; -public class TestModel { +public final class TestModel { public static final QName TEST_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test", "2014-03-13", "test"); @@ -38,13 +31,13 @@ public class TestModel { public static final QName JUNK_QNAME = QName.create("urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:junk", "2014-03-13", "junk"); - public static final QName OUTER_LIST_QNAME = QName.create(TEST_QNAME, "outer-list"); public static final QName OUTER_CONTAINER_QNAME = QName.create(TEST_QNAME, "outer-container"); public static final QName INNER_LIST_QNAME = QName.create(TEST_QNAME, "inner-list"); public static final QName OUTER_CHOICE_QNAME = QName.create(TEST_QNAME, "outer-choice"); public static final QName ID_QNAME = QName.create(TEST_QNAME, "id"); public static final QName NAME_QNAME = QName.create(TEST_QNAME, "name"); + public static final QName VALUE_QNAME = QName.create(TEST_QNAME, "value"); public static final QName DESC_QNAME = QName.create(TEST_QNAME, "desc"); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; @@ -59,23 +52,19 @@ public class TestModel { public static final QName TWO_QNAME = QName.create(TEST_QNAME,"two"); public static final QName THREE_QNAME = QName.create(TEST_QNAME,"three"); + private TestModel() { + + } + public static SchemaContext createTestContext() { - final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final SchemaContext schemaContext; - final Set sources = Collections - .singleton(Resources.asByteSource(TestModel.class.getResource(DATASTORE_TEST_YANG))); - - try { - schemaContext = reactor.buildEffective(sources); - } catch (IOException e1) { - throw new ExceptionInInitializerError(e1); - } catch (ReactorException e2) { - throw new RuntimeException("Unable to build schema context from " + sources, e2); - } - return schemaContext; + return YangParserTestUtils.parseYangResource(DATASTORE_TEST_YANG); } - public static DataContainerChild outerNode(int... ids) { + public static DataContainerChild outerMapNode() { + return ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME).build(); + } + + public static DataContainerChild outerNode(final int... ids) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); for (int id: ids) { outer.addChild(ImmutableNodes.mapEntry(OUTER_LIST_QNAME, ID_QNAME, id)); @@ -84,7 +73,7 @@ public class TestModel { return outer.build(); } - public static DataContainerChild outerNode(MapEntryNode... entries) { + public static DataContainerChild outerNode(final MapEntryNode... entries) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(OUTER_LIST_QNAME); for (MapEntryNode e: entries) { outer.addChild(e); @@ -93,7 +82,7 @@ public class TestModel { return outer.build(); } - public static DataContainerChild innerNode(String... names) { + public static DataContainerChild innerNode(final String... names) { CollectionNodeBuilder outer = ImmutableNodes.mapNodeBuilder(INNER_LIST_QNAME); for (String name: names) { outer.addChild(ImmutableNodes.mapEntry(INNER_LIST_QNAME, NAME_QNAME, name)); @@ -102,32 +91,36 @@ public class TestModel { return outer.build(); } - public static MapEntryNode outerNodeEntry(int id, DataContainerChild inner) { + public static MapEntryNode outerNodeEntry(final int id, final DataContainerChild inner) { return ImmutableNodes.mapEntryBuilder(OUTER_LIST_QNAME, ID_QNAME, id).addChild(inner).build(); } - public static NormalizedNode testNodeWithOuter(int... ids) { + public static NormalizedNode testNodeWithOuter(final int... ids) { return testNodeWithOuter(outerNode(ids)); } - public static NormalizedNode testNodeWithOuter(DataContainerChild outer) { + public static NormalizedNode testNodeWithOuter(final DataContainerChild outer) { return ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME)).withChild(outer).build(); } - public static NodeIdentifierWithPredicates outerEntryKey(int id) { - return new NodeIdentifierWithPredicates(OUTER_LIST_QNAME, ID_QNAME, id); + public static NodeIdentifierWithPredicates outerEntryKey(final int id) { + return NodeIdentifierWithPredicates.of(OUTER_LIST_QNAME, ID_QNAME, id); } - public static YangInstanceIdentifier outerEntryPath(int id) { + public static YangInstanceIdentifier outerEntryPath(final int id) { return OUTER_LIST_PATH.node(outerEntryKey(id)); } - public static NodeIdentifierWithPredicates innerEntryKey(String name) { - return new NodeIdentifierWithPredicates(INNER_LIST_QNAME, NAME_QNAME, name); + public static NodeIdentifierWithPredicates innerEntryKey(final String name) { + return NodeIdentifierWithPredicates.of(INNER_LIST_QNAME, NAME_QNAME, name); } - public static YangInstanceIdentifier innerEntryPath(int id, String name) { + public static YangInstanceIdentifier innerEntryPath(final int id, final String name) { return OUTER_LIST_PATH.node(outerEntryKey(id)).node(INNER_LIST_QNAME).node(innerEntryKey(name)); } + + public static YangInstanceIdentifier innerMapPath(final int id) { + return OUTER_LIST_PATH.node(outerEntryKey(id)).node(INNER_LIST_QNAME); + } }