X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Futil%2FTestModel.java;h=8aa2420dfb45c2d69fed019300a22941d109fbc2;hp=e1607c09c498fafa106c6bbd0d5bc5937b925215;hb=ae6c61499e2c7c76e0406ce397657cd31ddd4d3f;hpb=f781598707f0810491cb571f835ee49772e00e83 diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java index e1607c09c4..8aa2420dfb 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/datastore/util/TestModel.java @@ -16,14 +16,12 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import java.io.InputStream; import java.math.BigDecimal; -import java.math.BigInteger; -import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -41,19 +39,16 @@ import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListEntryNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; 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.api.DataContainerNodeAttrBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.DataContainerNodeBuilder; -import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeAttrBuilder; +import org.opendaylight.yangtools.yang.data.impl.schema.builder.api.NormalizedNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableContainerNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder; import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableMapEntryNodeBuilder; 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", @@ -98,15 +93,15 @@ public class TestModel { public static final QName CHOICE_QNAME = QName.create(TEST_QNAME, "choice"); public static final QName SHOE_QNAME = QName.create(TEST_QNAME, "shoe"); public static final QName ANY_XML_QNAME = QName.create(TEST_QNAME, "any"); + public static final QName EMPTY_QNAME = QName.create(TEST_QNAME, "empty-leaf"); public static final QName INVALID_QNAME = QName.create(TEST_QNAME, "invalid"); private static final String DATASTORE_TEST_YANG = "/odl-datastore-test.yang"; private static final String DATASTORE_AUG_YANG = "/odl-datastore-augmentation.yang"; private static final String DATASTORE_TEST_NOTIFICATION_YANG = "/odl-datastore-test-notification.yang"; - public static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier.of(TEST_QNAME); - public static final YangInstanceIdentifier DESC_PATH = YangInstanceIdentifier. - builder(TEST_PATH).node(DESC_QNAME).build(); + public static final YangInstanceIdentifier DESC_PATH = YangInstanceIdentifier + .builder(TEST_PATH).node(DESC_QNAME).build(); public static final YangInstanceIdentifier OUTER_LIST_PATH = YangInstanceIdentifier.builder(TEST_PATH).node(OUTER_LIST_QNAME).build(); public static final QName TWO_THREE_QNAME = QName.create(TEST_QNAME, "two"); @@ -118,13 +113,12 @@ public class TestModel { private static final String TWO_ONE_NAME = "one"; private static final String TWO_TWO_NAME = "two"; private static final String DESC = "Hello there"; - private static final Long LONG_ID = 1L; private static final Boolean ENABLED = true; private static final Short SHORT_ID = 1; private static final Byte BYTE_ID = 1; // Family specific constants public static final QName FAMILY_QNAME = QName.create( - "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:notification-test", "2014-04-17", "family"); + "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:notification-test", "2014-04-17", "family"); public static final QName CHILDREN_QNAME = QName.create(FAMILY_QNAME, "children"); public static final QName GRAND_CHILDREN_QNAME = QName.create(FAMILY_QNAME, "grand-children"); public static final QName CHILD_NUMBER_QNAME = QName.create(FAMILY_QNAME, "child-number"); @@ -158,15 +152,19 @@ public class TestModel { .build()) // .build(); - public static final InputStream getDatastoreTestInputStream() { + private TestModel() { + throw new UnsupportedOperationException(); + } + + public static InputStream getDatastoreTestInputStream() { return getInputStream(DATASTORE_TEST_YANG); } - public static final InputStream getDatastoreAugInputStream() { + public static InputStream getDatastoreAugInputStream() { return getInputStream(DATASTORE_AUG_YANG); } - public static final InputStream getDatastoreTestNotificationInputStream() { + public static InputStream getDatastoreTestNotificationInputStream() { return getInputStream(DATASTORE_TEST_NOTIFICATION_YANG); } @@ -175,44 +173,21 @@ public class TestModel { } public static SchemaContext createTestContext() { - List inputStreams = new ArrayList<>(); - inputStreams.add(getDatastoreTestInputStream()); - inputStreams.add(getDatastoreAugInputStream()); - inputStreams.add(getDatastoreTestNotificationInputStream()); - - return resolveSchemaContext(inputStreams); + return YangParserTestUtils.parseYangResources(TestModel.class, DATASTORE_TEST_YANG, DATASTORE_AUG_YANG, + DATASTORE_TEST_NOTIFICATION_YANG); } public static SchemaContext createTestContextWithoutTestSchema() { - List inputStreams = new ArrayList<>(); - inputStreams.add(getDatastoreTestNotificationInputStream()); - - return resolveSchemaContext(inputStreams); + return YangParserTestUtils.parseYangResource(DATASTORE_TEST_NOTIFICATION_YANG); } - public static SchemaContext createTestContextWithoutAugmentationSchema() { - List inputStreams = new ArrayList<>(); - inputStreams.add(getDatastoreTestInputStream()); - inputStreams.add(getDatastoreTestNotificationInputStream()); - - return resolveSchemaContext(inputStreams); - } - - private static SchemaContext resolveSchemaContext(List streams) { - final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final SchemaContext schemaContext; - - try { - schemaContext = reactor.buildEffective(streams); - } catch (ReactorException e) { - throw new RuntimeException("Unable to build schema context from " + streams, e); - } - return schemaContext; + return YangParserTestUtils.parseYangResources(TestModel.class, DATASTORE_TEST_YANG, + DATASTORE_TEST_NOTIFICATION_YANG); } /** - * Returns a test document + * Returns a test document. *

