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%2Fcluster%2Fdatastore%2Fentityownership%2FDistributedEntityOwnershipServiceTest.java;h=63e576944b985b0d8272fd533cd8a02be95b5650;hp=cedd942219ba4e9d34b72d3405f5edc0009134e7;hb=88f763ec4ec2bcc1e0fd414ccb2f105f7490b8e9;hpb=285e83f59f15a4a614d423a3780a607d562d030b diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java index cedd942219..63e576944b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/DistributedEntityOwnershipServiceTest.java @@ -61,6 +61,7 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; +import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import scala.concurrent.Await; import scala.concurrent.Future; @@ -77,12 +78,12 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh static int ID_COUNTER = 1; static final QName QNAME = QName.create("test", "2015-08-11", "foo"); - private final String dataStoreType = "config" + ID_COUNTER++; + private final String dataStoreName = "config" + ID_COUNTER++; private DistributedDataStore dataStore; @Before public void setUp() { - DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreType(dataStoreType). + DatastoreContext datastoreContext = DatastoreContext.newBuilder().dataStoreName(dataStoreName). shardInitializationTimeout(10, TimeUnit.SECONDS).build(); Configuration configuration = new ConfigurationImpl(new EmptyModuleShardConfigProvider()) { @@ -263,7 +264,7 @@ public class DistributedEntityOwnershipServiceTest extends AbstractEntityOwnersh service.start(); - ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners()); + ShardDataTree shardDataTree = new ShardDataTree(SchemaContextHelper.entityOwners(), TreeType.OPERATIONAL); shardBuilder.setDataTree(shardDataTree.getDataTree()); Entity entity1 = new Entity(ENTITY_TYPE, "one");