X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fcompatibility%2Finventory-topology-compatibility%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fcompatibility%2Ftopology%2FTopologyMapping.xtend;h=44c0c04d4333716f35e88a05fb67405993935c04;hp=2ae74de108190ab217e4669c20fce67f20a5e1b6;hb=7bea173bf1c3c27d5fa366b25a0f83879105c56d;hpb=038898e43775dc0c60d4319a5f6abe256c8bcc5f diff --git a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.xtend b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.xtend index 2ae74de108..44c0c04d43 100644 --- a/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.xtend +++ b/opendaylight/md-sal/compatibility/inventory-topology-compatibility/src/main/java/org/opendaylight/controller/md/compatibility/topology/TopologyMapping.xtend @@ -2,24 +2,24 @@ package org.opendaylight.controller.md.compatibility.topology import org.opendaylight.yangtools.yang.binding.InstanceIdentifier import org.opendaylight.yangtools.yang.binding.DataObject -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.TopologyKey -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.Topology +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology import org.opendaylight.controller.sal.core.Edge import java.util.Set import org.opendaylight.controller.sal.core.Property import org.opendaylight.controller.sal.core.NodeConnector -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.node.TerminationPoint -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.Link -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.node.TerminationPointKey -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.TpId -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.NodeKey -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.NodeId -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.LinkKey -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.LinkId +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Link +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.LinkKey +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.LinkId import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.IdentifiableItem -import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev130712.network.topology.topology.Node - +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node +import org.opendaylight.controller.sal.compatibility.InventoryMapping class TopologyMapping { new(TopologyKey path, InstanceIdentifier key) { @@ -29,32 +29,32 @@ class TopologyMapping { def Edge toAdTopologyEdge(InstanceIdentifier identifier) { val linkKey = (identifier.path.last as IdentifiableItem).key; val components = linkKey.linkId.value.split("::::"); - val tail = nodeConnectorFromString(components.get(0).split("::")); - val head = nodeConnectorFromString(components.get(1).split("::")); + val tail = InventoryMapping.nodeConnectorFromId(components.get(0)); + val head = InventoryMapping.nodeConnectorFromId(components.get(1)); return new Edge(tail, head); } def NodeConnector toAdTopologyNodeConnector(InstanceIdentifier identifier) { val tpKey = (identifier.path.last as IdentifiableItem).key; - return nodeConnectorFromString(tpKey.tpId.value.split("::")); + return InventoryMapping.nodeConnectorFromId(tpKey.tpId.value); } def org.opendaylight.controller.sal.core.Node toAdTopologyNode( InstanceIdentifier identifier) { val tpKey = (identifier.path.last as IdentifiableItem).key; - return nodeFromString(tpKey.nodeId.value.split("::")); + return InventoryMapping.nodeFromNodeId(tpKey.nodeId.value); } def NodeKey toTopologyNodeKey(org.opendaylight.controller.sal.core.Node node) { - val nodeId = new NodeId('''ad-sal:«node.type»::«node.nodeIDString»''') + val nodeId = new NodeId(InventoryMapping.toNodeId(node)); return new NodeKey(nodeId); } def TerminationPointKey toTopologyTerminationPointKey(NodeConnector nc) { val node = nc.node; - val nodeId = new TpId('''ad-sal:«node.type»::«node.nodeIDString»::«nc.nodeConnectorIDString»''') + val nodeId = new TpId(InventoryMapping.toNodeConnectorId(nc)) return new TerminationPointKey(nodeId); } @@ -64,14 +64,4 @@ class TopologyMapping { val linkId = new LinkId('''«sourceTp.tpId»::::«destTp.tpId»''') return new LinkKey(linkId); } - - def NodeConnector nodeConnectorFromString(String[] string) { - val node = nodeFromString(string.subList(0,1)); - return NodeConnector.fromStringNoNode(string.get(2),node); - } - - def org.opendaylight.controller.sal.core.Node nodeFromString(String[] strings) { - val type = strings.get(0).substring(6); - org.opendaylight.controller.sal.core.Node.fromString(type,strings.get(1)) - } }