X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowplugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowplugin%2Fopenflow%2Fmd%2Futil%2FInventoryDataServiceUtil.java;h=e4cb1c0c85afb33e433384a4f49f9385acad6e2b;hb=11c57c751eb8c0be5af54cb2a4361f262aef32cd;hp=7efd74df945ab6f3d50bad0d7cbf3dbc561d4967;hpb=a73a74356cdfaf8f766179ea52baab25e9e6c5e7;p=openflowplugin.git 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 7efd74df94..e4cb1c0c85 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 @@ -1,6 +1,21 @@ +/** + * Copyright (c) 2013 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.openflowplugin.openflow.md.util; -import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; +import com.google.common.base.Optional; +import java.math.BigInteger; +import java.util.List; +import java.util.concurrent.ExecutionException; +import org.apache.commons.lang3.StringUtils; +import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; @@ -14,33 +29,30 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No 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.NodeKey; +import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.math.BigInteger; -import java.util.List; - -public class InventoryDataServiceUtil { - private final static Logger LOG = LoggerFactory.getLogger(InventoryDataServiceUtil.class); +public abstract class InventoryDataServiceUtil { + public static final String OF_URI_PREFIX = "openflow:"; + private static final Logger LOG = LoggerFactory.getLogger(InventoryDataServiceUtil.class); - public final static String OF_URI_PREFIX = "openflow:"; /* * Get an InstanceIdentifier for the Nodes class that is the root of the * inventory tree We use this alot, so its worth keeping around */ - private static InstanceIdentifier nodesIdentifier = InstanceIdentifier.builder().node(Nodes.class) - .toInstance(); + private static final InstanceIdentifier NODES_IDENTIFIER = InstanceIdentifier.create(Nodes.class); public static Nodes checkForNodes() { Nodes nodes = null; LOG.error("Before Nodes - nodes: " + nodes); try { - nodes = (Nodes) OFSessionUtil.getSessionManager().getDataProviderService() - .readOperationalData(nodesIdentifier); + nodes = getDataObject(OFSessionUtil.getSessionManager().getDataBroker().newReadOnlyTransaction(), NODES_IDENTIFIER); } catch (Exception e) { LOG.error( - "Caught exception from OFSessionUtil.getSessionManager().getDataProviderService().readOperationalData", + "Caught exception from OFSessionUtil.getSessionManager().getDataBroker().newReadWriteTransaction()", e); } LOG.error("After Nodes- nodes: " + nodes); @@ -48,149 +60,152 @@ public class InventoryDataServiceUtil { } public static List readAllNodes() { - Nodes nodes = (Nodes) OFSessionUtil.getSessionManager().getDataProviderService() - .readOperationalData(nodesIdentifier); + Nodes nodes = getDataObject(OFSessionUtil.getSessionManager().getDataBroker().newReadOnlyTransaction(), NODES_IDENTIFIER); return nodes.getNode(); } - public static Node readNode(InstanceIdentifier instance) { - return (Node) OFSessionUtil.getSessionManager().getDataProviderService().readOperationalData(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(final InstanceIdentifier instance) { + return getDataObject(OFSessionUtil.getSessionManager().getDataBroker().newReadOnlyTransaction(), instance); } - public static Node readNode(NodeId nodeId) { - return readNode(new NodeKey(nodeId)); + public static void putNodeConnector(final InstanceIdentifier instance, final NodeConnector nodeConnector) { + WriteTransaction transaction = OFSessionUtil.getSessionManager().getDataBroker().newWriteOnlyTransaction(); + InstanceIdentifier nodeConnectorID = instance.child(NodeConnector.class, nodeConnector.getKey()); + transaction.merge(LogicalDatastoreType.OPERATIONAL, nodeConnectorID, nodeConnector); + transaction.submit(); } - public static Node readNodeByDataPath(BigInteger datapathId) { - return (Node) OFSessionUtil.getSessionManager().getDataProviderService() - .readOperationalData(identifierFromDatapathId(datapathId)); - } - - public static void putNode(Node node) { - DataModificationTransaction transaction = OFSessionUtil.getSessionManager().getDataProviderService() - .beginTransaction(); - transaction.putOperationalData(nodesIdentifier, node); - transaction.commit(); - } - - public static void putNodeConnector(InstanceIdentifier instance, NodeConnector nodeConnector) { - DataModificationTransaction transaction = OFSessionUtil.getSessionManager().getDataProviderService() - .beginTransaction(); - transaction.putOperationalData(instance, nodeConnector); - transaction.commit(); - } - - public static void putNodeConnector(NodeKey nodeKey, NodeConnector nodeConnector) { + public static void putNodeConnector(final NodeKey nodeKey, final NodeConnector nodeConnector) { InstanceIdentifier instance = nodeKeyToInstanceIdentifier(nodeKey); putNodeConnector(instance, nodeConnector); } - public static void putNodeConnector(NodeId nodeId, NodeConnector nodeConnector) { + public static void putNodeConnector(final NodeId nodeId, final NodeConnector nodeConnector) { 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) { + public static InstanceIdentifier identifierFromDatapathId(final BigInteger datapathId) { NodeKey nodeKey = nodeKeyFromDatapathId(datapathId); - return InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey).toInstance(); + return NODES_IDENTIFIER.child(Node.class, nodeKey); } - public static NodeKey nodeKeyFromDatapathId(BigInteger datapathId) { + public static NodeKey nodeKeyFromDatapathId(final BigInteger datapathId) { return new NodeKey(nodeIdFromDatapathId(datapathId)); } - public static NodeUpdatedBuilder nodeUpdatedBuilderFromDataPathId(BigInteger datapathId) { + public static NodeUpdatedBuilder nodeUpdatedBuilderFromDataPathId(final BigInteger datapathId) { NodeUpdatedBuilder builder = new NodeUpdatedBuilder(); builder.setId(nodeIdFromDatapathId(datapathId)); builder.setNodeRef(nodeRefFromNodeKey(new NodeKey(builder.getId()))); return builder; } - public static NodeId nodeIdFromDatapathId(BigInteger datapathId) { + public static NodeId nodeIdFromDatapathId(final BigInteger datapathId) { // FIXME: Convert to textual representation of datapathID String current = datapathId.toString(); return new NodeId(OF_URI_PREFIX + current); } - - public static Long dataPathIdFromNodeId(NodeId nodeId) { + + public static BigInteger dataPathIdFromNodeId(final NodeId nodeId) { String dpids = nodeId.getValue().replace(OF_URI_PREFIX, ""); - Long dpid = Long.decode(dpids); + BigInteger dpid = new BigInteger(dpids); return dpid; } - public static NodeRef nodeRefFromNode(Node node) { - return nodeRefFromNodeKey(node.getKey()); - } - public static NodeRef nodeRefFromNodeKey(NodeKey nodeKey) { + public static NodeRef nodeRefFromNodeKey(final NodeKey nodeKey) { return new NodeRef(nodeKeyToInstanceIdentifier(nodeKey)); } - public static InstanceIdentifier nodeKeyToInstanceIdentifier(NodeKey nodeKey) { - return InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey).toInstance(); + public static InstanceIdentifier nodeKeyToInstanceIdentifier(final NodeKey nodeKey) { + return NODES_IDENTIFIER.child(Node.class, nodeKey); } - public static InstanceIdentifier nodeIdToInstanceIdentifier(NodeId nodeId) { - return nodeKeyToInstanceIdentifier(new NodeKey(nodeId)); + public static NodeConnectorId nodeConnectorIdfromDatapathPortNo(final BigInteger datapathid, final Long portNo, + final OpenflowVersion ofVersion) { + String logicalName = OpenflowPortsUtil.getPortLogicalName(ofVersion, portNo); + return new NodeConnectorId(OF_URI_PREFIX + datapathid + ":" + (logicalName == null ? portNo : logicalName)); } - public static NodeConnectorId nodeConnectorIdfromDatapathPortNo(BigInteger datapathid, Long portNo) { - return new NodeConnectorId(OF_URI_PREFIX + datapathid + ":" + portNo); - } - - public static Long portNumberfromNodeConnectorId(NodeConnectorId ncId) { - return portNumberfromNodeConnectorId(ncId.getValue()); + public static Long portNumberfromNodeConnectorId(final OpenflowVersion ofVersion, final NodeConnectorId ncId) { + return portNumberfromNodeConnectorId(ofVersion, ncId.getValue()); } - public static Long portNumberfromNodeConnectorId(String ncId){ - String[] split = ncId.split(":"); + public static String portNoStringfromNodeConnectorID(final String ncID) { + String[] split = ncID.split(":"); + // It can happen that token length will be just 1 i.e 2 or CONTROLLER // If the length is just one then this cannot be the new MD-SAL style node connector Id which // is of the form openflow:1:3. - if(split.length == 1){ - return Long.decode(ncId); - } - String portNoString = split[split.length-1]; - Long portNo = Long.decode(portNoString); + + return split[split.length - 1]; + } + + public static Long portNumberfromNodeConnectorId(final OpenflowVersion ofVersion, final String ncId) { + String portNoString = portNoStringfromNodeConnectorID(ncId); + Long portNo = OpenflowPortsUtil.getPortFromLogicalName(ofVersion, portNoString); return portNo; } + public static NodeConnectorRef nodeConnectorRefFromDatapathIdPortno(final BigInteger datapathId, final Long portNo, final OpenflowVersion ofVersion) { + return new NodeConnectorRef(nodeConnectorInstanceIdentifierFromDatapathIdPortno(datapathId, portNo, ofVersion)); + } - public static NodeConnectorRef nodeConnectorRefFromDatapathIdPortno(BigInteger datapathId, Long portNo) { - return new NodeConnectorRef(nodeConnectorInstanceIdentifierFromDatapathIdPortno(datapathId, portNo)); + public static NodeConnectorRef nodeConnectorRefFromDatapathIdPortno(final BigInteger datapathId, final Long portNo, + final OpenflowVersion ofVersion, + final KeyedInstanceIdentifier nodePath) { + return new NodeConnectorRef(nodeConnectorInstanceIdentifierFromDatapathIdPortno(datapathId, portNo, ofVersion, nodePath)); } public static InstanceIdentifier nodeConnectorInstanceIdentifierFromDatapathIdPortno( - BigInteger datapathId, Long portNo) { + final BigInteger datapathId, final Long portNo, final OpenflowVersion ofVersion) { NodeId nodeId = nodeIdFromDatapathId(datapathId); - NodeConnectorId nodeConnectorId = nodeConnectorIdfromDatapathPortNo(datapathId, portNo); - return InstanceIdentifier.builder(Nodes.class) // - .child(Node.class, new NodeKey(nodeId)) // - .child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)).toInstance(); + KeyedInstanceIdentifier nodePath = NODES_IDENTIFIER.child(Node.class, new NodeKey(nodeId)); + return nodeConnectorInstanceIdentifierFromDatapathIdPortno(datapathId, portNo, ofVersion, nodePath); + } + + public static InstanceIdentifier nodeConnectorInstanceIdentifierFromDatapathIdPortno( + final BigInteger datapathId, final Long portNo, final OpenflowVersion ofVersion, final KeyedInstanceIdentifier nodePath) { + NodeConnectorId nodeConnectorId = nodeConnectorIdfromDatapathPortNo(datapathId, portNo, ofVersion); + return nodePath.child(NodeConnector.class, new NodeConnectorKey(nodeConnectorId)); } - public static NodeConnectorUpdatedBuilder nodeConnectorUpdatedBuilderFromDatapathIdPortNo(BigInteger datapathId, Long portNo) { + public static NodeConnectorUpdatedBuilder nodeConnectorUpdatedBuilderFromDatapathIdPortNo(final BigInteger datapathId, + final Long portNo, final OpenflowVersion ofVersion) { NodeConnectorUpdatedBuilder builder = new NodeConnectorUpdatedBuilder(); - builder.setId(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId,portNo)); - builder.setNodeConnectorRef(InventoryDataServiceUtil.nodeConnectorRefFromDatapathIdPortno(datapathId,portNo)); + builder.setId(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId, portNo, ofVersion)); + builder.setNodeConnectorRef(InventoryDataServiceUtil.nodeConnectorRefFromDatapathIdPortno(datapathId, portNo, ofVersion)); return builder; } - public static NodeConnectorBuilder nodeConnectorBuilderFromDatapathIdPortNo(BigInteger datapathId, Long portNo) { + public static NodeConnectorBuilder nodeConnectorBuilderFromDatapathIdPortNo(final BigInteger datapathId, + final Long portNo, final OpenflowVersion ofVersion) { NodeConnectorBuilder builder = new NodeConnectorBuilder(); - builder.setId(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId,portNo)); + builder.setId(InventoryDataServiceUtil.nodeConnectorIdfromDatapathPortNo(datapathId, portNo, ofVersion)); return builder; } -} + + /** + * @param dataPathId datapath id in big interger value + * @return string of size 16, padded with '0' + */ + public static String bigIntegerToPaddedHex(final BigInteger dataPathId) { + return StringUtils.leftPad(dataPathId.toString(16), 16, "0"); + } + + //TODO : create new module openflowplugin-util, move there this method along with TestProviderTransactionUtil#getDataObject + private static T getDataObject(final ReadTransaction readOnlyTransaction, final InstanceIdentifier identifier) { + Optional optionalData = null; + try { + optionalData = readOnlyTransaction.read(LogicalDatastoreType.OPERATIONAL, identifier).get(); + if (optionalData.isPresent()) { + return optionalData.get(); + } + } catch (ExecutionException | InterruptedException e) { + LOG.error("Read transaction for identifier {} failed.", identifier, e); + } + return null; + } + +} \ No newline at end of file