From 1e12c13aaec75493f70dd759208181f45c385102 Mon Sep 17 00:00:00 2001 From: Jan Hajnar Date: Wed, 18 Mar 2015 15:23:37 +0100 Subject: [PATCH] BUG 2412 - remove CompositeNode from sal-binding-dom-it * removed all CompositeNodes from tests which used it. Tests have to be rewriten with NormalizedNodes ASAP. Change-Id: Ib666f9fb9de9fc35e1be554cb630ea5f01f6617e Signed-off-by: Jan Hajnar --- .../test/bugfix/DOMCodecBug03Test.java | 216 ----------------- .../test/bugfix/PutAugmentationTest.java | 220 ------------------ .../md-sal/sal-rest-connector/pom.xml | 4 - 3 files changed, 440 deletions(-) delete mode 100644 opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java delete mode 100644 opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java deleted file mode 100644 index ba4a024b7c..0000000000 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java +++ /dev/null @@ -1,216 +0,0 @@ -/* - * Copyright (c) 2014 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.controller.sal.binding.test.bugfix; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.junit.Test; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; -import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.CustomEnum; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.TllComplexAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.TllComplexAugmentBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.aug.grouping.Cont2; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.aug.grouping.Cont2Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.aug.grouping.cont2.Contlist1; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.aug.grouping.cont2.Contlist1Builder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedListKey; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; - -import com.google.common.util.concurrent.SettableFuture; - -@SuppressWarnings("deprecation") -public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataChangeListener { - - private static final QName TOP_LEVEL_LIST_NAME_QNAME = QName.create(TopLevelList.QNAME, "name"); - private static final String TOP_LEVEL_LIST_NAME = "tll:foo"; - - private static final TopLevelListKey TLL_KEY = new TopLevelListKey(TOP_LEVEL_LIST_NAME); - - private static final Map TLL_KEY_BI = Collections. singletonMap(TOP_LEVEL_LIST_NAME_QNAME, - TOP_LEVEL_LIST_NAME); - - private static final InstanceIdentifier TOP_INSTANCE_ID_BA = InstanceIdentifier.builder(Top.class) // - .toInstance(); - - - private static final InstanceIdentifier TLL_INSTANCE_ID_BA = TOP_INSTANCE_ID_BA.child(TopLevelList.class, TLL_KEY); - - - private static final InstanceIdentifier CONT2_INSTANCE_ID_BA = // - TOP_INSTANCE_ID_BA.builder() // - .child(TopLevelList.class, TLL_KEY) // - .augmentation(TllComplexAugment.class) // - .child(Cont2.class) - .toInstance(); - - - private static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier TLL_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.builder() // - .node(Top.QNAME) // - .nodeWithKey(TopLevelList.QNAME, TLL_KEY_BI) // - .toInstance(); - private static final QName CONT2_QNAME = QName.create(TllComplexAugment.QNAME, Cont2.QNAME.getLocalName()); - - - private static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier CONT2_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.builder() // - .node(Top.QNAME) // - .nodeWithKey(TopLevelList.QNAME, TLL_KEY_BI) // - .node(CONT2_QNAME) // - .toInstance(); - - private final SettableFuture, DataObject>> receivedChangeEvent = SettableFuture.create(); - - - - /** - * Test for Bug 148 - * - * @throws Exception - */ - @Test - public void testAugmentSerialization() throws Exception { - - - baDataService.registerDataChangeListener(TOP_INSTANCE_ID_BA, this); - - TopLevelListBuilder tllBuilder = new TopLevelListBuilder(); - tllBuilder.setKey(TLL_KEY); - DataModificationTransaction transaction = baDataService.beginTransaction(); - - - TllComplexAugmentBuilder tllcab = new TllComplexAugmentBuilder(); - tllcab.setAttrStr1("Hardware Foo"); - tllcab.setAttrStr2("Manufacturer Foo"); - tllcab.setAttrStr3("Serial Foo"); - tllcab.setAttrStr4("Description Foo"); - TllComplexAugment tlca = tllcab.build(); - tllBuilder.addAugmentation(TllComplexAugment.class, tlca); - TopLevelList original = tllBuilder.build(); - transaction.putOperationalData(TLL_INSTANCE_ID_BA, original); - - RpcResult result = transaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - DataChangeEvent, DataObject> potential = receivedChangeEvent.get(1000,TimeUnit.MILLISECONDS); - assertNotNull(potential); - - verifyTll((Top) potential.getUpdatedOperationalSubtree(),original); - assertBindingIndependentVersion(TLL_INSTANCE_ID_BI); - Top top = checkForTop(); - verifyTll(top,original); - - testAddingNodeConnector(); - testTllRemove(); - - } - - @Test - public void testAugmentNestedSerialization() throws Exception { - DataModificationTransaction transaction = baDataService.beginTransaction(); - - Cont2Builder cont2b = new Cont2Builder(); - Contlist1Builder cl1b = new Contlist1Builder(); - cl1b.setAttrStr("foo-action"); - cl1b.setAttrEnum(CustomEnum.Type1); - List contlists = Collections.singletonList(cl1b.build()); - cont2b.setContlist1(contlists); - - transaction.putOperationalData(CONT2_INSTANCE_ID_BA, cont2b.build()); - RpcResult putResult = transaction.commit().get(); - assertNotNull(putResult); - assertEquals(TransactionStatus.COMMITED, putResult.getResult()); - Cont2 readedTable = (Cont2) baDataService.readOperationalData(CONT2_INSTANCE_ID_BA); - assertNotNull(readedTable); - - CompositeNode biSupportedActions = biDataService.readOperationalData(CONT2_INSTANCE_ID_BI); - assertNotNull(biSupportedActions); - - } - - private void testAddingNodeConnector() throws Exception { - NestedListKey nlKey = new NestedListKey("test:0:0"); - InstanceIdentifier ncInstanceId = TLL_INSTANCE_ID_BA.child(NestedList.class, nlKey); - NestedListBuilder nlBuilder = new NestedListBuilder(); - nlBuilder.setKey(nlKey); - NestedList nestedList = nlBuilder.build(); - DataModificationTransaction transaction = baDataService.beginTransaction(); - transaction.putOperationalData(ncInstanceId, nestedList); - RpcResult result = transaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - TopLevelList tll = (TopLevelList) baDataService.readOperationalData(TLL_INSTANCE_ID_BA); - assertNotNull(tll); - assertNotNull(tll.getNestedList()); - assertFalse(tll.getNestedList().isEmpty()); - NestedList readedNl = tll.getNestedList().get(0); - assertNotNull(readedNl); - } - - private void testTllRemove() throws Exception { - DataModificationTransaction transaction = baDataService.beginTransaction(); - transaction.removeOperationalData(TLL_INSTANCE_ID_BA); - RpcResult result = transaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - TopLevelList tll = (TopLevelList) baDataService.readOperationalData(TLL_INSTANCE_ID_BA); - assertNull(tll); - } - - private void verifyTll(final Top top,final TopLevelList original) { - assertNotNull(top); - assertNotNull(top.getTopLevelList()); - assertEquals(1, top.getTopLevelList().size()); - TopLevelList readedNode = top.getTopLevelList().get(0); - assertEquals(original.getName(), readedNode.getName()); - assertEquals(original.getKey(), readedNode.getKey()); - - TllComplexAugment fnu = original.getAugmentation(TllComplexAugment.class); - TllComplexAugment readedAugment = readedNode.getAugmentation(TllComplexAugment.class); - assertNotNull(fnu); - assertEquals(fnu.getAttrStr2(), readedAugment.getAttrStr2()); - assertEquals(fnu.getAttrStr3(), readedAugment.getAttrStr3()); - - } - - private void assertBindingIndependentVersion( - final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier nodeId) { - CompositeNode node = biDataService.readOperationalData(nodeId); - assertNotNull(node); - } - - private Top checkForTop() { - return (Top) baDataService.readOperationalData(TOP_INSTANCE_ID_BA); - } - - @Override - public void onDataChanged(final DataChangeEvent, DataObject> change) { - receivedChangeEvent.set(change); - } - -} diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java deleted file mode 100644 index 9bf6c4d291..0000000000 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2014 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.controller.sal.binding.test.bugfix; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Collections; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import org.junit.Ignore; -import org.junit.Test; -import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; -import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; -import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.NestedListSimpleAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.NestedListSimpleAugmentBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.TllComplexAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.of.migration.test.model.rev150210.TllComplexAugmentBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugment; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedList; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedListBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedListKey; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.data.api.CompositeNode; - -import com.google.common.util.concurrent.SettableFuture; - -@SuppressWarnings("deprecation") -public class PutAugmentationTest extends AbstractDataServiceTest implements DataChangeListener { - - private static final QName TLL_NAME_QNAME = QName.create(TopLevelList.QNAME, "name"); - private static final String TLL_NAME = "foo"; - - private static final TopLevelListKey TLL_KEY = new TopLevelListKey(TLL_NAME); - - private static final Map TLL_KEY_BI = Collections. singletonMap(TLL_NAME_QNAME, - TLL_NAME); - - private static final InstanceIdentifier TOP_INSTANCE_ID_BA = InstanceIdentifier.builder(Top.class) // - .toInstance(); - - private static final InstanceIdentifier TLL_INSTANCE_ID_BA = // - TOP_INSTANCE_ID_BA.builder() // - .child(TopLevelList.class, TLL_KEY).toInstance(); - - private static final InstanceIdentifier ALL_TCA = // - TOP_INSTANCE_ID_BA.builder() // - .child(TopLevelList.class) // - .augmentation(TllComplexAugment.class) // - .build(); - - private static final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier TLL_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.builder() // - .node(Top.QNAME) // - .nodeWithKey(TopLevelList.QNAME, TLL_KEY_BI) // - .toInstance(); - private static final InstanceIdentifier TCA_AUGMENTATION_PATH = - TLL_INSTANCE_ID_BA.builder() // - .augmentation(TllComplexAugment.class) // - .build(); - - private SettableFuture, DataObject>> lastReceivedChangeEvent; - - /** - * Test for Bug 148 - * - * @throws Exception - */ - @Test - @Ignore - public void putNodeAndAugmentation() throws Exception { - lastReceivedChangeEvent = SettableFuture.create(); - baDataService.registerDataChangeListener(ALL_TCA, this); - - - TopLevelListBuilder nodeBuilder = new TopLevelListBuilder(); - nodeBuilder.setKey(TLL_KEY); - DataModificationTransaction baseTransaction = baDataService.beginTransaction(); - baseTransaction.putOperationalData(TLL_INSTANCE_ID_BA, nodeBuilder.build()); - RpcResult result = baseTransaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - TopLevelList tll = (TopLevelList) baDataService.readOperationalData(TLL_INSTANCE_ID_BA); - assertNotNull(tll); - assertEquals(TLL_KEY, tll.getKey()); - - TllComplexAugmentBuilder tcab = new TllComplexAugmentBuilder(); - tcab.setAttrStr1("FooFoo"); - tcab.setAttrStr2("BarBar"); - TllComplexAugment tca = tcab.build(); - InstanceIdentifier augmentIdentifier = TLL_INSTANCE_ID_BA - .augmentation(TreeComplexUsesAugment.class); - DataModificationTransaction augmentedTransaction = baDataService.beginTransaction(); - augmentedTransaction.putOperationalData(augmentIdentifier, tca); - - - lastReceivedChangeEvent = SettableFuture.create(); - result = augmentedTransaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - DataChangeEvent, DataObject> potential = lastReceivedChangeEvent.get(1000,TimeUnit.MILLISECONDS); - assertNotNull(potential); - assertTrue(potential.getCreatedOperationalData().containsKey(TCA_AUGMENTATION_PATH)); - - lastReceivedChangeEvent = SettableFuture.create(); - - TopLevelList augmentedTll = (TopLevelList) baDataService.readOperationalData(TLL_INSTANCE_ID_BA); - assertNotNull(tll); - assertEquals(TLL_KEY, augmentedTll.getKey()); - System.out.println("Before assertion"); - assertNotNull(augmentedTll.getAugmentation(TllComplexAugment.class)); - TllComplexAugment readedAugmentation = augmentedTll.getAugmentation(TllComplexAugment.class); - assertEquals(tca.getAttrStr2(), readedAugmentation.getAttrStr2()); - assertBindingIndependentVersion(TLL_INSTANCE_ID_BI); - testTllRemove(); - assertTrue(lastReceivedChangeEvent.get(1000,TimeUnit.MILLISECONDS).getRemovedOperationalData().contains(TCA_AUGMENTATION_PATH)); - } - - @Test - @Ignore - public void putNodeWithAugmentation() throws Exception { - lastReceivedChangeEvent = SettableFuture.create(); - baDataService.registerDataChangeListener(ALL_TCA, this); - - TopLevelListBuilder nodeBuilder = new TopLevelListBuilder(); - nodeBuilder.setKey(TLL_KEY); - TllComplexAugmentBuilder tcab = new TllComplexAugmentBuilder(); - tcab.setAttrStr1("FooFoo"); - tcab.setAttrStr2("BarBar"); - TllComplexAugment tca = tcab.build(); - - nodeBuilder.addAugmentation(TreeComplexUsesAugment.class, tca); - DataModificationTransaction baseTransaction = baDataService.beginTransaction(); - baseTransaction.putOperationalData(TLL_INSTANCE_ID_BA, nodeBuilder.build()); - RpcResult result = baseTransaction.commit().get(); - - - DataChangeEvent, DataObject> potential = lastReceivedChangeEvent.get(1000,TimeUnit.MILLISECONDS); - assertNotNull(potential); - assertTrue(potential.getCreatedOperationalData().containsKey(TCA_AUGMENTATION_PATH)); - lastReceivedChangeEvent = SettableFuture.create(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - TllComplexAugment readedAugmentation = (TllComplexAugment) baDataService.readOperationalData( - TLL_INSTANCE_ID_BA.augmentation(TllComplexAugment.class)); - assertNotNull(readedAugmentation); - - assertEquals(tca.getAttrStr1(), readedAugmentation.getAttrStr1()); - - testPutNodeConnectorWithAugmentation(); - lastReceivedChangeEvent = SettableFuture.create(); - testTllRemove(); - - assertTrue(lastReceivedChangeEvent.get(1000,TimeUnit.MILLISECONDS).getRemovedOperationalData().contains(TCA_AUGMENTATION_PATH)); - } - - private void testPutNodeConnectorWithAugmentation() throws Exception { - NestedListKey ncKey = new NestedListKey("test:0:0"); - InstanceIdentifier ncPath = TLL_INSTANCE_ID_BA - .child(NestedList.class, ncKey); - InstanceIdentifier ncAugmentPath = ncPath - .augmentation(NestedListSimpleAugment.class); - - NestedListBuilder nc = new NestedListBuilder(); - nc.setKey(ncKey); - - NestedListSimpleAugmentBuilder fncb = new NestedListSimpleAugmentBuilder(); - fncb.setType("Baz"); - nc.addAugmentation(NestedListSimpleAugment.class, fncb.build()); - - DataModificationTransaction baseTransaction = baDataService.beginTransaction(); - baseTransaction.putOperationalData(ncPath, nc.build()); - RpcResult result = baseTransaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - NestedListSimpleAugment readedAugmentation = (NestedListSimpleAugment) baDataService - .readOperationalData(ncAugmentPath); - assertNotNull(readedAugmentation); - assertEquals(fncb.getType(), readedAugmentation.getType()); - } - - private void testTllRemove() throws Exception { - DataModificationTransaction transaction = baDataService.beginTransaction(); - transaction.removeOperationalData(TLL_INSTANCE_ID_BA); - RpcResult result = transaction.commit().get(); - assertEquals(TransactionStatus.COMMITED, result.getResult()); - - TopLevelList tll = (TopLevelList) baDataService.readOperationalData(TLL_INSTANCE_ID_BA); - assertNull(tll); - } - - private void assertBindingIndependentVersion(final org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier tllId) { - CompositeNode tll = biDataService.readOperationalData(tllId); - assertNotNull(tll); - } - - @Override - public void onDataChanged(final DataChangeEvent, DataObject> change) { - lastReceivedChangeEvent.set(change); - } - -} diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml index 7daad1631a..3fcecfd929 100644 --- a/opendaylight/md-sal/sal-rest-connector/pom.xml +++ b/opendaylight/md-sal/sal-rest-connector/pom.xml @@ -91,10 +91,6 @@ org.opendaylight.controller sal-core-spi - - org.opendaylight.yangtools - yang-data-composite-node - org.opendaylight.yangtools yang-data-codec-gson -- 2.36.6