X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Fsal-compatibility%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fcompatibility%2FNodeMapping.java;h=02964c6d5531553d23abaa0cce39dfae1db30881;hb=d6d463bdd587ae6eb8884c914787af061c6f2973;hp=fa25122bba1565e6deb589b0523bb1f2cb9fffa6;hpb=80aa861b74f7b0b3574f0962cdb45740ff71946c;p=controller.git diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java index fa25122bba..02964c6d55 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.java @@ -7,8 +7,11 @@ */ package org.opendaylight.controller.sal.compatibility; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; +import java.math.BigInteger; +import java.util.Date; +import java.util.HashSet; +import java.util.List; + import org.opendaylight.controller.sal.common.util.Arguments; import org.opendaylight.controller.sal.core.AdvertisedBandwidth; import org.opendaylight.controller.sal.core.Bandwidth; @@ -16,6 +19,7 @@ import org.opendaylight.controller.sal.core.Buffers; import org.opendaylight.controller.sal.core.Capabilities; import org.opendaylight.controller.sal.core.Config; import org.opendaylight.controller.sal.core.ConstructionException; +import org.opendaylight.controller.sal.core.Description; import org.opendaylight.controller.sal.core.MacAddress; import org.opendaylight.controller.sal.core.Name; import org.opendaylight.controller.sal.core.Node.NodeIDType; @@ -55,14 +59,18 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.No 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.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.math.BigInteger; -import java.util.Date; -import java.util.HashSet; -import java.util.List; +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; public final class NodeMapping { + private static final Logger LOG = LoggerFactory + .getLogger(NodeMapping.class); + /** openflow id prefix */ public static final String OPENFLOW_ID_PREFIX = "openflow:"; @@ -88,13 +96,14 @@ public final class NodeMapping { /** * @param adNodeId - * @return + * @return nodeId as long */ - private static Long openflowFullNodeIdToLong(String adNodeId) { + @VisibleForTesting + public static Long openflowFullNodeIdToLong(String adNodeId) { if (adNodeId == null) { return null; } - return Long.valueOf(adNodeId.replaceFirst("^.*:", "")); + return new BigInteger(adNodeId.replaceFirst("^.*:", "")).longValue(); } public static NodeId toNodeId(final InstanceIdentifier id) { @@ -103,6 +112,10 @@ public final class NodeMapping { return key.getId(); } + /** + * @param nodeId containing "<NodeTypeString>:<plainIntegerId>" + * @return adNodeId form + */ public static String toADNodeId(final NodeId nodeId) { if (nodeId == null) { return null; @@ -123,6 +136,28 @@ public final class NodeMapping { return new org.opendaylight.controller.sal.core.NodeConnector(nodeConnectorType, aDNodeConnectorId, aDNode); } + /** + * @param ncid nodeConnector identifier, e.g.: OF:21 or CTRL + * @param node + * @return nodeConnector attached to given node + * @throws ConstructionException + */ + public static org.opendaylight.controller.sal.core.NodeConnector toADNodeConnector( + final NodeConnectorId ncid, final org.opendaylight.controller.sal.core.Node aDNode) throws ConstructionException { + NodeId nid = NodeMapping.toNodeId(aDNode); + String nodeConnectorType = NodeMapping.toNodeConnectorType(ncid, nid); + Object aDNodeConnectorId = NodeMapping.toADNodeConnectorId(ncid, nid); + return new org.opendaylight.controller.sal.core.NodeConnector(nodeConnectorType, aDNodeConnectorId, aDNode); + } + + /** + * @param aDNode + * @return + */ + private static NodeId toNodeId(org.opendaylight.controller.sal.core.Node aDNode) { + return new NodeId(aDNode.getType() + ":" +String.valueOf(aDNode.getID())); + } + public static String toNodeConnectorType(final NodeConnectorId ncId, final NodeId nodeId) { if (ncId.equals(toLocalNodeConnectorId(nodeId))) { return NodeConnectorIDType.SWSTACK; @@ -141,7 +176,17 @@ public final class NodeMapping { return org.opendaylight.controller.sal.core.NodeConnector.SPECIALNODECONNECTORID; } - return (short) Long.valueOf(nodeConnectorId.getValue().replaceFirst("^.*:", "")).longValue(); + String nodeConnectorIdStripped = nodeConnectorId.getValue().replaceFirst("^.*:", ""); + if (nodeConnectorIdStripped.matches("[0-9]+")) { + Short nodeConnectorIdVal = null; + try { + nodeConnectorIdVal = Short.valueOf(nodeConnectorIdStripped); + } catch (NumberFormatException e) { + LOG.warn("nodeConnectorId not supported (short): {}", nodeConnectorIdStripped, e); + } + return nodeConnectorIdVal; + } + return nodeConnectorIdStripped; } public static NodeId toAdNodeId(final NodeConnectorId nodeConnectorId) { @@ -205,11 +250,27 @@ public final class NodeMapping { public static HashSet toADNodeConnectorProperties(final NodeConnectorUpdated nc) { final FlowCapableNodeConnectorUpdated fcncu = nc.getAugmentation(FlowCapableNodeConnectorUpdated.class); if (!Objects.equal(fcncu, null)) { - return NodeMapping.toADNodeConnectorProperties(fcncu); + HashSet adNodeConnectorProperties = NodeMapping.toADNodeConnectorProperties(fcncu); + return adNodeConnectorProperties; } return new HashSet(); } + /** + * @param id + * @return node description in AD form, e.g.: OF|00:00:00:...:01 + */ + private static Description toADDescription(NodeRef nodeRef) { + Description desc; + try { + desc = new Description(toADNode(nodeRef).toString()); + } catch (ConstructionException e) { + desc = new Description("none"); + LOG.warn("node description extraction failed: {}", nodeRef); + } + return desc; + } + public static HashSet toADNodeConnectorProperties(final NodeConnector nc) { final FlowCapableNodeConnector fcnc = nc.getAugmentation(FlowCapableNodeConnector.class); if (!Objects.equal(fcnc, null)) { @@ -324,7 +385,9 @@ public final class NodeMapping { public static HashSet toADNodeProperties(final NodeUpdated nu) { final FlowCapableNodeUpdated fcnu = nu.getAugmentation(FlowCapableNodeUpdated.class); if (fcnu != null) { - return toADNodeProperties(fcnu, nu.getId()); + HashSet adNodeProperties = toADNodeProperties(fcnu, nu.getId()); + adNodeProperties.add(toADDescription(nu.getNodeRef())); + return adNodeProperties; } return new HashSet(); }