From f25e3a8a3e38f9f6fc0fafeb516dc6f61e68bc48 Mon Sep 17 00:00:00 2001 From: "Claudio D. Gasparini" Date: Mon, 8 Feb 2016 12:40:54 +0100 Subject: [PATCH] Update clearTable method name to createEmptyTableStructure Update clearTable method name to createEmptyTableStructure which is more appropiate Change-Id: I5992773e169edb538bac655a833149dda1220c3c Signed-off-by: Claudio D. Gasparini --- .../opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java | 4 ++-- .../protocol/bgp/rib/impl/EffectiveRibInWriter.java | 2 +- .../protocol/bgp/rib/impl/RIBSupportContextImpl.java | 3 +-- .../org/opendaylight/protocol/bgp/rib/impl/TableContext.java | 4 ++-- .../protocol/bgp/rib/impl/spi/RIBSupportContext.java | 4 ++-- .../protocol/bgp/rib/impl/AdjRibsInWriterTest.java | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java index f4f738e118..c6af52253e 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibInWriter.java @@ -176,7 +176,7 @@ final class AdjRibInWriter { idb.nodeWithKey(instanceIdentifierKey.getNodeType(), instanceIdentifierKey.getKeyValues()); TableContext ctx = new TableContext(rs, idb.build()); - ctx.clearTable(tx); + ctx.createEmptyTableStructure(tx); tx.merge(LogicalDatastoreType.OPERATIONAL, ctx.getTableId().node(Attributes.QNAME).node(ATTRIBUTES_UPTODATE_FALSE.getNodeType()), ATTRIBUTES_UPTODATE_FALSE); LOG.debug("Created table instance {}", ctx.getTableId()); @@ -192,7 +192,7 @@ final class AdjRibInWriter { tt.withChild(ImmutableNodes.leafNode(e.getKey(), e.getValue())); } tx.put(LogicalDatastoreType.OPERATIONAL, newPeerPath.node(PEER_TABLES).node(supTablesKey), tt.build()); - rs.clearTable(tx, newPeerPath.node(EMPTY_ADJRIBOUT.getIdentifier()).node(TABLES).node(instanceIdentifierKey)); + rs.createEmptyTableStructure(tx, newPeerPath.node(EMPTY_ADJRIBOUT.getIdentifier()).node(TABLES).node(instanceIdentifierKey)); } } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java index f3a01c9a54..38931ff132 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java @@ -194,7 +194,7 @@ final class EffectiveRibInWriter implements AutoCloseable { // Create an empty table LOG.trace("Create Empty table", tablePath); - ribSupport.clearTable(tx, tablePath); + ribSupport.createEmptyTableStructure(tx, tablePath); processTableChildren(tx, ribSupport.getRibSupport(), peerKey, tablePath, table.getChildNodes()); } diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java index b9213aa5ea..edff5a1bfe 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/RIBSupportContextImpl.java @@ -50,8 +50,7 @@ class RIBSupportContextImpl extends RIBSupportContext { } @Override - public void clearTable(final DOMDataWriteTransaction tx, final YangInstanceIdentifier tableId) { - //TODO: Change this method name to createTable which is more appropriate + public void createEmptyTableStructure(final DOMDataWriteTransaction tx, final YangInstanceIdentifier tableId) { final DataContainerNodeBuilder tb = ImmutableNodes.mapEntryBuilder(); tb.withNodeIdentifier((NodeIdentifierWithPredicates)tableId.getLastPathArgument()); tb.withChild(EMPTY_TABLE_ATTRIBUTES); diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java index 086c145d81..e90be4620a 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/TableContext.java @@ -37,8 +37,8 @@ final class TableContext { } - void clearTable(final DOMDataWriteTransaction tx) { - this.tableSupport.clearTable(tx, this.tableId); + void createEmptyTableStructure(final DOMDataWriteTransaction tx) { + this.tableSupport.createEmptyTableStructure(tx, this.tableId); } void removeTable(final DOMDataWriteTransaction tx) { diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContext.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContext.java index 9c25bdaf19..25a1084710 100644 --- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContext.java +++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/spi/RIBSupportContext.java @@ -25,12 +25,12 @@ public abstract class RIBSupportContext { /** * - * Clears specified Rib table using supplied transaction. + * Create specified Rib table structure using supplied transaction. * * @param tx Transaction to to be used * @param tableId Instance Identifier of table to be cleared. */ - public abstract void clearTable(DOMDataWriteTransaction tx, YangInstanceIdentifier tableId); + public abstract void createEmptyTableStructure(DOMDataWriteTransaction tx, YangInstanceIdentifier tableId); /** * Removes supplied routes from RIB table using supplied transaction. diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java index c095d35b86..0516f81e60 100644 --- a/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java +++ b/bgp/rib-impl/src/test/java/org/opendaylight/protocol/bgp/rib/impl/AdjRibsInWriterTest.java @@ -72,7 +72,7 @@ public class AdjRibsInWriterTest { Mockito.doNothing().when(this.tx).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class)); Mockito.doNothing().when(this.tx).merge(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(YangInstanceIdentifier.class), Mockito.any(NormalizedNode.class)); Mockito.doReturn(this.context).when(this.registry).getRIBSupportContext(Mockito.any(TablesKey.class)); - Mockito.doNothing().when(this.context).clearTable(Mockito.eq(this.tx), Mockito.any(YangInstanceIdentifier.class)); + Mockito.doNothing().when(this.context).createEmptyTableStructure(Mockito.eq(this.tx), Mockito.any(YangInstanceIdentifier.class)); this.writer.transform(new PeerId(this.peerIp), this.registry, this.tableTypes, false); -- 2.36.6