X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Fbugfix%2FDOMCodecBug03Test.java;h=dd8eaa7d5f6f821a54c9694c7469e0b96e0d9d49;hp=d3ef2f3d6eaee93f728b724b0cb9fdd5b95a7b0a;hb=22c585045f758353f221dbcdafce1b12d63f1044;hpb=1a556d2ed47c7ea285baa07900e14d092a4a6cfa 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 index d3ef2f3d6e..dd8eaa7d5f 100644 --- 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 @@ -1,41 +1,52 @@ +/* + * 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 java.util.Arrays; +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.test.AbstractDataServiceTest; 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.flow.inventory.rev130819.FlowCapableNode; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.SupportedActions; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.SupportedActionsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.supported.actions.ActionType; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.supported.actions.ActionTypeBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.SupportType; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnectorKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.SupportType; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesKey; 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 static org.junit.Assert.*; +import com.google.common.util.concurrent.SettableFuture; +@SuppressWarnings("deprecation") public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataChangeListener { private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); @@ -50,18 +61,16 @@ public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh .toInstance(); - private static final InstanceIdentifier NODE_INSTANCE_ID_BA = InstanceIdentifier// - .builder(NODES_INSTANCE_ID_BA) // - .child(Node.class, NODE_KEY).toInstance(); - - - private static final InstanceIdentifier SUPPORTED_ACTIONS_INSTANCE_ID_BA = InstanceIdentifier// - .builder(NODES_INSTANCE_ID_BA) // + private static final InstanceIdentifier NODE_INSTANCE_ID_BA = NODES_INSTANCE_ID_BA.child(Node.class, NODE_KEY); + + + private static final InstanceIdentifier SUPPORTED_ACTIONS_INSTANCE_ID_BA = // + NODES_INSTANCE_ID_BA.builder() // .child(Node.class, NODE_KEY) // .augmentation(FlowCapableNode.class) // .child(SupportedActions.class) .toInstance(); - + private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODE_INSTANCE_ID_BI = // org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // @@ -70,35 +79,35 @@ public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh .toInstance(); private static final QName SUPPORTED_ACTIONS_QNAME = QName.create(FlowCapableNode.QNAME, SupportedActions.QNAME.getLocalName()); - + private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier SUPPORTED_ACTIONS_INSTANCE_ID_BI = // org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // .node(Nodes.QNAME) // .nodeWithKey(Node.QNAME, NODE_KEY_BI) // .node(SUPPORTED_ACTIONS_QNAME) // .toInstance(); - - private DataChangeEvent, DataObject> receivedChangeEvent; - - + private final SettableFuture, DataObject>> receivedChangeEvent = SettableFuture.create(); + + + /** * Test for Bug 148 - * + * * @throws Exception */ @Test public void testAugmentSerialization() throws Exception { - + baDataService.registerDataChangeListener(NODES_INSTANCE_ID_BA, this); - + NodeBuilder nodeBuilder = new NodeBuilder(); nodeBuilder.setId(new NodeId(NODE_ID)); nodeBuilder.setKey(NODE_KEY); DataModificationTransaction transaction = baDataService.beginTransaction(); - - + + FlowCapableNodeBuilder fnub = new FlowCapableNodeBuilder(); fnub.setHardware("Hardware Foo"); fnub.setManufacturer("Manufacturer Foo"); @@ -109,50 +118,51 @@ public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh nodeBuilder.addAugmentation(FlowCapableNode.class, fnu); Node original = nodeBuilder.build(); transaction.putOperationalData(NODE_INSTANCE_ID_BA, original); - + RpcResult result = transaction.commit().get(); assertEquals(TransactionStatus.COMMITED, result.getResult()); - - assertNotNull(receivedChangeEvent); - - verifyNodes((Nodes) receivedChangeEvent.getUpdatedOperationalSubtree(),original); + + DataChangeEvent, DataObject> potential = receivedChangeEvent.get(1000,TimeUnit.MILLISECONDS); + assertNotNull(potential); + + verifyNodes((Nodes) potential.getUpdatedOperationalSubtree(),original); assertBindingIndependentVersion(NODE_INSTANCE_ID_BI); Nodes nodes = checkForNodes(); verifyNodes(nodes,original); - + testAddingNodeConnector(); testNodeRemove(); } - + @Test public void testAugmentNestedSerialization() throws Exception { DataModificationTransaction transaction = baDataService.beginTransaction(); - + SupportedActionsBuilder actions = new SupportedActionsBuilder(); ActionTypeBuilder action = new ActionTypeBuilder(); action.setAction("foo-action"); action.setSupportState(SupportType.Native); List actionTypes = Collections.singletonList(action.build()); actions.setActionType(actionTypes ); - + transaction.putOperationalData(SUPPORTED_ACTIONS_INSTANCE_ID_BA, actions.build()); RpcResult putResult = transaction.commit().get(); assertNotNull(putResult); assertEquals(TransactionStatus.COMMITED, putResult.getResult()); SupportedActions readedTable = (SupportedActions) baDataService.readOperationalData(SUPPORTED_ACTIONS_INSTANCE_ID_BA); assertNotNull(readedTable); - + CompositeNode biSupportedActions = biDataService.readOperationalData(SUPPORTED_ACTIONS_INSTANCE_ID_BI); assertNotNull(biSupportedActions); - + } private void testAddingNodeConnector() throws Exception { - + NodeConnectorId ncId = new NodeConnectorId("openflow:1:bar"); NodeConnectorKey nodeKey = new NodeConnectorKey(ncId ); - InstanceIdentifier ncInstanceId = InstanceIdentifier.builder(NODE_INSTANCE_ID_BA).child(NodeConnector.class, nodeKey).toInstance(); + InstanceIdentifier ncInstanceId = NODE_INSTANCE_ID_BA.child(NodeConnector.class, nodeKey); NodeConnectorBuilder ncBuilder = new NodeConnectorBuilder(); ncBuilder.setId(ncId); ncBuilder.setKey(nodeKey); @@ -174,29 +184,29 @@ public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh transaction.removeOperationalData(NODE_INSTANCE_ID_BA); RpcResult result = transaction.commit().get(); assertEquals(TransactionStatus.COMMITED, result.getResult()); - + Node node = (Node) baDataService.readOperationalData(NODE_INSTANCE_ID_BA); assertNull(node); } - private void verifyNodes(Nodes nodes,Node original) { + private void verifyNodes(final Nodes nodes,final Node original) { assertNotNull(nodes); assertNotNull(nodes.getNode()); assertEquals(1, nodes.getNode().size()); Node readedNode = nodes.getNode().get(0); assertEquals(original.getId(), readedNode.getId()); assertEquals(original.getKey(), readedNode.getKey()); - + FlowCapableNode fnu = original.getAugmentation(FlowCapableNode.class); FlowCapableNode readedAugment = readedNode.getAugmentation(FlowCapableNode.class); assertNotNull(fnu); assertEquals(fnu.getDescription(), readedAugment.getDescription()); assertEquals(fnu.getSerialNumber(), readedAugment.getSerialNumber()); - + } private void assertBindingIndependentVersion( - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier nodeId) { + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier nodeId) { CompositeNode node = biDataService.readOperationalData(nodeId); assertNotNull(node); } @@ -204,10 +214,10 @@ public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataCh private Nodes checkForNodes() { return (Nodes) baDataService.readOperationalData(NODES_INSTANCE_ID_BA); } - + @Override - public void onDataChanged(DataChangeEvent, DataObject> change) { - receivedChangeEvent = change; + public void onDataChanged(final DataChangeEvent, DataObject> change) { + receivedChangeEvent.set(change); } }