*

* 

@@ -227,11 +202,8 @@ public class TestModel {
      *                  name "two"
      *
      *
- * - * @return */ - public static NormalizedNode createDocumentOne( - SchemaContext schemaContext) { + public static NormalizedNode createDocumentOne(final SchemaContext schemaContext) { return ImmutableContainerNodeBuilder .create() .withNodeIdentifier( @@ -240,7 +212,7 @@ public class TestModel { } - public static DataContainerNodeAttrBuilder createBaseTestContainerBuilder() { + public static DataContainerNodeBuilder createBaseTestContainerBuilder() { // Create a list of shoes // This is to test leaf list entry final LeafSetEntryNode nike = ImmutableLeafSetEntryNodeBuilder.create().withNodeIdentifier( @@ -280,14 +252,14 @@ public class TestModel { ImmutableLeafSetEntryNodeBuilder .create() .withNodeIdentifier( - (new NodeWithValue<>(QName.create( - TEST_QNAME, "number"), 5))).withValue(5).build(); + new NodeWithValue<>(QName.create( + TEST_QNAME, "number"), 5)).withValue(5).build(); final LeafSetEntryNode fifteen = ImmutableLeafSetEntryNodeBuilder .create() .withNodeIdentifier( - (new NodeWithValue<>(QName.create( - TEST_QNAME, "number"), 15))).withValue(15).build(); + new NodeWithValue<>(QName.create( + TEST_QNAME, "number"), 15)).withValue(15).build(); final LeafSetNode numbers = ImmutableLeafSetNodeBuilder .create() @@ -301,20 +273,20 @@ public class TestModel { MapEntryNode augMapEntry = createAugmentedListEntry(1, "First Test"); // Create a bits leaf - NormalizedNodeAttrBuilder> + NormalizedNodeBuilder> myBits = Builders.leafBuilder() .withNodeIdentifier(new NodeIdentifier(QName.create(TEST_QNAME, "my-bits"))) .withValue(ImmutableSet.of("foo", "bar")); // Create unkeyed list entry UnkeyedListEntryNode unkeyedListEntry = - Builders.unkeyedListEntryBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(UNKEYED_LIST_QNAME)). - withChild(ImmutableNodes.leafNode(NAME_QNAME, "unkeyed-entry-name")).build(); + Builders.unkeyedListEntryBuilder().withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier( + UNKEYED_LIST_QNAME)).withChild(ImmutableNodes.leafNode(NAME_QNAME, "unkeyed-entry-name")).build(); // Create YangInstanceIdentifier with all path arg types. YangInstanceIdentifier instanceID = YangInstanceIdentifier.create( new NodeIdentifier(QName.create(TEST_QNAME, "qname")), - new NodeIdentifierWithPredicates(QName.create(TEST_QNAME, "list-entry"), + NodeIdentifierWithPredicates.of(QName.create(TEST_QNAME, "list-entry"), QName.create(TEST_QNAME, "key"), 10), new AugmentationIdentifier(ImmutableSet.of( QName.create(TEST_QNAME, "aug1"), QName.create(TEST_QNAME, "aug2"))), @@ -333,7 +305,7 @@ public class TestModel { .withChild(ImmutableNodes.leafNode(BOOLEAN_LEAF_QNAME, ENABLED)) .withChild(ImmutableNodes.leafNode(SHORT_LEAF_QNAME, SHORT_ID)) .withChild(ImmutableNodes.leafNode(BYTE_LEAF_QNAME, BYTE_ID)) - .withChild(ImmutableNodes.leafNode(TestModel.BIGINTEGER_LEAF_QNAME, BigInteger.valueOf(100))) + .withChild(ImmutableNodes.leafNode(TestModel.BIGINTEGER_LEAF_QNAME, Uint64.valueOf(100))) .withChild(ImmutableNodes.leafNode(TestModel.BIGDECIMAL_LEAF_QNAME, BigDecimal.valueOf(1.2))) .withChild(ImmutableNodes.leafNode(SOME_REF_QNAME, instanceID)) .withChild(ImmutableNodes.leafNode(MYIDENTITY_QNAME, DESC_QNAME)) @@ -343,11 +315,12 @@ public class TestModel { .withChild(Builders.choiceBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(TWO_THREE_QNAME)) .withChild(ImmutableNodes.leafNode(TWO_QNAME, "two")).build()) - .withChild(Builders.orderedMapBuilder(). - withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ORDERED_LIST_QNAME)). - withValue(ImmutableList.builder().add( + .withChild(Builders.orderedMapBuilder() + .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(ORDERED_LIST_QNAME)) + .withValue(ImmutableList.builder().add( mapEntryBuilder(ORDERED_LIST_QNAME, ORDERED_LIST_ENTRY_QNAME, "1").build(), - mapEntryBuilder(ORDERED_LIST_QNAME, ORDERED_LIST_ENTRY_QNAME, "2").build()).build()).build()) + mapEntryBuilder(ORDERED_LIST_QNAME, ORDERED_LIST_ENTRY_QNAME, "2").build()).build()) + .build()) .withChild(shoes) .withChild(numbers) .withChild(switchFeatures) @@ -362,7 +335,7 @@ public class TestModel { return createBaseTestContainerBuilder().build(); } - public static MapEntryNode createAugmentedListEntry(int id, String name) { + public static MapEntryNode createAugmentedListEntry(final int id, final String name) { Set childAugmentations = new HashSet<>(); childAugmentations.add(AUG_CONT_QNAME); @@ -386,7 +359,7 @@ public class TestModel { return ImmutableMapEntryNodeBuilder .create() .withNodeIdentifier( - new YangInstanceIdentifier.NodeIdentifierWithPredicates( + YangInstanceIdentifier.NodeIdentifierWithPredicates.of( AUGMENTED_LIST_QNAME, ID_QNAME, id)) .withChild(ImmutableNodes.leafNode(ID_QNAME, id)) .withChild(augmentationNode).build(); @@ -394,24 +367,24 @@ public class TestModel { public static ContainerNode createFamily() { - final DataContainerNodeAttrBuilder familyContainerBuilder = - ImmutableContainerNodeBuilder.create().withNodeIdentifier( + final DataContainerNodeBuilder + familyContainerBuilder = ImmutableContainerNodeBuilder.create().withNodeIdentifier( new YangInstanceIdentifier.NodeIdentifier(FAMILY_QNAME)); final CollectionNodeBuilder childrenBuilder = mapNodeBuilder(CHILDREN_QNAME); - final DataContainerNodeBuilder firstChildBuilder = - mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, FIRST_CHILD_ID); - final DataContainerNodeBuilder secondChildBuilder = - mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, SECOND_CHILD_ID); - - final DataContainerNodeBuilder firstGrandChildBuilder = - mapEntryBuilder(GRAND_CHILDREN_QNAME, GRAND_CHILD_NUMBER_QNAME, - FIRST_GRAND_CHILD_ID); - final DataContainerNodeBuilder secondGrandChildBuilder = - mapEntryBuilder(GRAND_CHILDREN_QNAME, GRAND_CHILD_NUMBER_QNAME, - SECOND_GRAND_CHILD_ID); + final DataContainerNodeBuilder + firstChildBuilder = mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, FIRST_CHILD_ID); + final DataContainerNodeBuilder + secondChildBuilder = mapEntryBuilder(CHILDREN_QNAME, CHILD_NUMBER_QNAME, SECOND_CHILD_ID); + + final DataContainerNodeBuilder + firstGrandChildBuilder = mapEntryBuilder(GRAND_CHILDREN_QNAME, GRAND_CHILD_NUMBER_QNAME, + FIRST_GRAND_CHILD_ID); + final DataContainerNodeBuilder + secondGrandChildBuilder = mapEntryBuilder(GRAND_CHILDREN_QNAME, GRAND_CHILD_NUMBER_QNAME, + SECOND_GRAND_CHILD_ID); firstGrandChildBuilder .withChild(