From 6a7370e37ac08a430c412ecdd19b5467c810c54e Mon Sep 17 00:00:00 2001 From: Martin Bobak Date: Thu, 11 Sep 2014 14:00:08 +0200 Subject: [PATCH] Bug 1250 - increase UT coverage - removed unused methods Change-Id: I8ecd6a406955412f8710bd4650d692e2742b7af4 Signed-off-by: Martin Bobak --- .../md/util/InventoryDataServiceUtil.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java index 9cde720882..4ecab4c5b8 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/util/InventoryDataServiceUtil.java @@ -67,30 +67,6 @@ public abstract class InventoryDataServiceUtil { return (Node) getDataObject(OFSessionUtil.getSessionManager().getDataBroker().newReadOnlyTransaction(), instance); } - public static Node readNode(NodeRef nodeRef) { - return readNode((InstanceIdentifier) nodeRef.getValue()); - } - - public static Node readNode(NodeKey nodeKey) { - return readNode(nodeKeyToInstanceIdentifier(nodeKey)); - } - - public static Node readNode(NodeId nodeId) { - return readNode(new NodeKey(nodeId)); - } - - public static Node readNodeByDataPath(BigInteger datapathId) { - return (Node) getDataObject(OFSessionUtil.getSessionManager().getDataBroker().newReadOnlyTransaction(), identifierFromDatapathId(datapathId)); - } - - public static void putNode(Node node) { - ReadWriteTransaction transaction = OFSessionUtil.getSessionManager().getDataBroker().newReadWriteTransaction(); - NodeRef nodeRef = nodeRefFromNodeKey(node.getKey()); - InstanceIdentifier nodeID = ((InstanceIdentifier) nodeRef.getValue()).create(Node.class); - transaction.merge(LogicalDatastoreType.OPERATIONAL, nodeID, node); - transaction.submit(); - } - public static void putNodeConnector(InstanceIdentifier instance, NodeConnector nodeConnector) { ReadWriteTransaction transaction = OFSessionUtil.getSessionManager().getDataBroker().newReadWriteTransaction(); InstanceIdentifier nodeConnectorID = instance.child(NodeConnector.class, nodeConnector.getKey()); @@ -107,10 +83,6 @@ public abstract class InventoryDataServiceUtil { putNodeConnector(new NodeKey(nodeId), nodeConnector); } - public static void putNodeConnector(BigInteger datapathId, NodeConnector nodeConnector) { - putNodeConnector(new NodeId(OF_URI_PREFIX + datapathId), nodeConnector); - } - public static InstanceIdentifier identifierFromDatapathId(BigInteger datapathId) { NodeKey nodeKey = nodeKeyFromDatapathId(datapathId); return InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey).toInstance(); @@ -139,9 +111,6 @@ public abstract class InventoryDataServiceUtil { return dpid; } - public static NodeRef nodeRefFromNode(Node node) { - return nodeRefFromNodeKey(node.getKey()); - } public static NodeRef nodeRefFromNodeKey(NodeKey nodeKey) { return new NodeRef(nodeKeyToInstanceIdentifier(nodeKey)); @@ -151,10 +120,6 @@ public abstract class InventoryDataServiceUtil { return InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey).toInstance(); } - public static InstanceIdentifier nodeIdToInstanceIdentifier(NodeId nodeId) { - return nodeKeyToInstanceIdentifier(new NodeKey(nodeId)); - } - public static NodeConnectorId nodeConnectorIdfromDatapathPortNo(BigInteger datapathid, Long portNo, OpenflowVersion ofVersion) { String logicalName = OpenflowPortsUtil.getPortLogicalName(ofVersion, portNo); -- 2.36.6